From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/SaleOrderController.cls | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/classes/SaleOrderController.cls b/force-app/main/default/classes/SaleOrderController.cls
index eeef6ee..eb8a1ab 100644
--- a/force-app/main/default/classes/SaleOrderController.cls
+++ b/force-app/main/default/classes/SaleOrderController.cls
@@ -253,31 +253,27 @@
//鍒ゆ柇褰撳墠鍑哄簱鍗曟槸鍚︿负鍖婚櫌鐗逛环鍑哄簱鍗�
if (coc.OutPattern__c == true) {
if (newdet2[j].Product_Pattern__c == orderdetails[i].Product_Pattern__c) {
-
- if (hpList != null && hpList.size() > 0) {
- //add by rentx 2021-03-22 start
- if (newdet2[j].exchangeOutPattern__c || coc.SummonsForDirction__c == '浜掔浉璋冭揣') {
- //濡傛灉褰撳墠缁忛攢鍟嗕笅娌℃湁缁存姢瀵瑰簲鐨勭壒浠蜂骇鍝� 鎶ラ敊
- if (!proIdMap.containsKey(newdet2[j].Product_Pattern__c)) {
- String str = '娌℃湁缁存姢璇ヤ骇鍝佺殑鐗逛环鍖婚櫌';
- consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
- errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
- }
- }else{
- if (proHosMap.containsKey(newdet2[j].Product_Pattern__c)) {
- continue;
- }else if (!proIdMap.containsKey(newdet2[j].Product_Pattern__c)) {
- continue;
- }else{
- String str = '璇ュ晢鍝佸嚭搴撳尰闄㈤敊璇�';
- consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
- errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
- }
+ //add by rentx 2021-03-22 start
+ if (newdet2[j].exchangeOutPattern__c == true) {
+ //濡傛灉褰撳墠缁忛攢鍟嗕笅娌℃湁缁存姢瀵瑰簲鐨勭壒浠蜂骇鍝� 鎶ラ敊
+ if (!proIdMap.containsKey(newdet2[j].Product_Pattern__c)) {
+ String str = '娌℃湁缁存姢璇ヤ骇鍝佺殑鐗逛环鍖婚櫌';
+ consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
+ errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
}
- //add by rentx 2021-03-22 end
+ }
+ //add by rentx 2021-03-22 end
-
-
+ if (hpList != null && hpList.size() > 0) {
+ if (proHosMap.containsKey(newdet2[j].Product_Pattern__c)) {
+ continue;
+ }else if (!proIdMap.containsKey(newdet2[j].Product_Pattern__c)) {
+ continue;
+ }else{
+ String str = '璇ュ晢鍝佸嚭搴撳尰闄㈤敊璇�';
+ consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
+ errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
+ }
}
}
}
--
Gitblit v1.9.1