From e14d6d0619330cad423f06493e3aa2371faa2a8f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 09 九月 2023 14:02:23 +0800
Subject: [PATCH] Sit期间修改
---
force-app/main/default/classes/InventoryResultRecordController.cls | 154 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 52 deletions(-)
diff --git a/force-app/main/default/classes/InventoryResultRecordController.cls b/force-app/main/default/classes/InventoryResultRecordController.cls
index 71c2103..78797f3 100644
--- a/force-app/main/default/classes/InventoryResultRecordController.cls
+++ b/force-app/main/default/classes/InventoryResultRecordController.cls
@@ -1,16 +1,4 @@
-/*
- * @Description:
- * @version:
- * @Author: chen jing wu
- * @Date: 2023-07-12 11:08:28
- * @LastEditors: chen jing wu
- * @LastEditTime: 2023-08-08 18:43:40
- */
public with sharing class InventoryResultRecordController {
- // 鎸夐挳鍖哄煙
- public Boolean inventoryBlueFlag {get; private set;} // 鏌ョ湅鐩樼偣钃濊壊鎸夐挳Flag
- public Boolean rentBlueFlag {get; private set;} // 鏌ョ湅澶囧搧钃濊壊鎸夐挳Flag
- public Boolean consumBlueFlag {get; private set;} // 鏌ョ湅鑰楁潗鐩樼偣钃濊壊鎸夐挳Flag
// 妫�绱㈠尯鍩�
public String fixtureModelNo {get; set;} // 澶囧搧閰嶅鏄庣粏鍨嬪彿 Fixture_Model_No__c
public String assetStatus {get; set;} // 澶囧搧鐘舵�� Asset_Status__c
@@ -45,6 +33,8 @@
private String mainAstQR = '';
public boolean doneFlg {get; set;}
public boolean canDoFlg {get; set;}
+ public List<AggregateResult> idListBean = new List<AggregateResult>();
+ public List<AggregateResult> cidListBean = new List<AggregateResult>();
public List<SelectOption> assetStatusOptionList {
get {
@@ -63,13 +53,6 @@
selectOptions.add(new SelectOption('鑰楁潗', '鑰楁潗'));
return selectOptions;
}
- }
-
- // 鍒濆鍖栨寜閽鑹�
- public void initSearchButtonColor() {
- inventoryBlueFlag = true;
- rentBlueFlag = false;
- consumBlueFlag = false;
}
// 鎵�鍦ㄥ湴鍖�(鏈儴)PlickList
@@ -168,7 +151,6 @@
// 鐢婚潰鍒濆鍖�
public void init() {
- initSearchButtonColor();
angecylookrole = false;
bpPankuiYing = NONE;
ifInternalAsset = NONE;
@@ -255,13 +237,15 @@
inventoryHeader = ih;
canDoFlg = canDoFlg || !System.Approval.isLocked(inventoryHeader.Id);
- List<AggregateResult> fixAssetList = [
+ idListBean = [
Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
From Inventory_Detail__c//20210525 you 1650
Where Inventory_Header__c = :inventoryHeader.Id AND Asset_Status__c <> '涓㈠け鍊熷嚭鏄庣粏' AND Asset_Status__c <> '涓㈠け璋冩嫧鏄庣粏'
group by Internal_Asset_Flg__c, Asset_Status__c];
- unfixAssetMap = getInitData(fixAssetList, 'unfix');
- fixAssetMap = getInitData(fixAssetList, 'fix');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ // unfixAssetMap = getInitData(aBean, 'unfix');
+ // fixAssetMap = getInitData(aBean, 'fix');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
}
}
else{
@@ -278,13 +262,15 @@
else{
consumInventoryHeader = ih;
canDoFlg = canDoFlg || !System.Approval.isLocked(consumInventoryHeader.Id);
- List<AggregateResult> consumAssetList = [
+ cidListBean = [
Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
From Consum_Inventory_Detail__c
Where Inventory_Header__c = :consumInventoryHeader.Id
AND Asset_Status__c != '宸叉秷鑰楁槑缁�'
group by Internal_Asset_Flg__c, Asset_Status__c];
- consumAssetMap = getInitData(consumAssetList, 'consum');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ //consumAssetMap = getInitData(aBean, 'consum');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
}
}
else{
@@ -292,13 +278,60 @@
}
}
}
- //System.assertEquals('qyj','unfixAssetMap'+unfixAssetMap);
- //System.assertEquals('qyj','fixAssetMap'+fixAssetMap);
- //System.assertEquals('qyj','consumAssetMap'+consumAssetMap);
- sumRateMap = getRateMap(unfixAssetMap.get('allsum')+fixAssetMap.get('allsum')+consumAssetMap.get('allsum')
- , unfixAssetMap.get('dsum')+fixAssetMap.get('dsum')+consumAssetMap.get('dsum')
- , unfixAssetMap.get('acsum')+fixAssetMap.get('acsum')+consumAssetMap.get('acsum'));
+
+ //sumRateMap = getRateMap(unfixAssetMap.get('allsum')+fixAssetMap.get('allsum')+consumAssetMap.get('allsum')
+ // , unfixAssetMap.get('dsum')+fixAssetMap.get('dsum')+consumAssetMap.get('dsum')
+ // , unfixAssetMap.get('acsum')+fixAssetMap.get('acsum')+consumAssetMap.get('acsum'));
}
+
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ public void showResult() {
+ unfixAssetMap = getInitData(new List<AggregateResult>(), 'unfix');
+ fixAssetMap = getInitData(new List<AggregateResult>(), 'fix');
+ consumAssetMap = getInitData(new List<AggregateResult>(), 'consum');
+ List<Inventory_Header__c> ihList = [
+ select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c, Fixture_Header__c
+ from Inventory_Header__c
+ where Inventory_Status__c <> '宸叉壒鍑�' and Internal_asset_location__c =:bieCunFangDi
+ and Inventory_Start_Date__c = LAST_N_DAYS:30
+ ORDER BY Fixture_Header__c NULLS FIRST];
+ System.debug('20230710 00:28--ihList--' + ihList);
+ for(Inventory_Header__c ih:ihList){
+ if(String.isBlank(ih.Fixture_Header__c)) {
+ if( String.isNotBlank(ih.Inventory_Status__c)){
+ if (ih.Inventory_Status__c == '澶勭悊涓�') {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鐩樼偣澶勭悊涓紝璇风瓑寰匓atch澶勭悊瀹屾瘯銆侭atch澶勭悊瀹屾瘯鍚庝細鍙戦�佸鐞嗙粨鏋滈偖浠躲��'));
+ }
+ else{
+ unfixAssetMap = getInitData(idListBean, 'unfix');
+ fixAssetMap = getInitData(idListBean, 'fix');
+ }
+ }
+ else{
+ unfixAssetMap = getInitData(new List<AggregateResult>(), 'unfix');
+ fixAssetMap = getInitData(new List<AggregateResult>(), 'fix');
+ }
+ }
+ else {
+ if (String.isNotBlank(ih.Inventory_Status__c)) {
+ if (ih.Inventory_Status__c == '澶勭悊涓�') {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鑰楁潗鐩樼偣澶勭悊涓紝璇风瓑寰匓atch澶勭悊瀹屾瘯銆侭atch澶勭悊瀹屾瘯鍚庝細鍙戦�佸鐞嗙粨鏋滈偖浠躲��'));
+ }
+ else{
+ consumAssetMap = getInitData(cidListBean, 'consum');
+ }
+ }
+ else{
+ consumAssetMap = getInitData(new List<AggregateResult>(), 'consum');
+ }
+ }
+ }
+
+ sumRateMap = getRateMap(unfixAssetMap.get('allsum')+fixAssetMap.get('allsum')+consumAssetMap.get('allsum')
+ , unfixAssetMap.get('dsum')+fixAssetMap.get('dsum')+consumAssetMap.get('dsum')
+ , unfixAssetMap.get('acsum')+fixAssetMap.get('acsum')+consumAssetMap.get('acsum'));
+ }
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
//public void checkQRCode() {
// String soqlWhere = '';
@@ -617,6 +650,12 @@
Decimal newCount_int = newCount == null ? 0 : newCount;
if (oldCount_int == newCount_int && !((oldCount == null && newCount == 0) || (oldCount == 0 && newCount == null))) continue;
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (String.isBlank(idc.Appearance_Check_Result__c) || String.isBlank(idc.Package_Check_Result__c)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶栬鍜屽寘瑁呭繀椤绘湁鍊硷紝璇烽噸鏂扮‘璁ゃ��'));
+ return;
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
if (idc.Inventory_Count__c != null) {
idc.InventoryPerson1__c = inventoryUser1 == NONE ? null : inventoryUser1;
idc.InventoryPerson2__c = inventoryUser2 == NONE ? null : inventoryUser2;
@@ -640,6 +679,12 @@
Decimal newCount_int = newCount == null ? 0 : newCount;
if (oldCount_int == newCount_int && !((oldCount == null && newCount == 0) || (oldCount == 0 && newCount == null))) continue;
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (String.isBlank(idc.Expiration_Check_Result__c) || String.isBlank(idc.Appearance_Check_Result__c) || String.isBlank(idc.Package_Check_Result__c)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鏁堟湡銆佸瑙傚拰鍖呰蹇呴』鏈夊�硷紝璇烽噸鏂扮‘璁ゃ��'));
+ return;
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
if (idc.Inventory_Count__c != null) {
idc.InventoryPerson1__c = inventoryUser1 == NONE ? null : inventoryUser1;
idc.InventoryPerson2__c = inventoryUser2 == NONE ? null : inventoryUser2;
@@ -677,9 +722,8 @@
} catch (exception e) {
doneFlg = false;
System.debug(e.getStackTraceString());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,e.getMessage()));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,e.getDmlMessage(0)));
}
-
}
public void searchBtn() {
@@ -734,12 +778,18 @@
}
String soqlAsset = 'select '
+ 'Id, Asset__r.SerialNumber, Inventory_Count__c, Asset__c, Asset__r.Manage_type__c, '
- + ' Fixture_Model_No__c, Fixture_QRCode__c, Asset_Status__c, WH_location__c, Amount__c, Salesdepartment__c,Asset__r.Product2.Packing_list_Fixture_F__c';
+ + ' Fixture_Model_No__c, Fixture_QRCode__c, Asset_Status__c, WH_location__c, Amount__c, Salesdepartment__c,Asset__r.Product2.Packing_list_Fixture_F__c'
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start
+ + ', Appearance_Check_Result__c, Package_Check_Result__c';
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End
if(isConsum){
soqlAsset += ', Barcode__c, Asset__r.Product_Serial_No__c ';
//add by rentx 20210823 start 鑰楁潗鐩樼偣鏃惰褰昪ode ----
soqlAsset += ', HCCodes__c ';
//add by rentx 20210823 end 鑰楁潗鐩樼偣鏃惰褰昪ode
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start
+ soqlAsset += ', Expiration_Check_Result__c, Consumable_Guaranteen_end__c ';
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End
soqlAsset += 'from Consum_Inventory_Detail__c ';
}
else{
@@ -844,13 +894,15 @@
allHCCodelist.add(idl.HCCodes__c);
//add by rentx 20210901 end
}
- List<AggregateResult> consumAssetList = [
- Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
- From Consum_Inventory_Detail__c
- Where Inventory_Header__c = : ih.Id
- and Asset_Status__c != '宸叉秷鑰楁槑缁�'
- group by Internal_Asset_Flg__c, Asset_Status__c];
- consumAssetMap = getInitData(consumAssetList, 'consum');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ // List<AggregateResult> consumAssetList = [
+ // Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
+ // From Consum_Inventory_Detail__c
+ // Where Inventory_Header__c = : ih.Id
+ // and Asset_Status__c != '宸叉秷鑰楁槑缁�'
+ // group by Internal_Asset_Flg__c, Asset_Status__c];
+ // consumAssetMap = getInitData(consumAssetList, 'consum');
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
}
else{
inventoryDetailList = Database.query(soqlAsset);
@@ -865,21 +917,23 @@
oldCountMap.put(idl.Id, idl.Inventory_Count__c);
}
- List<AggregateResult> fixAssetList = [
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ /*List<AggregateResult> fixAssetList = [
Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
From Inventory_Detail__c //20210525 you 1650
Where Inventory_Header__c = :ih.Id AND Asset_Status__c <> '涓㈠け鍊熷嚭鏄庣粏' AND Asset_Status__c <> '涓㈠け璋冩嫧鏄庣粏'
group by Internal_Asset_Flg__c, Asset_Status__c];
unfixAssetMap = getInitData(fixAssetList, 'unfix');
- fixAssetMap = getInitData(fixAssetList, 'fix');
+ fixAssetMap = getInitData(fixAssetList, 'fix');*/
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
}
}
- sumRateMap = getRateMap(unfixAssetMap.get('allsum')+fixAssetMap.get('allsum')+consumAssetMap.get('allsum')
+
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� start
+ /*sumRateMap = getRateMap(unfixAssetMap.get('allsum')+fixAssetMap.get('allsum')+consumAssetMap.get('allsum')
, unfixAssetMap.get('dsum')+fixAssetMap.get('dsum')+consumAssetMap.get('dsum')
- , unfixAssetMap.get('acsum')+fixAssetMap.get('acsum')+consumAssetMap.get('acsum'));
- //System.assertEquals('qyj',''+sumRateMap);
-
-
+ , unfixAssetMap.get('acsum')+fixAssetMap.get('acsum')+consumAssetMap.get('acsum'));*/
+ //20230506 sx DB202303526794銆愮郴缁熻皟鏌ャ�戝鍝佷腑蹇冪洏鐐圭郴缁熻皟鏌� end
List<Inventory_User_Permission__mdt> usrList = [select InventoryUser__c from Inventory_User_Permission__mdt where Label = :bieCunFangDi];
Id[] usrArray = usrList[0].InventoryUser__c.split(',');
@@ -1077,8 +1131,4 @@
}
return rateMap;
}
- @TestVisible private static void test() {
- Integer i = 0;
-
- }
}
\ No newline at end of file
--
Gitblit v1.9.1