From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/classes/InventoryResultRecordCopyController.cls | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/InventoryResultRecordCopyController.cls b/force-app/main/default/classes/InventoryResultRecordCopyController.cls
index b6e8fb4..9075bae 100644
--- a/force-app/main/default/classes/InventoryResultRecordCopyController.cls
+++ b/force-app/main/default/classes/InventoryResultRecordCopyController.cls
@@ -174,7 +174,7 @@
deptCheck_PIC = currUser.Dept__c; //20210618 1650 you
String cunFangDi = ApexPages.currentPage().getParameters().get('cunFangDi');
hasConsumAsset = false;
- system.debug(cunFangDi+'==177='+bieCunFangDi);
+ system.debug(cunFangDi+'==177=='+bieCunFangDi);
if (cunFangDi != null) bieCunFangDi = cunFangDi;
//20210628 you 1650 鍔炰簨澶勭湅涓嶅埌 璐ф灦鍙�
if (bieCunFangDi=='骞垮窞 澶囧搧涓績' || bieCunFangDi=='鍖椾含 澶囧搧涓績' || bieCunFangDi=='涓婃捣 澶囧搧涓績') {
@@ -204,11 +204,15 @@
statusMap = new Map<String, List<String>>();
//澶囧搧鎼 20210706 SFDC-C5CC5S 鏆傚仠
+ Date today = Date.today();
List<Inventory_Header_Copy__c> ihList = [
select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c, Fixture_Header__c
from Inventory_Header_Copy__c
where Inventory_Status__c <> '宸叉壒鍑�' and Internal_asset_location__c =:bieCunFangDi
- and Inventory_Start_Date__c = LAST_N_DAYS:30
+ // 20220225 ljh 113鐩樼偣
+ // and Inventory_Start_Date__c = LAST_N_DAYS:30
+ and Inventory_Start_Date__c = :today
+ // 20220225 ljh 113鐩樼偣
ORDER BY Fixture_Header__c NULLS FIRST];
// List<Inventory_Header_Copy__c> ihList = [
// select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c, Fixture_Header__c
@@ -536,8 +540,10 @@
return;
}
// 澶囧搧鎼 SFDC-C5CC5S 鏆傚仠
- List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:30];
- // List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:1];
+ // 20220225 ljh 113鐩樼偣
+ // List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:30];
+ Date today = Date.today();
+ List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c =:today];
if (ihList.size() > 0) {
if (ihList[0].Inventory_Status__c == null) {
//do nothing
@@ -564,15 +570,11 @@
ih_new.Inventory_Start_Date__c = Date.today();
ih_new.InventorySubmit_PIC__c = String.isBlank(submitPIC) ? null : submitPIC;
ih_new.InventoryCheck_PIC__c = String.isBlank(checkPIC) ? null : checkPIC;
- ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today().toStartOfMonth();
+ // ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today().toStartOfMonth();
+ ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today();
//.toStartOfMonth(); 澶囧搧鎼 uniqueKey淇濊瘉鍞竴 SFDC-C5CC5S
// FixtureUtil.withoutUpsertIh(new List<Inventory_Header_Copy__c> {ih_new});
- /*public static void withoutUpsertIh(List<Inventory_Header__c> sobj) {
- if (!sobj.isEmpty()) upsert sobj UniqueKey__c;
- }*/
- // List<Inventory_Header_Copy__c> sobj = new List<Inventory_Header_Copy__c> {ih_new};
- // if (!sobj.isEmpty()) upsert sobj UniqueKey__c;
FixtureUtil.withoutUpsertIhCopy(new List<Inventory_Header_Copy__c> {ih_new});
// InventoryStartAssetSnapshotBatch istarter = new InventoryStartAssetSnapshotBatch(bieCunFangDi, ih_new);
InventoryStartAssetSnapshotCopyBatch istarter = new InventoryStartAssetSnapshotCopyBatch(bieCunFangDi, ih_new);
@@ -581,7 +583,7 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '寮�濮嬬洏鐐瑰鐞嗭紝璇风瓑寰匓atch澶勭悊缁撴潫'));
}
- public void save() {
+ /*public void save() {
doneFlg = false;
// 绫诲埆涓哄鍝佹垨涓虹┖ <=> 绫诲埆!=鑰楁潗
if (assetCategory != '鑰楁潗' && inventoryHeader!=null && String.isNotBlank(inventoryHeader.Id) && System.Approval.isLocked(inventoryHeader.Id)) {
@@ -690,7 +692,10 @@
, Fixture_Header__c
from Inventory_Header_Copy__c
where Inventory_Status__c <> null and Inventory_Status__c <> '宸叉壒鍑�' and Internal_asset_location__c =:bieCunFangDi
- and Inventory_Start_Date__c = LAST_N_DAYS:30
+ // 20220225 ljh 113鐩樼偣
+ // and Inventory_Start_Date__c = LAST_N_DAYS:30
+ and Inventory_Start_Date__c = LAST_N_DAYS:1
+ // 20220225 ljh 113鐩樼偣
ORDER BY Fixture_Header__c nulls first
];
// ihList = [select Id,Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c
@@ -833,13 +838,13 @@
//add by rentx 20210901 end
}
// 113 鐩樼偣Copy
- /*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_Copy__c = : ih.Id
- and Asset_Status__c != '宸叉秷鑰楁槑缁�'
- group by Internal_Asset_Flg__c, Asset_Status__c];
- consumAssetMap = getInitData(consumAssetList, 'consum');*/
+ // 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_Copy__c = : ih.Id
+ // and Asset_Status__c != '宸叉秷鑰楁槑缁�'
+ // group by Internal_Asset_Flg__c, Asset_Status__c];
+ // consumAssetMap = getInitData(consumAssetList, 'consum');
}
else{
inventoryDetailList = Database.query(soqlAsset);
@@ -874,7 +879,7 @@
Id[] usrArray = usrList[0].InventoryUser__c.split(',');
inventoryUserList = [select id, name from user where id in :usrArray];
- }
+ }*/
/**
* 鑾峰彇鍒濆鍖栨椂椤甸潰鏄剧ず鐨勬暟鎹�
--
Gitblit v1.9.1