From 2b969ede326bf33a9a0402ea96a0261631591dc4 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期三, 24 五月 2023 11:47:23 +0800
Subject: [PATCH] 入库管理编码验证程序调整

---
 force-app/main/default/classes/SaleOrderController.cls   |   22 ++++-
 force-app/main/default/classes/ArriveGoodsController.cls |  187 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 172 insertions(+), 37 deletions(-)

diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index cb91f3b..5581582 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -1028,10 +1028,24 @@
                     }else{
                         Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
                         if(n.find()){
-                            String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                            ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
-                            ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
-                            continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (reSet[i].TracingCode__c.length() == 5) {
+                                String tr = reSet[i].TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                                    ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                            // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                         if(otherAgencyMap.containsKey(reSet[i].Bar_Code__c)){
                             for (Integer j=0; j<consumableInventory.size(); j++) {
@@ -1111,11 +1125,24 @@
                         continue;
                     }else{
                         Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
-                        if(n.find()){
-                            String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                            ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
-                            ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
-                            continue;
+                        if(n.find()){// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (reSet[i].TracingCode__c.length() == 5) {
+                                String tr = reSet[i].TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                                    ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                            // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                         ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
                         for(String str : barMcodeMap.keySet()){
@@ -1421,10 +1448,24 @@
                     }else{
                         Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
                         if(n.find()){
-                            String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                            ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
-                            ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
-                            continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (reSet[i].TracingCode__c.length() == 5) {
+                                String tr = reSet[i].TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                                    ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                            // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                         ConsumableorderdetailsRecordsdummy.add(new ConsumableorderdetailsInfo(reSet[i]));
                         ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(reSet[i]));
@@ -1483,10 +1524,24 @@
                     }else{
                         Matcher n = Pattern.compile('[0-9]').matcher(reSet[i].TracingCode__c);
                         if(n.find()){
-                            String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                            ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
-                            ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
-                            continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (reSet[i].TracingCode__c.length() == 5) {
+                                String tr = reSet[i].TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                                    ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet[i],str));
+                            // ErrorIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                         ExistIdMap.put(reSet[i].Bar_Code__c,reSet[i].Bar_Code__c);
                         for(String str : barMcodeMap.keySet()){
@@ -1656,9 +1711,22 @@
                             tracingCode = barCodeList[i].substring(barCodeList[i].length() - 5,barCodeList[i].length());
                             Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                             if(n.find()){
-                                String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
-                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
-                                continue;
+                                // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                                if (tracingCode.length() == 5) {
+                                    String tr = tracingCode;
+                                    String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                    String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                    String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                    if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                        String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+                                        continue;
+                                    }
+                                }
+                                // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+                                // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+                                // continue;
+                                // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                             }
                         }else{
                             ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'));
@@ -1910,9 +1978,22 @@
                                         tracingCode = bar.substring(bar.length() - 5,bar.length());
                                         Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                                         if(n.find()){
-                                            String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
-                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
-                                            continue;
+                                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                                            if (tracingCode.length() == 5) {
+                                                String tr = tracingCode;
+                                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+                                                    continue;
+                                                }
+                                            }
+                                            // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+                                            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+                                            // continue;
+                                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end   
                                         }
                                     }else{
                                         ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'));
@@ -2062,9 +2143,22 @@
                         tracingCode = barCodeList[i].substring(barCodeList[i].length() - 5,barCodeList[i].length());
                         Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                         if(n.find()){
-                            String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
-                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
-                            continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (tracingCode.length() == 5) {
+                                String tr = tracingCode;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+                            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                     }else{
                         ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'));
@@ -2339,9 +2433,22 @@
                                 tracingCode = bar.substring(bar.length() - 5,bar.length());
                                 Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                                 if(n.find()){
-                                    String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
-                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
-                                    continue;
+                                    // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                                    if (tracingCode.length() == 5) {
+                                        String tr = tracingCode;
+                                        String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                        String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                        String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                        if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                            String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'));
+                                            continue;
+                                        }
+                                    }
+                                    // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+                                    // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+                                    // continue;
+                                    // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                                 }
                             }else{
                                 ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'));
@@ -3108,10 +3215,24 @@
 
                 Matcher n = Pattern.compile('[0-9]').matcher(codc.TracingCode__c);
                 if(n.find()){
-                    String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
-                    ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
-                    continue;
+                    // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (codc.TracingCode__c.length() == 5) {
+                                String tr = codc.TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
+                                    ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(codc,str));
+                            // ErrorIdMap.put(codc.Bar_Code__c,codc.Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                 }
                 if( CheckBarcodeResult.containsKey( codc.Bar_Code__c    )){
                     GrList.add(codc.Bar_Code__c);
diff --git a/force-app/main/default/classes/SaleOrderController.cls b/force-app/main/default/classes/SaleOrderController.cls
index eb8a1ab..8a4faf4 100644
--- a/force-app/main/default/classes/SaleOrderController.cls
+++ b/force-app/main/default/classes/SaleOrderController.cls
@@ -676,10 +676,24 @@
                     }else if(!checkBarcodeResult.containsKey(newdet2[j].Bar_Code__c)) {
                         Matcher n = Pattern.compile('[0-9]').matcher(newdet2[j].TracingCode__c);
                         if(n.find()){
-                            String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
-                            consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
-                            errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
-                            continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 start
+                            if (newdet2[j].TracingCode__c.length() == 5) {
+                                String tr = newdet2[j].TracingCode__c;
+                                String Ctr = tr.substring(tr.length() - 3,tr.length());
+                                String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+                                String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+                                if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+                                    String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+                                    consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
+                                    errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
+                                    continue;
+                                }
+                            }
+                            // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+                            // consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
+                            // errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
+                            // continue;
+                            // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
                         }
                         checkBarcodeResult.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
                         consumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(newdet2[j]));

--
Gitblit v1.9.1