From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/CancelRemoveBoxController.cls | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/classes/CancelRemoveBoxController.cls b/force-app/main/default/classes/CancelRemoveBoxController.cls
index 7f71b46..7bfb430 100644
--- a/force-app/main/default/classes/CancelRemoveBoxController.cls
+++ b/force-app/main/default/classes/CancelRemoveBoxController.cls
@@ -98,9 +98,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,Product_Type__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c, Arrive_Owner_Work_Location__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c, Arrive_Owner_Work_Location__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -128,9 +128,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -162,9 +162,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -195,9 +195,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -228,9 +228,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -261,9 +261,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -293,9 +293,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -323,9 +323,9 @@
Consumable_Product__c,Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Bar_Code__c,
Arrive_date__c,Send_Date__c,Consumable_order_minor__r.Name,Consumable_order_minor__c,
- recordtypeid,Consumable_order_minor__r.Arrive_Order__c, Arrive_Owner_Work_Location__c
+ recordtypeid,Consumable_order_minor__r.Arrive_Order__c, Arrive_Owner_Work_Location__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -366,9 +366,9 @@
CFDA_Status__c,
ProductPacking_list_manual__c,
Report_Product_Approbation__c,
- Report_Product_Expiration__c
+ Report_Product_Expiration__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -441,9 +441,9 @@
Box_Piece__c,
RemoveBox_date__c,
RemoveBox_No__c,
- Bar_Code__c
+ Bar_Code__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rentx 2020-10-13 end
FROM Consumable_order_details2__c
@@ -479,9 +479,9 @@
Box_Piece__c,
RemoveBox_date__c,
RemoveBox_No__c,
- Bar_Code__c
+ Bar_Code__c,
//add by rentx 2020-10-13 start
- ,ContractNo_text__c
+ ContractNo_text__c
/*,ContractNo__c*/
//add by rebtx 2020-10-13 end
// tcm start
@@ -510,12 +510,12 @@
updDetails2.RemoveBox_No__c = null;
// tcm start
- // updDetails2.ContractNo_text__c = detail2tmp.ContractNo__c;
if (String.isBlank(detail2tmp.Consumable_order_minor__r.ContractNo__c)) {
updDetails2.ContractNo_text__c= detail2tmp.ContractNo_text__c;
}else {
updDetails2.ContractNo_text__c= detail2tmp.Consumable_order_minor__r.ContractNo__c;
}
+ // updDetails2.ContractNo_text__c = detail2tmp.ContractNo__c;
// tcm end
//閫氱暘001銇儑銉笺偪銇鐞嗗崢浣嶃倰鐩掋伀鎴汇仐銆侀�氱暘銈掋偗銉偄
--
Gitblit v1.9.1