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/ConsumEquipmentSetReceivedController.cls | 113 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls b/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
index 14bdf4a..f2d4a88 100644
--- a/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
+++ b/force-app/main/default/classes/ConsumEquipmentSetReceivedController.cls
@@ -43,7 +43,7 @@
selectedDataSql += ' and Consum_Apply__r.AssetManageConfirm__c = true';
//selectedDataSql += ' order by Id ASC nulls last';
keepWher = selectedDataSql;
- selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
+ selectedDataSql = ' From Consum_Apply_Equipment_Set_Detail__c' + selectedDataSql + ' order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last, name';
myComponentController.columnRightRW.put('Hui_Ji_Jia__c', 'r');
myComponentController.columnRightRW.put('WH_location__c', 'r');
myComponentController.columnRightRW.put('Yi_Zhi_Bao_Fei_Jia__c', 'w');
@@ -87,7 +87,7 @@
return new List<String>{'Id', 'Asset__c', 'Asset__r.WH_location__c', 'Consum_Apply__r.demo_purpose2__c','Shipment_Saved_Flg__c', 'Shipment_request_time2__c', 'Consum_Apply_Equipment_Set__r.Yi_Shipment_request__c'};
}
public override List<String> getHiddenFieldList() {
- return new List<String>{'Product_Serial_No_F__c'};
+ return new List<String>{'Product_Serial_No_F__c','Comment__c'};
}
// getObjName 杩� getOriginObjName 鐨� FK
public override String getFKColumnField() {
@@ -115,7 +115,7 @@
}
public override String getOrderbyStr() {
- return 'order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last';
+ return 'order by Fixture_Model_No_F__c nulls last, Consumable_Guaranteen_end_F__c nulls last,name';
}
public override Boolean getIsNeedRunSearch() {
@@ -207,10 +207,23 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '姝ゅ鍝佸凡杩囨湡锛屽瀹炵墿宸插瘎鍥為渶绉昏嚦杩囨湡鍖篬'+caesd.Fixture_Model_No__c+']('+caesd.Consumable_Guaranteen_end_F__c.format()+')'));
return;
}
+ //update by youc 2021-12-08 start 涔嬪墠鏄洿鎺ュ彇淇濇湁璁惧鍜岃緭鍏ョ殑鍊肩殑 鐜板湪鍙互璁剧疆淇濇湁璁惧+灏忕爜涓簁ey 鍚庨潰get鐨勬椂鍊欑浉鍚�
+ // baofeiAssetMap.put(caesd.Asset__c, baofei);
+ // guoqiAssetMap.put(caesd.Asset__c, guoqi);
+ // shangjiaAssetMap.put(caesd.Asset__c, shangjia);
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
+ if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
+ baofeiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, baofei);
+ guoqiAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, guoqi);
+ shangjiaAssetMap.put(caesd.Asset__c+caesd.EquipmentManagementCode_OldData__c, shangjia);
+ }else{
+ //update by youc 2021-12-08 start 涔嬪墠鏄洿鎺ュ彇淇濇湁璁惧鍜岃緭鍏ョ殑鍊肩殑 鐜板湪鍙互璁剧疆淇濇湁璁惧+灏忕爜涓簁ey 鑰楁潗杩芥函--鍙戣揣淇敼
+ baofeiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, baofei);
+ guoqiAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, guoqi);
+ shangjiaAssetMap.put(caesd.Asset__c+caesd.ManagementCode__c+caesd.EquipmentManagementCode__c, shangjia);
- baofeiAssetMap.put(caesd.Asset__c, baofei);
- guoqiAssetMap.put(caesd.Asset__c, guoqi);
- shangjiaAssetMap.put(caesd.Asset__c, shangjia);
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
}
List<Consum_Apply_Equipment_Set_Detail__c> updList = new List<Consum_Apply_Equipment_Set_Detail__c>();
@@ -219,31 +232,48 @@
Set<Id> assetIdSet = new Set<Id>();
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
//寰呮姤搴�
- if (baofeiAssetMap.containsKey(caesd.Asset__c) && baofeiAssetMap.get(caesd.Asset__c) > 0) {
- Integer cnt_last = baofeiAssetMap.get(caesd.Asset__c) - 1;
+ //update by youc 2021-12-08
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 start
+ String asscodeX = caesd.Asset__c + caesd.ManagementCode__c+caesd.EquipmentManagementCode__c;
+ if (String.isEmpty(caesd.EquipmentManagementCode__c)) {
+ asscodeX = caesd.Asset__c + caesd.EquipmentManagementCode_OldData__c;
+ }
+ //add by yc 20220217 澶勭悊鑰佹暟鎹紑鐨勫彛 end
+
+ // if (baofeiAssetMap.containsKey(caesd.Asset__c) && baofeiAssetMap.get(caesd.Asset__c) > 0) {
+ if (baofeiAssetMap.containsKey(asscodeX) && baofeiAssetMap.get(asscodeX) > 0) {
+ // Integer cnt_last = baofeiAssetMap.get(caesd.Asset__c) - 1;
+ Integer cnt_last = baofeiAssetMap.get(asscodeX) - 1;
caesd.Arrival_in_wh__c = true;
caesd.Return_wh_chenk_staff__c = userid;
caesd.Arrival_wh_time__c = nowtime;
caesd.Inspection_result_after__c = 'NG';
caesd.Inspection_result_after_NG__c = '搴熷純';
- baofeiAssetMap.put(caesd.Asset__c, cnt_last);
+ // baofeiAssetMap.put(caesd.Asset__c, cnt_last);
+ baofeiAssetMap.put(asscodeX, cnt_last);
updList.add(caesd);
//杩囨湡鍖�
- } else if (guoqiAssetMap.containsKey(caesd.Asset__c) && guoqiAssetMap.get(caesd.Asset__c) > 0) {
- Integer cnt_last = guoqiAssetMap.get(caesd.Asset__c) - 1;
+ // } else if (guoqiAssetMap.containsKey(caesd.Asset__c) && guoqiAssetMap.get(caesd.Asset__c) > 0) {
+ } else if (guoqiAssetMap.containsKey(asscodeX) && guoqiAssetMap.get(asscodeX) > 0) {
+ // Integer cnt_last = guoqiAssetMap.get(caesd.Asset__c) - 1;
+ Integer cnt_last = guoqiAssetMap.get(asscodeX) - 1;
caesd.Arrival_in_wh__c = true;
caesd.Return_wh_chenk_staff__c = userid;
caesd.Arrival_wh_time__c = nowtime;
caesd.ExpiredArrival__c = true;
- guoqiAssetMap.put(caesd.Asset__c, cnt_last);
+ // guoqiAssetMap.put(caesd.Asset__c, cnt_last);
+ guoqiAssetMap.put(asscodeX, cnt_last);
updList.add(caesd);
//涓婃灦
- } else if (shangjiaAssetMap.containsKey(caesd.Asset__c) && shangjiaAssetMap.get(caesd.Asset__c) > 0) {
- Integer cnt_last = shangjiaAssetMap.get(caesd.Asset__c) - 1;
+ // } else if (shangjiaAssetMap.containsKey(caesd.Asset__c) && shangjiaAssetMap.get(caesd.Asset__c) > 0) {
+ } else if (shangjiaAssetMap.containsKey(asscodeX) && shangjiaAssetMap.get(asscodeX) > 0) {
+ // Integer cnt_last = shangjiaAssetMap.get(caesd.Asset__c) - 1;
+ Integer cnt_last = shangjiaAssetMap.get(asscodeX) - 1;
caesd.Arrival_in_wh__c = true;
caesd.Return_wh_chenk_staff__c = userid;
caesd.Arrival_wh_time__c = nowtime;
- shangjiaAssetMap.put(caesd.Asset__c, cnt_last);
+ // shangjiaAssetMap.put(caesd.Asset__c, cnt_last);
+ shangjiaAssetMap.put(asscodeX, cnt_last);
updList.add(caesd);
}
assetIdSet.add(caesd.Asset__c);
@@ -301,10 +331,14 @@
else {
useCaesdList = (List<Consum_Apply_Equipment_Set_Detail__c>)selectedData;
}
+ system.debug(useCaesdList+'zheli0'+queryList);
Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>> caesdMap = new Map<Id, List<Consum_Apply_Equipment_Set_Detail__c>>();
Map<Id, Integer> cntMap_HuiJi = new Map<Id, Integer>();
whlocMap = new Map<Id, String>();
//Map<Id, Integer> cntShipmentReqMap = new Map<Id, Integer>();
+ //add by youc 2021-12-07 start
+ Map<Id,List<String>> assXiaoMaMap = new Map<Id,List<String>>();
+ //add by youc 2021-12-07 end
for (Consum_Apply_Equipment_Set_Detail__c caesd : useCaesdList) {
if (caesdMap.containsKey(caesd.Asset__c) == false) {
caesdMap.put(caesd.Asset__c, new List<Consum_Apply_Equipment_Set_Detail__c>());
@@ -315,22 +349,63 @@
Integer cnt = cntMap_HuiJi.containsKey(caesd.Asset__c) ? (cntMap_HuiJi.get(caesd.Asset__c) + 1) : 1;
cntMap_HuiJi.put(caesd.Asset__c, cnt);
}
-
+ //add by youc 2021-12-07 start 瀛樻斁灏忕爜
+ if (caesd.EquipmentManagementCode__c != null && caesd.EquipmentManagementCode__c != '') {
+ if (assXiaoMaMap.containsKey(caesd.Asset__c) == false) {
+ assXiaoMaMap.put(caesd.Asset__c, new List<String>());
+ }
+ assXiaoMaMap.get(caesd.Asset__c).add(caesd.ManagementCode__c+caesd.EquipmentManagementCode__c);
+ }
+ //add by youc 2021-12-07 end 瀛樻斁灏忕爜
whlocMap.put(caesd.Asset__c, caesd.Asset__r.WH_location__c);
}
for (Id assId : caesdMap.keySet()) {
- Consum_Apply_Equipment_Set_Detail__c wiInfo = caesdMap.get(assId)[0];
+ //update by youc 2021-12-07 start 涔嬪墠鏄牴鎹繚鏈夎澶囧睍绀哄埌椤甸潰涓婄殑 鐜板湪闇�瑕佸睍绀哄嚭鏄庣粏
+
+ /*Consum_Apply_Equipment_Set_Detail__c wiInfo = caesdMap.get(assId)[0];
if (cntMap_HuiJi.containsKey(wiInfo.Asset__c)) {
wiInfo.Hui_Ji_Jia__c = cntMap_HuiJi.get(wiInfo.Asset__c);
}
- wiInfo.WH_location__c = whlocMap.get(wiInfo.Asset__c);
+ wiInfo.WH_location__c = whlocMap.get(wiInfo.Asset__c);
WrapperInfo wi = new WrapperInfo(wiInfo, myComponentController);
wi.additionalInfoMap.put('Product_Serial_No_F__c', wiInfo.Product_Serial_No_F__c);
if (wiInfo.Hui_Ji_Jia__c == null || wiInfo.Yi_Zhi_Bao_Fei_Jia__c != null || wiInfo.Yi_Zhi_Guo_Qi_Jia__c != null || wiInfo.Shang_Jia_Jia__c != null) {
wi.canEdit = false;
- }
+ }
viewList.add(wi);
+ 娉ㄩ噴 涔嬪墠鏄彇鐨勭涓�涓槑缁� 璁剧疆鍥炲瘎浠舵暟骞跺睍绀� 鐜板湪鍙互鐩存帴鍙栧緱璇ヤ繚鏈夎澶囧搴旂殑鏄庣粏 鍒ゆ柇鍥炲瘎鍗曟槸鍚︿负绌哄嵆鍙� */
+ List<Consum_Apply_Equipment_Set_Detail__c> conTempList = caesdMap.get(assId);
+ for (Integer i = 0; i < conTempList.size();i ++ ) {
+ if (i == 0) {
+ //鍥犱负page椤甸潰鏄牴鎹産arcode鍘诲垽鏂槸鍚﹀瓨鍦ㄥ鏁颁欢鐨� 鎵�浠ユ垜浠湪鍚庣 鍚屼竴涓繚鏈夎澶囦笅鍙缃竴涓猙arcode鍗冲彲 barcode鏄叕寮忓瓧娈� 鍙互寤轰釜鏂囨湰瀛楁鏉� 杩欐牱鍦ㄥ墠绔仛浼氱畝鍗曞緢澶�
+ conTempList[i].barcodeforReceipt__c = conTempList[i].Barcode_F__c;
+ }
+ if (cntMap_HuiJi.containsKey(conTempList[i].Asset__c)) {
+ conTempList[i].Hui_Ji_Jia__c = 1;
+ }
+ //璐ф灦鍙锋槸鍙栧緱淇濇湁璁惧鐨勮揣鏋跺彿
+ conTempList[i].WH_location__c = whlocMap.get(conTempList[i].Asset__c);
+ WrapperInfo wi = new WrapperInfo(conTempList[i], myComponentController);
+ if (i == 0) {
+ wi.additionalInfoMap.put('Product_Serial_No_F__c', conTempList[i].Product_Serial_No_F__c);
+ //浜у搧+鏈鸿韩缂栫爜鍚岀悊
+ }else {
+ wi.additionalInfoMap.put('Product_Serial_No_F__c', '');
+ }
+ if (assXiaoMaMap.containsKey(conTempList[i].Asset__c)) {
+ String allXiaoma = String.join(assXiaoMaMap.get(conTempList[i].Asset__c), ',');
+ wi.additionalInfoMap.put('Comment__c',allXiaoma);
+ }else {
+ wi.additionalInfoMap.put('Comment__c','');
+ }
+ if (conTempList[i].Hui_Ji_Jia__c == null || conTempList[i].Yi_Zhi_Bao_Fei_Jia__c != null || conTempList[i].Yi_Zhi_Guo_Qi_Jia__c != null || conTempList[i].Shang_Jia_Jia__c != null) {
+ wi.canEdit = false;
+ }
+ viewList.add(wi);
+ }
+ //update by youc 2021-12-07 end 涔嬪墠鏄牴鎹繚鏈夎澶囧睍绀哄埌椤甸潰涓婄殑 鐜板湪闇�瑕佸睍绀哄嚭鏄庣粏
+
}
if (cancelAction) {
--
Gitblit v1.9.1