Merge branch 'LEXUpgrade2023-Deloitte'

buli

2023-07-11 0c4796706fc9473d069b620321a54b20a119906c

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

@@ -817,7 +817,8 @@
                                Consumable_order_details2__c codsIns = new Consumable_order_details2__c();

                                codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
                                codsIns.Intra_Trade_List_RMB__c = null;
                                codsIns.Intra_Trade_List_RMB__c = reSet1[i].Intra_Trade_List_RMB__c;
                                //gzw 手动入库 默认产品单价 20230307
                                codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
                                codsIns.Direct_Arrive_Product__c = true;
                                codsIns.Sterilization_limit__c = reSet1[i].Sterilization_limit__c;
@@ -896,6 +897,7 @@
                        Frist_Transfer_Agency__c,
                        Agency_Transfer__c,
                        Dealer_Info_text__c,
                        Intra_Trade_List_RMB__c,
                        // 更新借调信息 add by gzw 2020-0-415 start
                        // 首次入库经销商信息 add by gzw 2020-04-27 start
                        Agencyinfo_fromSAP__c,
@@ -962,7 +964,8 @@
                                Consumable_order_details2__c codsIns = new Consumable_order_details2__c();

                                codsIns.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
                                codsIns.Intra_Trade_List_RMB__c = null;
                                codsIns.Intra_Trade_List_RMB__c = reSet1[i].Intra_Trade_List_RMB__c;
                                //gzw 手动入库 默认产品单价 20230307
                                codsIns.Asset_Model_No__c = reSet1[i].Asset_Model_No__c;
                                codsIns.Direct_Arrive_Product__c = true;
                                codsIns.Sterilization_limit__c = reSet1[i].Sterilization_limit__c;
@@ -3509,7 +3512,6 @@
            arriveId = orderMain.id;
            Decimal arriveAmount = 0;
            for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsUse) {
                //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------'));
                Consumable_order_details2__c insDetails = new Consumable_order_details2__c();
                insDetails.Id = ass.esd.Id;
                insDetails.Consumable_Arrived_order__c = orderMain.id;
@@ -3545,11 +3547,14 @@
                // }
                insAfterDel.Name = consumable_order[0].Name + '-' + str;
                insAfterDel.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
                if (EsetId != null && EsetId != '') {
                    insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
                } else {
                    insAfterDel.Intra_Trade_List_RMB__c = 0;
                }
                // gzw 手动入库 默认产品单价 20230307
                // if(EsetId != null && EsetId != ''){
                //     insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
                // }else{
                //     insAfterDel.Intra_Trade_List_RMB__c = 0;
                // }
                insAfterDel.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
                //gzw 手动入库 默认产品单价 20230307
                insAfterDel.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
                if (EsetId != null && EsetId != '') {
                    insAfterDel.Consumable_order_minor__c = ESetId;
@@ -3625,7 +3630,6 @@
            if (updateconsumableorderdetails2.size() > 0) {
                update updateconsumableorderdetails2;
            }

            List<Consumable_order_details2__c> insertconsumableorderdetails2 = new List<Consumable_order_details2__c>();
            for (Consumable_order_details2__c Cod2 : consumableorderdetails2Insert) {
                //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------'));
@@ -3657,7 +3661,7 @@
                i++;
            }

            //return null;
            // return null;

            if (insertconsumableorderdetails2.size() > 0) {
                insert insertconsumableorderdetails2;
@@ -3850,7 +3854,8 @@
                Consumable_order_minor__r.ContractNo__c,
                // tcm end
                //add by rentx 2020-10-14 end
                Report_Product_Expiration__c
                Report_Product_Expiration__c,
                Intra_Trade_List__c
            FROM Consumable_order_details2__c
            WHERE
                Dealer_Arrive__c = TRUE
@@ -3961,8 +3966,10 @@
                // tcm start
                Consumable_order_minor__r.ContractNo__c,
                // tcm end
                Report_Product_Expiration__c
            //add by rentx 2020-10-13 end
                Report_Product_Expiration__c,
                //add by rentx 2020-10-13 end
                Intra_Trade_List__c
            //gzw 手动入库 默认产品单价 20230307
            FROM Consumable_order_details2__c
            WHERE
                // WYIN-BLZE48盘点丢失产品增加入库方式 update by vivek 2020-03-05 start
@@ -4187,7 +4194,11 @@
                                codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
                                codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
                                codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
                                codcorderdet.Intra_Trade_List_RMB__c = codi.esd.Intra_Trade_List_RMB__c;
                                //gzw 手动入库 默认产品单价 20230307
                                codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c == null ||
                                    codi.esd.Intra_Trade_List_RMB__c == 0)
                                    ? codi.esd.Intra_Trade_List__c
                                    : codi.esd.Intra_Trade_List_RMB__c;
                                codcorderdet.RemoveBox_No__c = codctmp.RemoveBox_No__c;
                                codcorderdet.RemoveBox_date__c = codctmp.RemoveBox_date__c;
                                codcorderdet.Box_Piece__c = codctmp.Box_Piece__c;
@@ -4267,7 +4278,11 @@
                        codcorderdet.SerialLotNo__c = codi.esd.SerialLotNo__c;
                        codcorderdet.TracingCode__c = codi.esd.TracingCode__c;
                        codcorderdet.Sterilization_limit__c = codi.esd.Sterilization_limit__c;
                        codcorderdet.Intra_Trade_List_RMB__c = codi.esd.Intra_Trade_List_RMB__c;
                        //gzw 手动入库 默认产品单价 20230307
                        codcorderdet.Intra_Trade_List_RMB__c = (codi.esd.Intra_Trade_List_RMB__c == null ||
                            codi.esd.Intra_Trade_List_RMB__c == 0)
                            ? codi.esd.Intra_Trade_List__c
                            : codi.esd.Intra_Trade_List_RMB__c;
                        // WYIN-BLZE48盘点丢失产品增加入库方式 update by vivek 2020-03-05 start
                        if (hasLoseGoods) {
                            codcorderdet.loseInventory__c = true;
@@ -4302,7 +4317,6 @@
                        codcList.add(codi.esd);
                    }
                }

                //明细2不存在的对应的到货订单明细 2017-07-05
                Integer i = 1;
                //for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
@@ -4323,7 +4337,8 @@
                    //到货明细
                    codcorderdetail.Name = consumable_order_arr[0].Name + '-' + str;
                    codcorderdetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
                    codcorderdetail.Intra_Trade_List_RMB__c = null;
                    codcorderdetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
                    //gzw 手动入库 默认产品单价 20230307
                    codcorderdetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
                    codcorderdetail.Direct_Arrive_Product__c = true;
                    codcorderdetail.Sterilization_limit__c = ass.sterilizationlimitDate;
@@ -4362,7 +4377,8 @@

                    retorddetail.Name = consumable_order_ret[0].Name + '-' + str;
                    retorddetail.RecordTypeId = System.Label.RT_ConOrderDetail2_Return;
                    retorddetail.Intra_Trade_List_RMB__c = null;
                    retorddetail.Intra_Trade_List_RMB__c = ass.Prod.Intra_Trade_List_RMB__c;
                    //gzw 手动入库 默认产品单价 20230307
                    retorddetail.Dealer_Info_IF__c = accountid;
                    retorddetail.Asset_Model_No__c = ass.Prod.Asset_Model_No__c;
                    retorddetail.Direct_Arrive_Product__c = true;
@@ -4506,7 +4522,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; }