From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls b/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
index 6db02d7..80558ea 100644
--- a/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
+++ b/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
@@ -26,6 +26,13 @@
};
}
//20210806 ljh 绠＄悊缂栫爜 end
+ // 20230117 ljh DB202301096735 start
+ public List<ReceivingNoteDetail__c> rndInfo {
+ get {
+ return [select id,Fixture_Arrival_Product__c FROM ReceivingNoteDetail__c where Fixture_Arrival_Product__c = '' LIMIT 1 ];
+ }
+ }
+ // 20230117 ljh DB202301096735 end
public ReceivingNoteWaitingReceiptController() {
parId = System.currentPageReference().getParameters().get('parId');
@@ -528,7 +535,7 @@
}
}else{
key1 += 'N0;';
- if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12)){
+ if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16){
key1 += ass.Product_category__c+';'+locationMap.get(ass.Internal_asset_location__c);
}else if(SalesdepartmentI < 7){
key1 += ass.Product_category__c;
@@ -567,7 +574,7 @@
}else{
key2 += 'N0;';
key2 += String.isNotBlank(RNde.Product_category__c)?RNde.Product_category__c:RNde.Product_category_F__c;
- if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12)){
+ if(SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16){
key2 +=';'+locationMap.get(RNde.Internal_asset_location__c);
}
}
--
Gitblit v1.9.1