buli
2023-06-05 91f850751b85ab0125679a6ea446cbd8a622b46d
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,