From ecf60bb0cd5a04ce38120302be4cf55fd3c3a27b Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期二, 04 四月 2023 16:23:38 +0800
Subject: [PATCH] 返品限制条件验证
---
force-app/main/default/classes/ArriveGoodsController.cls | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index d306997..cb91f3b 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -667,7 +667,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;
@@ -722,7 +723,7 @@
Dealer_Shipment__c, Dealer_Saled__c,Consumable_Product__r.Asset_Model_No__c
// 鏇存柊鍊熻皟淇℃伅 add by gzw 2020-0-415 start
,SummonsForDirction_det__c,Transfer_Time__c,Frist_Transfer_Agency__c,Agency_Transfer__c,
- Dealer_Info_text__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,Frist_Storage_Agency__c
@@ -784,7 +785,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;
@@ -883,6 +885,8 @@
WHERE Dealer_Arrive__c = FALSE
AND Dealer_Shipment__c= FALSE
AND Dealer_Saled__c = FALSE
+ // gzw fix 鍙栨秷浜у搧鍒ゆ柇涓烘湭鍏ュ簱 20230323
+ AND Cancellation_Flag__c = false
AND Dealer_Returned__c = false
AND Bar_Code__c in :BarCodeListP
AND Dealer_Info_text__c = :accountName
@@ -2767,7 +2771,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;
@@ -2799,11 +2802,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;
@@ -2876,7 +2882,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------'));
@@ -2908,7 +2913,7 @@
i++;
}
- //return null;
+ // return null;
if(insertconsumableorderdetails2.size() >0){
insert insertconsumableorderdetails2;
@@ -3070,6 +3075,7 @@
// tcm end
//add by rentx 2020-10-14 end
,Report_Product_Expiration__c
+ ,Intra_Trade_List__c
FROM Consumable_order_details2__c
WHERE ((Dealer_Arrive__c = true
AND( Dealer_Shipment__c = true
@@ -3180,6 +3186,8 @@
// tcm 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
@@ -3381,7 +3389,8 @@
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;
@@ -3463,7 +3472,8 @@
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;
@@ -3496,7 +3506,6 @@
codcList.add( codi.esd );
}
}
-
//鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
Integer i = 1;
//for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
@@ -3517,7 +3526,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;
@@ -3557,7 +3567,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;
--
Gitblit v1.9.1