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/ReceivingNoteWaitingReceiptController.cls | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls b/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
index 477fb8c..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);
}
}
@@ -604,12 +611,12 @@
}
}
//閲嶆柊缂栫爜
- // 2021203 ljh SFDC-C8ZATE start
+ // 20212103 ljh SFDC-C8ZATE start
List<Asset_EquipmentSet_Managment_Code__c> aemCodeList = new List<Asset_EquipmentSet_Managment_Code__c>();
Map<String,Asset_EquipmentSet_Managment_Code__c> oldCodeMap = new Map<String,Asset_EquipmentSet_Managment_Code__c>();
- // 2021203 ljh SFDC-C8ZATE end
+ // 20212103 ljh SFDC-C8ZATE end
if(codeNewMap.size() > 0){
- // 2021203 ljh SFDC-C8ZATE start
+ // 20212103 ljh SFDC-C8ZATE start
// List<Asset_EquipmentSet_Managment_Code__c> aemCodeList = [SELECT Id, key__c, code__c,
aemCodeList = [SELECT Id, key__c, code__c,
LastNo__c, keyName__c, isSpecial__c, MaxLastNo__c FROM Asset_EquipmentSet_Managment_Code__c
@@ -646,7 +653,7 @@
rndMap.put(rnde1.Id,rnde2);
}
- oldCodeMap.put(aem.Id,aem); // 2021203 ljh SFDC-C8ZATE end
+ oldCodeMap.put(aem.Id,aem); // 20212103 ljh SFDC-C8ZATE end
Asset_EquipmentSet_Managment_Code__c aesm = new Asset_EquipmentSet_Managment_Code__c();
aesm.Id = aem.Id;
aesm.LastNo__c = code;
@@ -671,7 +678,7 @@
}
}
//20210804 ljh 绠＄悊缂栫爜 end
- // 2021203 ljh SFDC-C8ZATE start
+ // 20212103 ljh SFDC-C8ZATE start
// 鍒ゆ柇姝ゆ椂姝ゅ埢鐨勫�� 鏄惁鍜屾渶鍒濈殑鍊兼槸鍚︿竴鏍凤紝涓嶄竴鏍锋彁绀�
List<Asset_EquipmentSet_Managment_Code__c> aemCodeNowList = [SELECT Id, key__c, code__c,
LastNo__c, keyName__c, isSpecial__c, MaxLastNo__c FROM Asset_EquipmentSet_Managment_Code__c
@@ -685,7 +692,7 @@
//}
}
update aesmUList; //20210809 ljh 绠＄悊缂栫爜
- // 2021203 ljh SFDC-C8ZATE end
+ // 20212103 ljh SFDC-C8ZATE end
update rndList;
// update aesmUList; //20210809 ljh 绠＄悊缂栫爜
pageRef.getParameters().put('message','宸蹭繚瀛�');
--
Gitblit v1.9.1