From 0fd788ee4e392c702c15ac9e1754e0a94770de8f Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期一, 21 十一月 2022 15:19:16 +0800
Subject: [PATCH] 备品管理编码
---
force-app/main/default/classes/TransferApplySelectDetailController.cls | 6 +++---
force-app/main/default/classes/TransferApplySelectDetailSubController.cls | 4 ++--
force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls b/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
index 477fb8c..cd8b82f 100644
--- a/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
+++ b/force-app/main/default/classes/ReceivingNoteWaitingReceiptController.cls
@@ -528,7 +528,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 +567,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 +604,12 @@
}
}
//閲嶆柊缂栫爜
- // 2021203 ljh SFDC-C8ZATE start
+ // 20211203 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
+ // 20211203 ljh SFDC-C8ZATE end
if(codeNewMap.size() > 0){
- // 2021203 ljh SFDC-C8ZATE start
+ // 20211203 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 +646,7 @@
rndMap.put(rnde1.Id,rnde2);
}
- oldCodeMap.put(aem.Id,aem); // 2021203 ljh SFDC-C8ZATE end
+ oldCodeMap.put(aem.Id,aem); // 20211203 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 +671,7 @@
}
}
//20210804 ljh 绠＄悊缂栫爜 end
- // 2021203 ljh SFDC-C8ZATE start
+ // 20211203 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 +685,7 @@
//}
}
update aesmUList; //20210809 ljh 绠＄悊缂栫爜
- // 2021203 ljh SFDC-C8ZATE end
+ // 20211203 ljh SFDC-C8ZATE end
update rndList;
// update aesmUList; //20210809 ljh 绠＄悊缂栫爜
pageRef.getParameters().put('message','宸蹭繚瀛�');
diff --git a/force-app/main/default/classes/TransferApplySelectDetailController.cls b/force-app/main/default/classes/TransferApplySelectDetailController.cls
index aaa04fb..51e798d 100644
--- a/force-app/main/default/classes/TransferApplySelectDetailController.cls
+++ b/force-app/main/default/classes/TransferApplySelectDetailController.cls
@@ -1014,8 +1014,8 @@
tadBMNewList.add(tad);
}
}else{
- // 5\6\7.澶囧搧鍒嗙被 涓嶆敼鍙橈紙闈炴娴嬶級鏈儴涓嶆敼鍙� 0绯讳笉鏀瑰彉(锛�0绯�) 0鏈儴鍜�7-11鏈儴 瀛樻斁鍦版敼鍙� 閲嶆柊缂栫爜
- if(parentObj.RecordType.DeveloperName == 'CenterToCenter' && SalesdepartmentI != null && (SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12))){
+ // 5\6\7.澶囧搧鍒嗙被 涓嶆敼鍙橈紙闈炴娴嬶級鏈儴涓嶆敼鍙� 0绯讳笉鏀瑰彉(锛�0绯�) 0鏈儴鍜�7-11鏈儴鍜�16鏈儴 瀛樻斁鍦版敼鍙� 閲嶆柊缂栫爜
+ if(parentObj.RecordType.DeveloperName == 'CenterToCenter' && SalesdepartmentI != null && (SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16)){
tadBMNewList.add(tad);
}else if(String.isNotBlank(tad.CodeKey__c)){
tadClearId.add(tad.Id);
@@ -1034,7 +1034,7 @@
if(SalesdepartmentArr.size() > 0){
String Salesdepartment = SalesdepartmentArr[0];
Integer SalesdepartmentI = Integer.valueOf(Salesdepartment);
- if(SalesdepartmentI < 12){
+ if(SalesdepartmentI < 12 || SalesdepartmentI == 16){
String key = '';
// key涓�瑙堟槑缁嗘湰娆� key1涓�瑙堟槑缁嗕笂娆�
// 澶囧搧鍒嗙被銆佹湰閮ㄣ�佹槸鍚�0绯诲垪銆佷骇鍝佸垎绫�(GI/SP)銆佸瓨鏀惧湴
diff --git a/force-app/main/default/classes/TransferApplySelectDetailSubController.cls b/force-app/main/default/classes/TransferApplySelectDetailSubController.cls
index 07d34ce..459e7f1 100644
--- a/force-app/main/default/classes/TransferApplySelectDetailSubController.cls
+++ b/force-app/main/default/classes/TransferApplySelectDetailSubController.cls
@@ -326,7 +326,7 @@
}
}else{
// 5\6\7.澶囧搧鍒嗙被 涓嶆敼鍙橈紙闈炴娴嬶級鏈儴涓嶆敼鍙� 0绯讳笉鏀瑰彉(锛�0绯�) 0鏈儴鍜�7-11鏈儴 瀛樻斁鍦版敼鍙� 閲嶆柊缂栫爜
- if(parentObj.RecordType.DeveloperName == 'CenterToCenter' && SalesdepartmentI != null && (SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12))){
+ if(parentObj.RecordType.DeveloperName == 'CenterToCenter' && SalesdepartmentI != null && (SalesdepartmentI == 0 || (SalesdepartmentI > 6 && SalesdepartmentI < 12) || SalesdepartmentI == 16)){
tadBMNewList.add(tad);
}else if(String.isNotBlank(tad.CodeKey__c)){
tadClearId.add(tad.Id);
@@ -345,7 +345,7 @@
if(SalesdepartmentArr.size() > 0){
String Salesdepartment = SalesdepartmentArr[0];
Integer SalesdepartmentI = Integer.valueOf(Salesdepartment);
- if(SalesdepartmentI < 12){
+ if(SalesdepartmentI < 12 || SalesdepartmentI == 16){
// key涓�瑙堟槑缁嗘湰娆� key1涓�瑙堟槑缁嗕笂娆�
// 澶囧搧鍒嗙被銆佹湰閮ㄣ�佹槸鍚�0绯诲垪銆佷骇鍝佸垎绫�(GI/SP)銆佸瓨鏀惧湴
List<TransferApplyDetail__c> tadTempList = new List<TransferApplyDetail__c>();
--
Gitblit v1.9.1