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/LexOverdueStockController.cls | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/LexOverdueStockController.cls b/force-app/main/default/classes/LexOverdueStockController.cls
index c32d6a1..adbaaa7 100644
--- a/force-app/main/default/classes/LexOverdueStockController.cls
+++ b/force-app/main/default/classes/LexOverdueStockController.cls
@@ -146,17 +146,16 @@
}
}
// return;
- System.debug('overdueList===>'+overdueList);
- System.debug('overduePageRecords====>'+overduePageRecords);
- data.put('overdueList',JSON.serialize(overdueList));
- data.put('overduePageRecords',JSON.serialize(overduePageRecords));
- data.put('codPageRecords',JSON.serialize(codPageRecords));
- data.put('iSinventory',iSinventory);
- res.status = 'Success';
- res.code = 200;
- res.msg = '鎵�鏈夋墦鍕句骇鍝侀攢瀛樻垚鍔�';
- System.debug('res = ' + res);
- return res;
+ System.debug('overduePageRecords = ' + overduePageRecords);
+ data.put('overduePageRecords',JSON.serialize(overduePageRecords));
+ data.put('codPageRecords',JSON.serialize(codPageRecords));
+ data.put('iSinventory',iSinventory);
+ data.put('overdueList',overdueList);
+ res.status = 'Success';
+ res.code = 200;
+ // res.msg = '璇疯緭鍏arCode鍙�';
+ System.debug('res = ' + res);
+ return res;
}
// 杈撳叆barcode鏃�
@@ -211,15 +210,20 @@
// 淇濆瓨鎸夐挳
@AuraEnabled
- public static ResponseBodyLWC save(Boolean iSinventory,string saveCodPageRecords,String saveoverdueList) {
+ public static ResponseBodyLWC save(Boolean iSinventory,string saveCodPageRecords,List<Consumable_order_details2__c> saveoverdueList) {
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
system.debug('saveCodPageRecords=============>'+saveCodPageRecords);
- List<orderBean> codPageRecords = (List<orderBean>)JSON.deserialize(saveCodPageRecords,List<orderBean>.class);
- List<Consumable_order_details2__c> overdueList = (List<Consumable_order_details2__c>)JSON.deserialize(saveoverdueList,List<Consumable_order_details2__c>.class);
-
+ system.debug('saveoverdueList'+saveoverdueList);
+ overdueList = saveoverdueList;
+ // if(saveoverdueList==null){
+ // return new ResponseBodyLWC('Error',500, '璇烽�夋嫨瑕侀攢瀛樼殑鏄庣粏', '');
+ // }
+
+ List<orderBean> codPageRecords = (List<orderBean>)JSON.deserialize(saveCodPageRecords,List<orderBean>.class);
+ // List<Consumable_order_details2__c> overdueList = (List<Consumable_order_details2__c>)JSON.deserialize(saveoverdueList,List<Consumable_order_details2__c>.class);
// add by Wang Xueqin 2023/04/12
// 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
user Useracc = [select Accountid, Work_Location__c,UserPro_Type__c from user where id =: UserInfo.getUserId()];
@@ -229,7 +233,7 @@
StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
if(!iSinventory){
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'璇峰厛鐐广�怋arCode褰曞叆銆�'));
- return new ResponseBodyLWC('Error',500, '璇峰厛鐐广�怋arCode褰曞叆銆�', '');
+ return new ResponseBodyLWC('Error',500, '璇峰厛褰曞叆BarCode', '');
// return null;
}
integer Lo = 0;
@@ -325,19 +329,28 @@
// Data Bean
class orderBean implements Comparable {
-
+ @AuraEnabled
public Consumable_order_details2__c orderdetails2 { get; set; }
+ @AuraEnabled
public Product2__c Prod { get; set; }
+ @AuraEnabled
public Boolean check { get; set; }
+
// 杩囨湡搴撳瓨
+ @AuraEnabled
public Integer overlimitCount { get; set; }
// 閿�瀛樻暟閲�
+ @AuraEnabled
public Integer pandian { get; set; }
// 閿�瀛樺師鍥�
+ @AuraEnabled
public String diffReason { get; set; }
// 鍗曚綅
+ @AuraEnabled
public String boxPiece { get; set; }
+ @AuraEnabled
public String prodname { get; set; }
+ @AuraEnabled
public String prodid { get; set; }
orderBean(Consumable_order_details2__c e,string str) {
orderdetails2 = e;
--
Gitblit v1.9.1