From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523
---
force-app/main/default/classes/LexArriveGoodsMainController.cls | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/LexArriveGoodsMainController.cls b/force-app/main/default/classes/LexArriveGoodsMainController.cls
index 2ae4a6a..489086c 100644
--- a/force-app/main/default/classes/LexArriveGoodsMainController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsMainController.cls
@@ -30,7 +30,20 @@
@AuraEnabled
public static Results init(){
Results results = new Results();
+ results.isNoteStay = LexUtility.getIsNoteStay();
try {
+ List<String> idList = new List<String>();
+ idList.add('a2K10000002zHyDEAU');
+ idList.add('a2K10000002zIJEEA2');
+ idList.add('a2K10000002zK9rEAE');
+ idList.add('a2K10000004AKGBEA4');
+ idList.add('a2K10000004ALqeEAG');
+ idList.add('a2K10000004AMmrEAG');
+ idList.add('a2K10000004ANvDEAW');
+ idList.add('a2K10000004AOVxEAO');
+ idList.add('a2K10000004AOJZEA4');
+ idList.add('a2K10000004AOLuEAO');
+ idList.add('a2K10000004AOLfEAO');
// coc = new Consumable_order__c();
String userId = UserInfo.getUserId();
List<user> Useracc = New List<user>();
@@ -62,6 +75,7 @@
soql += ',' + s;
}
soql += ' from Consumable_order__c where Order_type__c = \''+'璁㈠崟'+'\' and recordtypeid =\'' + System.Label.RT_ConOrder_Delivery + '\' and Dealer_Info__c =\'' + accountid +'\' and Order_ProType__c =\'' + agencyProType +'\' and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0) and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' and showFalseNotshowTrue__c = false order by Deliver_date__c'; //
+ // soql = 'select id,name,ContractNo__c,Total_num__c,OrderNumber_arrived__c,Delivery_detail_count__c,OrderNumber_notarrive__c,More_than_seven_days__c,Shipment_date__c,First_Delivery__c from Consumable_order__c where id in :idList';
raesList = Database.query(soql);
//20200904 ljh add start
Total_num = 0;
@@ -71,11 +85,21 @@
More_than_seven_days = 0;
System.debug('-----1------'+raesList);
for(Consumable_order__c conorder :raesList){
- Total_num += (Integer)conorder.Total_num__c;
- OrderNumber_arrived += (Integer)conorder.OrderNumber_arrived__c;
- Delivery_detail_count += (Integer)conorder.Delivery_detail_count__c;
- OrderNumber_notarrive += (Integer)conorder.OrderNumber_notarrive__c;
- More_than_seven_days += (Integer)conorder.More_than_seven_days__c;
+ if(conorder.Total_num__c != null){
+ Total_num += (Integer)conorder.Total_num__c;
+ }
+ if(conorder.OrderNumber_arrived__c != null){
+ OrderNumber_arrived += (Integer)conorder.OrderNumber_arrived__c;
+ }
+ if(conorder.Delivery_detail_count__c != null){
+ Delivery_detail_count += (Integer)conorder.Delivery_detail_count__c;
+ }
+ if(conorder.OrderNumber_notarrive__c != null){
+ OrderNumber_notarrive += (Integer)conorder.OrderNumber_notarrive__c;
+ }
+ if(conorder.More_than_seven_days__c != null){
+ More_than_seven_days += (Integer)conorder.More_than_seven_days__c;
+ }
}
results.agencyProType = agencyProType;
results.accountId = accountid;
@@ -96,8 +120,13 @@
}
@AuraEnabled
- public static Results searchConsumableorderdetails(){
+ public static Results searchConsumableorderdetails(String category1Str, Date cate2Str, String accountidStr, String userWorkLocationStr, String agencyProTypeStr){
Results results = new Results();
+ category1 = category1Str;
+ cate2 = cate2Str;
+ accountid = accountidStr;
+ userWorkLocation = userWorkLocationStr;
+ agencyProType = agencyProTypeStr;
try {
// cate2 = coc.Shipment_date__c;
// 鑾峰緱璁㈠崟涓�瑙�
@@ -133,6 +162,7 @@
soql += ' order by Deliver_date__c';
system.debug('====soql:' + soql);
raesList = Database.query(soql);
+ results.raesList = raesList;
results.result = 'Success';
} catch (Exception e) {
results.result = 'Fail';
@@ -172,5 +202,7 @@
public Integer orderNumberNotarrive;
@AuraEnabled
public Integer moreThanSevenDays;
+ @AuraEnabled
+ public Boolean isNoteStay;
}
}
\ No newline at end of file
--
Gitblit v1.9.1