From cd730d0b1a775abacfba06003bb58327d5d1fb3c Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期四, 02 二月 2023 12:23:31 +0800
Subject: [PATCH] 同步数据
---
force-app/main/default/classes/ArriveGoodsController.cls | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index 8c90505..d306997 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -1116,8 +1116,11 @@
ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
for(String str : barMcodeMap.keySet()){
// BarCode涓嶄竴鑷存椂鐨勮鍛婁俊鎭�
- if(reSet[i].Bar_Code__c != str){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佸凡鍏ュ簱涓擝arCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ if(reSet[i].Bar_Code__c != str && reSet[i].TracingCode__c == barMcodeMap.get(str)){
+ // 20220815 ljh SWAG-CH65B7 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'鏉″舰鐮佷负('+ str +')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'));
+ // 20220815 ljh SWAG-CH65B7 end
}
if(barMcodeMap.get(str) == reSet[i].TracingCode__c){
reSet[i].Bar_Code__c = str;
--
Gitblit v1.9.1