From 41ad0c0840a6135b7acf2280f0eebdc29bf6479b Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 30 五月 2023 14:25:11 +0800
Subject: [PATCH] backup0530
---
force-app/main/default/classes/LexSaleOrderController.cls | 88 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/force-app/main/default/classes/LexSaleOrderController.cls b/force-app/main/default/classes/LexSaleOrderController.cls
index ccc9d78..d967cc7 100644
--- a/force-app/main/default/classes/LexSaleOrderController.cls
+++ b/force-app/main/default/classes/LexSaleOrderController.cls
@@ -180,13 +180,13 @@
if (coc.Arrive_Order__c != null) {
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'鏃犻渶鍒拌揣纭锛岃鐩存帴鍑哄簱銆�'));
// return;
- return new ResponseBodyLWC('Error', 500, '鏃犻渶鍒拌揣纭锛岃鐩存帴鍑哄簱銆�', '');
+ return new ResponseBodyLWC('Error', 500, '鏃犻渶鍒拌揣纭锛岃鐩存帴鍑哄簱', '');
}
//鍒ゆ柇barcode鏄惁涓虹┖
if (barcode == null || barcode == '') {
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭BarCode鍙枫��'));
// return;
- return new ResponseBodyLWC('Error', 500, '璇疯緭BarCode鍙枫��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭BarCode鍙�', '');
}
list<String> exitlist = new List<String>();
list<String> notexitlist = new List<String>();
@@ -617,6 +617,7 @@
Send_Date__c,
Consumable_order_minor__r.Name,
Consumable_order_minor__c,
+ Consumable_order_minor__r.Arrive_Order__c,
Intra_Trade_List_RMB__c,
Asset_Model_No__c,
Isoverdue__c,
@@ -675,10 +676,22 @@
} else if (!checkBarcodeResult.containsKey(newdet2[j].Bar_Code__c)) {
Matcher n = Pattern.compile('[0-9]').matcher(newdet2[j].TracingCode__c);
if (n.find()) {
- String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
- consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j], str));
- errorIdMap.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
- continue;
+ if (newdet2[j].TracingCode__c.length() == 5) {
+ String tr = newdet2[j].TracingCode__c;
+ String Ctr = tr.substring(tr.length() - 3,tr.length());
+ String Btr = tr.substring(tr.length() - 4,tr.length()-3);
+ String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
+ errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
+ continue;
+ }
+ }
+ // String str = '绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒銆�';
+ // consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j], str));
+ // errorIdMap.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
+ // continue;
}
checkBarcodeResult.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
consumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(newdet2[j]));
@@ -828,30 +841,30 @@
// 鍑鸿揣
@AuraEnabled
public static ResponseBodyLWC ProdElivery(
- String ESetId,
+ String ESetIdLwc,
Consumable_order__c cocLwc,
String barcodeLwc,
- String accountName,
- String userWorkLocation,
+ String accountNameLwc,
+ String userWorkLocationLwc,
String consumableorderdetailsRecordsLwc,
- List<Consumable_orderdetails__c> orderdetails,
- Map<String, Decimal> orderpriceMap,
- Map<String, Decimal> orderagencypriceMap
+ List<Consumable_orderdetails__c> orderdetailsLwc,
+ Map<String, Decimal> orderpriceMapLwc,
+ Map<String, Decimal> orderagencypriceMapLwc
) {
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
- ESetId = ESetId;
+ ESetId = ESetIdLwc;
coc = cocLwc;
barcode = barcodeLwc;
- accountName = accountName;
- userWorkLocation = userWorkLocation;
+ accountName = accountNameLwc;
+ userWorkLocation = userWorkLocationLwc;
consumableorderdetailsRecords = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
consumableorderdetailsRecordsLwc,
List<ConsumableorderdetailsInfo>.class
);
- orderdetails = orderdetails;
- orderpriceMap = orderpriceMap;
+ orderdetails = orderdetailsLwc;
+ orderpriceMap = orderpriceMapLwc;
orderagencypriceMap = orderagencypriceMap;
BarcodeCntMap = new Map<String, Integer>();
if (coc.Arrive_Order__r.IsShipment__c == true) {
@@ -1009,35 +1022,42 @@
// 閿�鍞�
@AuraEnabled
public static ResponseBodyLWC ProSale(
- String ESetId,
+ String ESetIdLwc,
Consumable_order__c cocLwc,
String barcodeLwc,
- String accountName,
- String userWorkLocation,
+ String accountNameLwc,
+ String userWorkLocationLwc,
String consumableorderdetailsRecordsLwc,
- List<Consumable_orderdetails__c> orderdetails,
- Map<String, Decimal> orderpriceMap,
- Map<String, Decimal> orderagencypriceMap
+ List<Consumable_orderdetails__c> orderdetailsLwc,
+ Map<String, Decimal> orderpriceMapLwc,
+ Map<String, Decimal> orderagencypriceMapLwc
) {
System.debug('enter ProSale');
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
res.entity = data;
- ESetId = ESetId;
+ ESetId = ESetIdLwc;
coc = cocLwc;
barcode = barcodeLwc;
- accountName = accountName;
- userWorkLocation = userWorkLocation;
+ accountName = accountNameLwc;
+ userWorkLocation = userWorkLocationLwc;
consumableorderdetailsRecords = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
consumableorderdetailsRecordsLwc,
List<ConsumableorderdetailsInfo>.class
);
- orderdetails = orderdetails;
- orderpriceMap = orderpriceMap;
- orderagencypriceMap = orderagencypriceMap;
+ orderdetails = orderdetailsLwc;
+ orderpriceMap = orderpriceMapLwc;
+ orderagencypriceMap = orderagencypriceMapLwc;
+ System.debug('ESetId = ' + ESetId);
+ System.debug('coc = ' + coc);
+ System.debug('barcode = ' + barcode);
+ System.debug('accountName = ' + accountName);
+ System.debug('userWorkLocation = ' + userWorkLocation);
System.debug('consumableorderdetailsRecords = ' + consumableorderdetailsRecords);
+ System.debug('orderdetails = ' + orderdetails);
System.debug('orderpriceMap = ' + orderpriceMap);
+ System.debug('orderagencypriceMap = ' + orderagencypriceMap);
BarcodeCntMap = new Map<String, Integer>();
if (consumableorderdetailsRecords.size() < 1) {
@@ -1052,17 +1072,15 @@
}
Getconsumableorderdetails2Nobox();
+ System.debug('BarcodeCntMap = ' + BarcodeCntMap);
for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecords) {
String key = '' + ass.orderdetails2.Bar_Code__c;
Integer deliverycnt = BarcodeCntMap.get(key);
- if (
- ass.orderdetails2.Box_Piece__c == '涓�' &&
- (ass.outboundCount == null ||
- String.valueof(ass.outboundCount) == '' ||
- ass.outboundCount <= 0)
- ) {
+ if (ass.orderdetails2.Box_Piece__c == '涓�' &&(ass.outboundCount == null || String.valueof(ass.outboundCount) == '' || ass.outboundCount <= 0)) {
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '璇疯緭鍏ヤ骇鍝� '+ ass.Prod.Name +' 鐨勫嚭璐ф暟閲�'));
// return null;
+ System.debug('ass.orderdetails2.Box_Piece__c = ' + ass.orderdetails2.Box_Piece__c);
+ System.debug('ass.outboundCount = ' + ass.outboundCount);
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ヤ骇鍝� ' + ass.Prod.Name + ' 鐨勫嚭璐ф暟閲�', '');
}
if (ass.outboundCount > deliverycnt) {
--
Gitblit v1.9.1