buli
2023-06-05 91f850751b85ab0125679a6ea446cbd8a622b46d
LEX Community UpdateComponent
3个文件已修改
56 ■■■■ 已修改文件
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/ArriveGoodsController.cls 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -58,6 +58,7 @@
    },
    //根据周和担当查询数据给初始页面赋数据
    get_reports: function (component, event, helper, date_str, person_str) {
        debugger
        if (!date_str) {
            return false;
        }
@@ -886,7 +887,7 @@
                }
                else {
                    var error = response.getError();
                    component.set('v.errorMessage', 'saveAgencyReport failed.');
                    component.set('v.errorMessage', '保存日报失败');
                    this.showErrorToast(component);
                    component.find('save_button').set('v.disabled', false);
                    component.set('v.login', false);
force-app/main/default/classes/ArriveGoodsController.cls
@@ -500,6 +500,8 @@
        }
        //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '管理编码为空的产品 ' + ErrorIdMap));
        //整体到货
        System.debug('EsetId===>'+EsetId);
        System.debug('ArrType===>'+ArrType);
        if(EsetId == null || EsetId == ''){
            if(ArrType!='ReG'){
                //到货但产品类型与用户的类型不符            
@@ -538,6 +540,42 @@
                        }
                    }
                }
                System.debug('reSet1===>'+reSet1);
                //add by Wang Xueqin
                          //到货但产品类型与用户的类型不符
                          reSet1 = [SELECT Id,Name,Intra_Trade_List_RMB__c,Asset_Model_No__c,
                          Consumable_Product__c,Consumable_Product__r.Name,
                          Consumable_Product__r.Name__c,Consumable_Product__r.Asset_Model_No__c,
                          Sterilization_limit__c,Deliver_date__c,Bar_Code__c,
                          Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,
                          Consumable_order_minor__c,Dealer_Arrive__c,
                          Guarantee_period_for_products__c,CFDA_Status__c,
                          ProductPacking_list_manual__c,Report_Product_Approbation__c,
                          Report_Product_Expiration__c,Box_Piece__c, Rrturn_count__c,
                          Product_Type__c
                          ,ContractNo_text__c
                          ,Consumable_order_minor__r.ContractNo__c
                  FROM Consumable_order_details2__c
                  WHERE Bar_Code__c  in :BarCodeListP
                  AND ( not Product_Type__c  like :userPro_Typestr)
                 ];
          if(reSet1.size()>0){
              for (Integer i = 0; i < reSet1.size(); i++) {
                  if(ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)){
                      // 跳过已经处理的消耗品明细
                      continue;
                  }else{
                      String str = '产品类型['+reSet1[i].Product_Type__c+']与用户的类型['+userPro_Type+']不符';
                      ConsumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(reSet1[i],str));
                      ErrorIdMap.put(reSet1[i].Bar_Code__c,reSet1[i].Bar_Code__c);
                  }
              }
          }
          System.debug('reSet1===>1'+reSet1);
        //end
                //销售产品
                reSet1 = [SELECT Id,  Name,Consumable_Product__r.Name__c,
                                Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
@@ -83,13 +83,13 @@
        var cols = [];
        cols.push({label:'出库单',fieldName:'orderUrl',type:'url',typeAttributes:{label:{fieldName:'orderNo'},target: "_blank"},hideDefaultActions: true,wrapText:true});
        // cols.push({label:'出库单' , fieldName:'orderNo', hideDefaultActions: true});
        cols.push({label:'出库日' , fieldName:'prodOutDate',wrapText:true, hideDefaultActions: true,initialWidth:95});
        cols.push({label:'出库日' , fieldName:'prodOutDate',wrapText:true, hideDefaultActions: true,initialWidth:110});
        cols.push({label:'消耗品名称' , fieldName:'prodName',wrapText:true, hideDefaultActions: true,wrapText:true,initialWidth:190});
        cols.push({label:'出库目的' , fieldName:'summonsForDirctionDet',wrapText:true, hideDefaultActions: true,initialWidth:130});
        cols.push({label:'客户名' , fieldName:'hospitalName', hideDefaultActions: true,wrapText:true,initialWidth:130});
        cols.push({label:'经销商' , fieldName:'orderDealer', hideDefaultActions: true,wrapText:true,initialWidth:100});
        cols.push({label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,wrap:true,initialWidth:190});
        cols.push({label:'使用期限' , fieldName:'sterilizationLimit', hideDefaultActions: true,wrapText:true,initialWidth:95});
        cols.push({label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,wrap:true,initialWidth:230});
        cols.push({label:'使用期限' , fieldName:'sterilizationLimit', hideDefaultActions: true,wrapText:true,initialWidth:110});
        cols.push({label:'单位' , fieldName:'boxPiece', hideDefaultActions: true,wrapText:true,initialWidth:50});
        cols.push({
            label:'返品数量',
@@ -99,7 +99,7 @@
                boxPrice: { fieldName: "boxPiece" },
                recordId: { fieldName: "recordId" }
            },
            hideDefaultActions: true,wrapText:true,initialWidth:70});
            hideDefaultActions: true,wrapText:true,initialWidth:100});
        cols.push({
            label:'返品原因',
            type: "customTableInput",
@@ -208,13 +208,6 @@
    //根据barcode搜索
    barcodeEntrys(){
        this.showSpinner = true;
        this.detailsSummary = [];
        this.consumableorderdetailsRecords = [];
        this.consumableorderdetailsRecordsview = [];
        this.showGoodsofReturnList = [];
        this.showGoodsofReturnListView = [];
        this.consumableInventory = [];
        this.consumableorderdetailsRecordserror = [];
        searchProduct({
            barcode : this.barcode,
            arrControllerStr : this.arrController