test

buli

2023-05-22 71b93327e8f3fb3bffffc7c033c1f782e7b6ab32

 force-app/main/default/classes/ArriveGoodsController.cls

@@ -77,8 +77,8 @@
    //public String[] proidList =new String[]{};
    public Decimal orderCountAll = 0;
    public Decimal orderCountNotarrive = 0;
    private id return_Order_id = null;
    private id inventory_Order_id = null;
    public id return_Order_id = null;
    public id inventory_Order_id = null;
    public boolean ReturnFLGbln {get;set;}
    public boolean saveFLGbln {get;set;}
    public String ArrType{get;set;}
@@ -91,6 +91,14 @@
    public String product_Type = null;
    public Boolean EngFlag = false;
    public Boolean ETFlag = false;

    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
    public Boolean isLwc = false;
    public String returnError;
    public List<String> warningList;
    public List<String> errorList;
    public String urlType;

    public ArriveGoodsController(){
        baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
        ESetId = ApexPages.currentPage().getParameters().get('esetId');
@@ -110,6 +118,29 @@
        consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
        //add by rentx 20210602 CHAN-C3K4ZQ end 
        // OrderAllMap = new Map<String, String>();
    }

    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
    public ArriveGoodsController(String eSetId, String arrType){
        this.ESetId = eSetId;
        this.ArrType = arrType;
        ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
        ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
        ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
        consumableInventory = new List<ConsumableorderdetailsInfo>();
        consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
        consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
        consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
        orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
        detailsSummary = new List<ConsumableorderdetailsInfo>();
        saveFLGbln = FALSE;
        consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
        noboxBarcodeList = new Set<String>();
        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
        warningList = new List<String>();
        errorList = new List<String>();
        returnError = null;
        urlType = null;
    }

    //add by rentx 20210602 CHAN-C3K4ZQ start 出错的原因是页面最多展示1000条数据,但是需要展示的数据超过了1000条,现在把展示上线改为1000 * 1000
@@ -311,6 +342,10 @@
        consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
        consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
        orderdetails2trMap = new Map<String,Consumable_order_details2__c>();
        //update by Link 20230428
        if(isLwc){
            noboxBarcodeList = new Set<String>();
        }
        //add by rentx 2021-01-27 start
        HosErrorList = new List<String>();
        HosErrorMap = new Map<String,String>();
@@ -382,7 +417,12 @@
        List<Consumable_order_details2__c> reSet = new List<Consumable_order_details2__c>();
        List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
        if(barcode == null || barcode.trim() ==''){
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'请输入BarCode号。'));
            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
            if(isLwc){
                returnError = '请输入BarCode号';
            }else {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'请输入BarCode号。'));
            }
            return;
        }
        //对比全部库存中是否存在管理编码一样，barcode号不一样的产品
@@ -407,7 +447,12 @@
                }else{
                    for(String str : barMcodeMap.keySet()){
                        if(barMcodeMap.get(str) == reSet1[i].TracingCode__c){
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, str + ' 的管理编码已经存在于系统的库存中，请确认输入信息是否有误。'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add(str + ' 的管理编码已经存在于系统的库存中，请确认输入信息是否有误。');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, str + ' 的管理编码已经存在于系统的库存中，请确认输入信息是否有误。'));
                            }
                            ErrorIdMap.put(str,str);
                            ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
                        }
@@ -945,7 +990,12 @@
                                str = '该商品在库';//没出库 ，没销售，没丢失就是在库。
                            }
                            if(reSet1[i].Lose_Flag__c == true && reSet1[i].ToDueDateDays__c >= 0){
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '产品'+reSet1[i].Consumable_Product__r.Name+'存在丢失记录'));//如果丢失产品就给提示。
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    warningList.add('产品'+reSet1[i].Consumable_Product__r.Name+'存在丢失记录');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING, '产品'+reSet1[i].Consumable_Product__r.Name+'存在丢失记录'));//如果丢失产品就给提示。
                                }
                            }
                            if (reSet1[i].Lose_Flag__c == true && reSet1[i].ToDueDateDays__c < 0) {
                                str = '过期已销存产品，不允许返品';
@@ -1117,10 +1167,15 @@
                        for(String str : barMcodeMap.keySet()){
                            // BarCode不一致时的警告信息
                            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
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    warningList.add('条形码为('+ str +')的入库数据与发货数据不一致');
                                }else {
                                    // 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;
@@ -1155,7 +1210,12 @@
                    }else{
                        for(String str : barMcodeMap.keySet()){
                            if(barMcodeMap.get(str) == reSet1[i].TracingCode__c){
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'barcode' +str + '与出库单' + reSet1[i].Sale_orderName__c + ' 中的管理编码一致，但Barcode不同，请确认具体数据。'));
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    errorList.add('barcode' +str + '与出库单' + reSet1[i].Sale_orderName__c + ' 中的管理编码一致，但Barcode不同，请确认具体数据。');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, 'barcode' +str + '与出库单' + reSet1[i].Sale_orderName__c + ' 中的管理编码一致，但Barcode不同，请确认具体数据。'));
                                }
                                ErrorIdMap.put(str,str);
                                ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
                            }
@@ -1195,11 +1255,21 @@
                if(ArrType!='ReG'){
                    inventoryEntryNoESetId(notInlist);
                    if(notInStorelist.size() > 0){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInStorelist + '不存在。'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            returnError = 'BarCode号'+ notInStorelist + '不存在';
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInStorelist + '不存在。'));
                        }
                        return;
                    }
                }else{
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInlist + '不存在，无对应的出库单，请先操作产品入库。'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        returnError = 'BarCode号'+ notInlist + '不存在，无对应的出库单，请先操作产品入库';
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInlist + '不存在，无对应的出库单，请先操作产品入库。'));
                    }
                    return;
                }
            }
@@ -1207,8 +1277,12 @@
        //add by rentx 2021-01-27 start
        if (HosErrorList.size() > 0) {
            for (String str : HosErrorList) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号:' + str + HosErrorMap.get(str)+''));
                
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('BarCode号:' + str + HosErrorMap.get(str)+'');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号:' + str + HosErrorMap.get(str)+''));
                }
            }
        }
        //add by rentx 2021-01-27 end
@@ -1520,7 +1594,12 @@
            if(notInlist.size()>0){
                inventoryEntry(notInlist);
                if(notInStorelist.size() > 0){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInStorelist + '不存在。'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        returnError = 'BarCode号'+ notInStorelist + '不存在';
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号'+ notInStorelist + '不存在。'));
                    }
                    return;
                }
            }
@@ -1529,7 +1608,12 @@
        //add by rentx 2021-01-27 start 当订单为医院特价类型的订单时,如果找不到barcode,不解析,并且默认该barcode对应的明细2为非医院特价产品,直接报错
        if (HosErrorList.size() > 0) {
            for (String str : HosErrorList) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号:' + str +'是非医院特价产品'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('BarCode号:' + str +'是非医院特价产品');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号:' + str +'是非医院特价产品'));
                }
                
            }
        }
@@ -1568,7 +1652,12 @@
                    //生产日期
                    List<String> janCode = new List<String>();
                    if(barCodeList[i].length() < 16){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                        }
                        continue;
                    }else {
                        //if(barCodeList[i].substring(0,2) !='01'){
@@ -1579,13 +1668,23 @@
                        try{
                            Decimal test  = Decimal.valueOf(janCodeMark);
                        }catch(Exception e){
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的janCode错误！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')的janCode错误！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的janCode错误！'));
                            }
                            continue;
                        }
                    }
                    if(barCodeList[i].length() >= 22){
                        if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')没有管理编码！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                            }
                            continue;
                        }
                        if( barCodeList[i].substring(16,18) =='11'){
@@ -1593,7 +1692,12 @@
                                productDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01' ;
                                productionDate = Date.valueOf(productDateStr);
                            }catch(Exception e){
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！'));
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    errorList.add('产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！'));
                                }
                                continue;
                            }
                            if(barCodeList[i].length() >=32){
@@ -1608,7 +1712,12 @@
                                        expirationDate = Date.valueOf(expirationDateStr);
                                        }
                                    }catch(Exception e){
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                        if(isLwc){
                                            errorList.add('产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                        }else {
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                        }
                                        continue;
                                    }
                                    if(barCodeList[i].length() >= 42){
@@ -1632,7 +1741,12 @@
                                    expirationDate = Date.valueOf(expirationDateStr);
                                }
                            }catch(Exception e){
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    errorList.add('产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                }
                                continue;
                            }
                            if(barCodeList[i].length() >= 34){
@@ -1653,11 +1767,21 @@
                            Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                            if(n.find()){
                                String str = '管理编码不正确，请与管理员确认是否错误。';
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！'));
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    errorList.add('产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！'));
                                }
                                continue;
                            }
                        }else{
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的tracingCode错误！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')的tracingCode错误！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的tracingCode错误！'));
                            }
                            continue;
                        }
                    }
@@ -1702,13 +1826,23 @@
                    barCode01List.add(barCodeList[i]);
                }else if(barCodeList[i].substring(0,3) =='241'){
                    if(barCodeList[i].length() > 8 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')没有管理编码！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                        }
                        continue;
                    }
                    List<String> otCodeList = new List<String>();
                    Map<String,String> otCodeMap = new Map<String,String>();
                    if(barCodeList[i].length() < 7){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                        }
                        continue;
                    }else if(barCodeList[i].length() == 11){
                        String otCode4 = barCodeList[i].substring(3,7);
@@ -1750,11 +1884,21 @@
                    barOtcodeMap.put(barCodeList[i], otCodeMap);
                    barCode241List.add(barCodeList[i]);
                }else{
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')不符合要求！'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('产品BarCode(' + barCodeList[i] + ')不符合要求！');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')不符合要求！'));
                    }
                    continue;
                }
            }else{
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')不符合要求！'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('产品BarCode(' + barCodeList[i] + ')不符合要求！');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')不符合要求！'));
                }
                continue;
            }
        }
@@ -1794,7 +1938,12 @@
                    }
                }
                if(errorMap.size() > 0){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户类型['+userPro_Type+']不符'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户类型['+userPro_Type+']不符');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户类型['+userPro_Type+']不符'));
                    }
                }
            }
        }
@@ -1820,7 +1969,12 @@
                }
            }
            if(errorMap.size() > 0){
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符'));
                }
            }
            product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
                                Pro2_Dealer_ENG__c,Pro2_Dealer_Object__c
@@ -1846,7 +2000,12 @@
                                            productDateStr = '20' + bar.substring(oTcodeLength + 5,oTcodeLength + 7) + '-' + bar.substring(oTcodeLength + 7,oTcodeLength + 9) + '-01' ;
                                            productionDate = Date.valueOf(productDateStr);
                                        }catch(Exception e){
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！'));
                                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                            if(isLwc){
                                                errorList.add('产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！');
                                            }else {
                                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！'));
                                            }
                                            continue;
                                        }
                                        if(bar.length() >=oTcodeLength + 3 + 16){
@@ -1861,7 +2020,12 @@
                                                    expirationDate = Date.valueOf(expirationDateStr);
                                                    }
                                                }catch(Exception e){
                                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                                    if(isLwc){
                                                        errorList.add('产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                                    }else {
                                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                                    }
                                                    continue;
                                                }
                                                if(bar.length() >= oTcodeLength + 3 + 25){
@@ -1886,7 +2050,12 @@
                                                expirationDate = Date.valueOf(expirationDateStr);
                                            }
                                        }catch(Exception e){
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                            if(isLwc){
                                                errorList.add('产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                            }else {
                                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                            }
                                            continue;
                                        }
                                        if(bar.length() >=oTcodeLength + 20){
@@ -1907,11 +2076,21 @@
                                        Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                                        if(n.find()){
                                            String str = '管理编码不正确，请与管理员确认是否错误。';
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！'));
                                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                            if(isLwc){
                                                errorList.add('产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！');
                                            }else {
                                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！'));
                                            }
                                            continue;
                                        }
                                    }else{
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的tracingCode错误！'));
                                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                        if(isLwc){
                                            errorList.add('产品BarCode(' + bar + ')的tracingCode错误！');
                                        }else {
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的tracingCode错误！'));
                                        }
                                        continue;
                                    }
                                }
@@ -1978,20 +2157,35 @@
                //生产日期
                List<String> janCode = new List<String>();
                if(barCodeList[i].length() < 16){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                    }
                    continue;
                }else {
                    janCodeMark = barCodeList[i].substring(2,16);
                    try{
                        Decimal test  = Decimal.valueOf(janCodeMark);
                    }catch(Exception e){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的janCode错误！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')的janCode错误！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的janCode错误！'));
                        }
                        continue;
                    }
                }
                if(barCodeList[i].length() >= 22){
                    if(barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')没有管理编码！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                        }
                        continue;
                    }
                    if( barCodeList[i].substring(16,18) =='11'){
@@ -1999,7 +2193,12 @@
                            productDateStr = '20' + barCodeList[i].substring(18,20) + '-' + barCodeList[i].substring(20,22) + '-01' ;
                            productionDate = Date.valueOf(productDateStr);
                        }catch(Exception e){
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')的生产日期' + productDateStr + '错误！'));
                            }
                            continue;
                        }
                        if(barCodeList[i].length() >=32){
@@ -2014,7 +2213,12 @@
                                    expirationDate = Date.valueOf(expirationDateStr);
                                    }
                                }catch(Exception e){
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                    if(isLwc){
                                        errorList.add('产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                    }else {
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                    }
                                    continue;
                                }
                                if(barCodeList[i].length() >= 42){
@@ -2038,7 +2242,12 @@
                                expirationDate = Date.valueOf(expirationDateStr);
                            }
                        }catch(Exception e){
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                            }
                            continue;
                        }
                        if(barCodeList[i].length() >= 34){
@@ -2059,11 +2268,21 @@
                        Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                        if(n.find()){
                            String str = '管理编码不正确，请与管理员确认是否错误。';
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！'));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                errorList.add('产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！');
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')管理编码中有数字，请与管理员确认是否错误！'));
                            }
                            continue;
                        }
                    }else{
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的tracingCode错误！'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            errorList.add('产品BarCode(' + barCodeList[i] + ')的tracingCode错误！');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的tracingCode错误！'));
                        }
                        continue;
                    }
                }
@@ -2109,13 +2328,23 @@
                barCode01List.add(barCodeList[i]);
            }else if(barCodeList[i].substring(0,3) =='241'){
                if(barCodeList[i].length() > 8 && barCodeList[i].substring(barCodeList[i].length() - 8,barCodeList[i].length()-5)!='250'){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('产品BarCode(' + barCodeList[i] + ')没有管理编码！');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + barCodeList[i] + ')没有管理编码！'));
                    }
                    continue;
                }
                List<String> otCodeList = new List<String>();
                Map<String,String> otCodeMap = new Map<String,String>();
                if(barCodeList[i].length() < 7){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')的位数不足16，不符合要求错误！'));
                    }
                    continue;
                }else if(barCodeList[i].length() == 11){
                    String otCode4 = barCodeList[i].substring(3,7);
@@ -2157,7 +2386,12 @@
                barOtcodeMap.put(barCodeList[i], otCodeMap);
                barCode241List.add(barCodeList[i]);
            }else{
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')没有janCode或OTcode，不符合要求！'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('产品BarCode(' + barCodeList[i] + ')没有janCode或OTcode，不符合要求！');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + barCodeList[i] + ')没有janCode或OTcode，不符合要求！'));
                }
                continue;
            }
        }
@@ -2184,7 +2418,12 @@
                    }
                }
                if(errorMap.size() > 0){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户的类型['+userPro_Type+']不符'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        errorList.add('BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户的类型['+userPro_Type+']不符');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户的类型['+userPro_Type+']不符'));
                    }
                }
            }                                   
            product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,Product2_Jancode__c,
@@ -2249,7 +2488,12 @@
                }
            }
            if(errorMap.size() > 0){
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    errorList.add('BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符');
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'BarCode号['+ errorMap.values() +']产品类型['+product_Type+']与用户['+userPro_Type+']类型不符'));
                }
            }
            product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c,
                                            Pro2_Dealer_Object__c,Pro2_Dealer_ENG__c
@@ -2274,7 +2518,12 @@
                                    productDateStr = '20' + bar.substring(oTcodeLength + 5,oTcodeLength + 7) + '-' + bar.substring(oTcodeLength + 7,oTcodeLength + 9) + '-01' ;
                                    productionDate = Date.valueOf(productDateStr);
                                }catch(Exception e){
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！'));
                                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                    if(isLwc){
                                        errorList.add('产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！');
                                    }else {
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,  '产品BarCode(' + bar + ')的生产日期' + productDateStr + '错误！'));
                                    }
                                    continue;
                                }
                                if(bar.length() >=oTcodeLength + 3 + 16){
@@ -2290,7 +2539,12 @@
                                            expirationDate = Date.valueOf(expirationDateStr);
                                            }
                                        }catch(Exception e){
                                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                            if(isLwc){
                                                errorList.add('产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                            }else {
                                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                            }
                                            continue;
                                        }
                                        if(bar.length() >= oTcodeLength + 3 + 25){
@@ -2315,7 +2569,12 @@
                                        expirationDate = Date.valueOf(expirationDateStr);
                                    }
                                }catch(Exception e){
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                    if(isLwc){
                                        errorList.add('产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！');
                                    }else {
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的滅菌有効期限' + expirationDateStr + '错误！'));
                                    }
                                    continue;
                                }
                                if(bar.length() >=oTcodeLength + 20){
@@ -2336,11 +2595,21 @@
                                Matcher n = Pattern.compile('[0-9]').matcher(tracingCode);
                                if(n.find()){
                                    String str = '管理编码不正确，请与管理员确认是否错误。';
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！'));
                                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                    if(isLwc){
                                        errorList.add('产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！');
                                    }else {
                                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')管理编码中有数字，请与管理员确认是否错误！'));
                                    }
                                    continue;
                                }
                            }else{
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的tracingCode错误！'));
                                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                                if(isLwc){
                                    errorList.add('产品BarCode(' + bar + ')的tracingCode错误！');
                                }else {
                                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'产品BarCode(' + bar + ')的tracingCode错误！'));
                                }
                                continue;
                            }
                        }
@@ -2384,9 +2653,19 @@
        if(notEqualBARcodeCunMap.size() > 0){
            for(String widget : notEqualBARcodeCunMap.keySet()) {
                if(notEqualBARcodeCunMap.get(widget).size() >0){
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '以下barcode产品与订货产品不一致。'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        warningList.add('以下barcode产品与订货产品不一致。');
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '以下barcode产品与订货产品不一致。'));
                    }
                    for(String barcodeListTTT : (List<String>)notEqualBARcodeCunMap.get(widget)) {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            warningList.add(barcodeListTTT);
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
                        }
                    }
                }
            }
@@ -2728,7 +3007,12 @@
        Savepoint sp = Database.setSavepoint();

        if(ConsumableorderdetailsRecords.size()<1 && consumableInventory.size()<1){
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'不存在到货明细'));
            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
            if(isLwc){
                returnError = '不存在到货明细';
            }else {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'不存在到货明细'));
            }
            return null;
        }
        if(EsetId != null && EsetId != ''){
@@ -2736,9 +3020,19 @@
            if(resultcheck.length() > 0){
                for(String widget : overOrderBARcodeCunMap.keySet()) {
                    if(overOrderBARcodeCunMap.get(widget).size() >0){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '产品' + widget + '本次到货数量超过' + overOrderBARcodeCunMap.get(widget).size() +'个订货的数量。'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            warningList.add('产品' + widget + '本次到货数量超过' + overOrderBARcodeCunMap.get(widget).size() +'个订货的数量。');
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '产品' + widget + '本次到货数量超过' + overOrderBARcodeCunMap.get(widget).size() +'个订货的数量。'));
                        }
                        for(String barcodeListTTT : (List<String>)overOrderBARcodeCunMap.get(widget)) {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
                            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                            if(isLwc){
                                warningList.add(barcodeListTTT);
                            }else {
                                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT));
                            }
                        }
                    }
                }
@@ -2954,7 +3248,12 @@
            // Integer a = 1/0;
        }catch(Exception e){
            Database.rollback(sp);
            ApexPages.addMessages(e);
            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
            if(isLwc){
                returnError = e.getLineNumber()+'---'+e.getMessage();
            }else {
                ApexPages.addMessages(e);
            }
            return null;
        }
        if(resultcheck.length() > 0){
@@ -2962,6 +3261,7 @@
        }else if(resultcheckWithoutOrder.size() >0){
            return null;
        } else{
            urlType = 'UnabletoEdit';
            return UnabletoEdit();
            // return null;
        }
@@ -3304,7 +3604,11 @@
                    }

                    if(codi.esd.Return_reason__c==null||codi.esd.Return_reason__c==''){
                        codi.esd.Return_reason__c.addError('请补充返品原因');
                        if(isLwc){
                            returnError = '请补充返品原因';
                        }else {
                            codi.esd.Return_reason__c.addError('请补充返品原因');
                        }
                        return null;
                    }

@@ -3313,7 +3617,11 @@
                        String key = '' + codi.esd.Consumable_ZS_order__c + codi.esd.Bar_Code__c;
                        Integer deliverycnt = BarcodeCntMap.get(key);
                        if(codi.esd.Rrturn_count__c > deliverycnt){
                            codi.esd.Rrturn_count__c.addError('超出出库数量');
                            if(isLwc){
                                returnError = '超出出库数量';
                            }else {
                                codi.esd.Rrturn_count__c.addError('超出出库数量');
                            }
                            return null;
                        }  
                    }
@@ -3510,7 +3818,12 @@
                    // }

                    if(ass.ReturnReason==null || ass.ReturnReason==''){
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'请补充返品原因'));
                        //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                        if(isLwc){
                            returnError = '请补充返品原因';
                        }else {
                            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'请补充返品原因'));
                        }
                        return null;
                    }

@@ -3608,26 +3921,43 @@
                    // WYIN-BPE3T4 虚拟盘点单 update by vivek 2020-05-11 start
                    // return ToReturnGoodsPage();
                    if(hasLoseGoods){
                        urlType = 'ToInventoryGoodsPage';
                        return ToInventoryGoodsPage();
                        // return null;
                    }else{
                        urlType = 'ToReturnGoodsPage';
                        return ToReturnGoodsPage();
                        // return null;
                    }
                    // WYIN-BPE3T4 虚拟盘点单 update by vivek 2020-05-11 start
                }
                else{
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'没有需要登录的返品'));
                    //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                    if(isLwc){
                        returnError = '没有需要登录的返品';
                    }else {
                        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'没有需要登录的返品'));
                    }
                    return null;
                }

            }else{
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'没有需要登录的返品'));
                //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
                if(isLwc){
                    returnError = '没有需要登录的返品';
                }else {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'没有需要登录的返品'));
                }
                return null;
            }
        }catch(Exception e){
            Database.rollback(sp);
            ApexPages.addMessages(e);
            //LWC:Lwcflag和报错提醒 update by Link 2023-04-27
            if(isLwc){
                returnError = e.getLineNumber()+'---'+e.getMessage();
            }else {
                ApexPages.addMessages(e);
            }
            return null;
        }
    }
@@ -3703,7 +4033,7 @@
        return ref;
    }

    class ConsumableorderdetailsInfo implements Comparable {
    public class ConsumableorderdetailsInfo implements Comparable {
        public Consumable_order_details2__c esd { get; set; }
        public Product2__c Prod { get; set; }
        public String ProductName { get; set; }
@@ -3721,6 +4051,11 @@
        public Decimal arrivedCount { get; set; }

        public String ReportProductExpirationDate {get;set;}

        public ConsumableorderdetailsInfo(){

        }

        public ConsumableorderdetailsInfo(Consumable_order_details2__c e,string str) {
            esd                = e;
            Prod               = e.Consumable_Product__r;