From 32ca554edf2f2533790ad095e5691bbe478468a3 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期二, 28 三月 2023 15:30:24 +0800
Subject: [PATCH] ET产品-效期修改
---
force-app/main/default/classes/NFM110Rest.cls | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/NFM110Rest.cls b/force-app/main/default/classes/NFM110Rest.cls
index 13afb9d..202903c 100644
--- a/force-app/main/default/classes/NFM110Rest.cls
+++ b/force-app/main/default/classes/NFM110Rest.cls
@@ -400,8 +400,6 @@
// 淇敼铏氭嫙鍚堝悓鐢熸垚閫昏緫 gzw 20210324 end
from Product2
where ProductCode_Ext__c in :productCodeList];
- //淇敼 OER-SMART 浜у搧涓嶇敓鎴愯櫄鎷熺淮淇悎鍚�
- // and Category5__c = 'OER-SMART'
Map<String, Product2> prdsMap = new Map<String, Product2>();
for (Product2 prd : prdList) {
prdsMap.put(prd.ProductCode_Ext__c, prd);
@@ -782,7 +780,15 @@
rac.Deliver_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Arrive_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Used_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = addressNameApiMap.get(oppMap.get(InquiryNoStr).SAP_Province__c);
@@ -938,7 +944,15 @@
rac.Deliver_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Arrive_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Used_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = addressNameApiMap.get(oppMap.get(InquiryNoStr).SAP_Province__c);
@@ -1054,7 +1068,15 @@
// update by vivek srart 2020-02-13
// orderdetInfo.Account_province_txt__c = accsMap.get(infoH.EndUserNo).OCM_man_province_txt__c;
// update by vivek end 2020-02-13
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ orderdetInfo.Sterilization_limit__c = null;
+ }else{
orderdetInfo.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // orderdetInfo.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
//orderdetInfo.Bar_Code__c = dnInfo.Barcode;
orderdetInfo.DeliveryNote__c = infoH.DeliveryNote;
// update by Gaozw start 20200514
@@ -1249,7 +1271,15 @@
rac.Asset_Model_No__c = prdSearch.Asset_Model_No__c;
rac.Consumable_order_minor__c = order.Id;
rac.Deliver_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = accsMap.get(infoH.EndUserNo).Id;
@@ -1613,7 +1643,15 @@
}
rac.Asset_Model_No__c = prdSearch.Asset_Model_No__c;
rac.Deliver_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = accsMap.get(infoH.EndUserNo).Id;
@@ -1920,7 +1958,15 @@
rac.Deliver_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Arrive_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
rac.Used_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = addressNameApiMap.get(oppMap.get(InquiryNoStr).SAP_Province__c);
@@ -2276,7 +2322,15 @@
// rac.Arrive_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
// rac.Used_date__c = NFMUtil.parseStr2Date(infoH.DeliveryDate);
// 鑷姩淇敼鏈�缁堢敤鎴� update by vivek end
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� start
+ if (dnInfo.ValidTo !=null && dnInfo.ValidTo.length() == 8
+ && Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
+ rac.Sterilization_limit__c = null;
+ }else{
rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ }
+ // rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ // gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
rac.Consumable_product__c = prdSearch.Id;
rac.Bar_Code__c = dnInfo.Barcode;
rac.Used_account__c = oppMap.get(InquiryNoStr).Agency1__c;
--
Gitblit v1.9.1