From 9b197b7fac92278fb591ea8f4942c7d5687cb5ce Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期一, 28 三月 2022 18:01:22 +0800
Subject: [PATCH] LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备0328
---
force-app/main/default/classes/InventoryAutoGiveupBatch.cls | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/classes/InventoryAutoGiveupBatch.cls b/force-app/main/default/classes/InventoryAutoGiveupBatch.cls
index 47fabc6..c8149ad 100644
--- a/force-app/main/default/classes/InventoryAutoGiveupBatch.cls
+++ b/force-app/main/default/classes/InventoryAutoGiveupBatch.cls
@@ -4,11 +4,15 @@
global Integer totalCount = 0; // 鎬讳欢鏁�
global Integer failedCount = 0;
global Date tdy = Date.today();
-
+ Boolean IsNeedExecute = false;
+
/**
* 銈炽兂銈广偪銉炽儓
*/
global InventoryAutoGiveupBatch() {
+ }
+ global InventoryAutoGiveupBatch(Boolean NeedExecute) {
+ this.IsNeedExecute = NeedExecute;
}
/**
@@ -18,21 +22,14 @@
bp3_Setting__c conf = bp3_Setting__c.getOrgDefaults();
Date autoGiveupDate30 = Date.today().addDays(-(conf.Auto_GiveUp_Day__c == null ? 30 : Integer.valueOf(conf.Auto_GiveUp_Day__c)));
Date autoGiveupStartDate = conf.Auto_Giveup_StartDate__c == null ? Date.valueOf('1970-01-01') : conf.Auto_Giveup_StartDate__c;
- return Database.getQueryLocator(
- [SELECT Id,
- LostReport_Detail__c,
- LostReport_Detail__r.LostReport_Status_F__c,
- LostReport_Detail__r.LostReport__c
- FROM Inventory_Detail__c
- WHERE Auto_Lost_item_giveup__c = false
- AND Inventory_Deviation__c < 0
- AND Internal_Asset_Flg__c = true
- AND Inventory_Time__c != null
- AND Auto_Loaner_Giveup_StartCalculating_Date__c >= :autoGiveupStartDate
- AND Auto_Loaner_Giveup_StartCalculating_Date__c != null
- AND Auto_Loaner_Giveup_StartCalculating_Date__c <= :autoGiveupDate30
- ORDER BY Id]
- );
+ String query = 'SELECT Id,LostReport_Detail__c,LostReport_Detail__r.LostReport_Status_F__c,LostReport_Detail__r.LostReport__c';
+ query+= ' FROM Inventory_Detail__c';
+ query+= ' WHERE Auto_Lost_item_giveup__c = false AND Inventory_Deviation__c < 0 AND Internal_Asset_Flg__c = true AND Inventory_Time__c != null';
+ query+= ' AND Auto_Loaner_Giveup_StartCalculating_Date__c >= :autoGiveupStartDate AND Auto_Loaner_Giveup_StartCalculating_Date__c != null AND Auto_Loaner_Giveup_StartCalculating_Date__c <= :autoGiveupDate30 ORDER BY Id';
+ if(Test.isRunningTest()){
+ query += ' limit 1';
+ }
+ return Database.getQueryLocator(query);
}
global void execute(Database.BatchableContext BC, List<SObject> ldList) {
@@ -77,5 +74,12 @@
totalCount, totalCount - failedCount, failedCount);
}
be.send();
+
+ //2022/2/21 pk 鍙戣揣涓冨ぉ杩樻湭鍒拌揣鏁� start
+ if(!Test.isRunningTest() && IsNeedExecute==true){
+ //batch閲岃皟鐢ㄤ笅涓�涓猙atch鏃讹紝甯屾湜璺熷師鏈夌殑Schedule閲岄潰浼犵殑鏉℃暟淇濇寔涓�鑷�
+ Id execBTId = Database.executebatch(new Consumable7daysBatch(true),200);
+ }
+ //2022/2/21 pk 鍙戣揣涓冨ぉ杩樻湭鍒拌揣鏁� end
}
}
\ No newline at end of file
--
Gitblit v1.9.1