From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/ConsumTrialPDFController.cls | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/ConsumTrialPDFController.cls b/force-app/main/default/classes/ConsumTrialPDFController.cls
index 6a2e22f..7c8c801 100644
--- a/force-app/main/default/classes/ConsumTrialPDFController.cls
+++ b/force-app/main/default/classes/ConsumTrialPDFController.cls
@@ -159,7 +159,7 @@
FROM Consum_Apply_Equipment_Set_Detail__c
WHERE Consum_Apply_Equipment_Set__r.Consum_Apply__c = :targetConsumApplyId // 鑰楁潗澶囧搧閰嶅涓�瑙�.鑰楁潗澶囧搧鐢宠
AND (Cancel_Select__c = false OR NG_Select_Again__c = true)
- AND Shipment_request_time2__c != null
+ // AND Shipment_request_time2__c != null //Commented By Li Jun 20220422 for PIPL
ORDER BY Consum_Apply_Equipment_Set__r.Consum_Apply__c, Consum_Apply_Equipment_Set__c, Fixture_Model_No_F__c, Degree_Of_Importance__c
];
if (consumApplySetDetailList.size() > 0) {
--
Gitblit v1.9.1