blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
高章伟
2023-05-24 e8b44a7b9d0579d83903065ef0c72c2832d38c36 
 force-app/main/default/classes/SaleOrderController.cls


@@ -230,7 +230,6 @@


                }               


            }


        }




        // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'proIdMap '+ proIdMap));


        // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'proHosMap '+ proHosMap));




@@ -678,10 +677,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 = '管理编码中有数字，请与管理员确认是否错误。';


                            // 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]));


@@ -1190,106 +1203,5 @@


        public Integer compareTo(Object compareTo) {


            return null;


        }


    }




    public void testUtil() {


        Integer i = 0;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


    }


}