From 42c34c657dcc64a5ad71898874ced60d27e8d762 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 10 七月 2023 10:32:12 +0800
Subject: [PATCH] backup0710
---
force-app/main/default/classes/ArriveGoodsController.cls | 1175 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 882 insertions(+), 293 deletions(-)
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index 85af333..8e2988f 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -88,8 +88,9 @@
//public String[] proidList =new String[]{};
public Decimal orderCountAll = 0;
public Decimal orderCountNotarrive = 0;
- private id return_Order_id = null;
- private id inventory_Order_id = null;
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ public id return_Order_id = null;
+ public id inventory_Order_id = null;
public boolean ReturnFLGbln { get; set; }
public boolean saveFLGbln { get; set; }
public String ArrType { get; set; }
@@ -102,6 +103,14 @@
public String product_Type = null;
public Boolean EngFlag = false;
public Boolean ETFlag = false;
+
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ public Boolean isLwc = false;
+ public String returnError;
+ public List<String> warningList;
+ public List<String> errorList;
+ public String urlType;
+
public ArriveGoodsController() {
baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
ESetId = ApexPages.currentPage().getParameters().get('esetId');
@@ -121,6 +130,29 @@
consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
//add by rentx 20210602 CHAN-C3K4ZQ end
// OrderAllMap = new Map<String, String>();
+ }
+
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ public ArriveGoodsController(String eSetId, String arrType) {
+ this.ESetId = eSetId;
+ this.ArrType = arrType;
+ ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
+ ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
+ consumableInventory = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
+ consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
+ consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
+ orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
+ detailsSummary = new List<ConsumableorderdetailsInfo>();
+ saveFLGbln = false;
+ consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
+ noboxBarcodeList = new Set<String>();
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ warningList = new List<String>();
+ errorList = new List<String>();
+ returnError = null;
+ urlType = null;
}
//add by rentx 20210602 CHAN-C3K4ZQ start 鍑洪敊鐨勫師鍥犳槸椤甸潰鏈�澶氬睍绀�1000鏉℃暟鎹�,浣嗘槸闇�瑕佸睍绀虹殑鏁版嵁瓒呰繃浜�1000鏉�,鐜板湪鎶婂睍绀轰笂绾挎敼涓�1000 * 1000
@@ -360,6 +392,18 @@
//========20160311======ADD_End==================================
//鑾峰彇鏄庣粏
public void SearchPro() {
+ //浠庝笅杈圭Щ涓婃潵 by Link 2023-5-23
+ if (barcode == null || barcode.trim() == '') {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = '璇疯緭鍏arCode鍙�';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
+ );
+ }
+ return;
+ }
notInlist = new List<String>();
otherAgencyMap = new Map<String, String>();
barMcodeMap = new Map<String, String>();
@@ -367,6 +411,10 @@
consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
+ //update by Link 20230428
+ if (isLwc) {
+ noboxBarcodeList = new Set<String>();
+ }
//add by rentx 2021-01-27 start
HosErrorList = new List<String>();
HosErrorMap = new Map<String, String>();
@@ -437,12 +485,16 @@
List<Consumable_order_details2__c> Ins = new List<Consumable_order_details2__c>();
List<Consumable_order_details2__c> reSet = new List<Consumable_order_details2__c>();
List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
- if (barcode == null || barcode.trim() == '') {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
- );
- return;
- }
+ //绉诲埌鏈�涓婅竟 by Link 2023-5-23
+ // if(barcode == null || barcode.trim() ==''){
+ // //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ // if(isLwc){
+ // returnError = '璇疯緭鍏arCode鍙�';
+ // }else {
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭鍏arCode鍙枫��'));
+ // }
+ // return;
+ // }
//瀵规瘮鍏ㄩ儴搴撳瓨涓槸鍚﹀瓨鍦ㄧ鐞嗙紪鐮佷竴鏍凤紝barcode鍙蜂笉涓�鏍风殑浜у搧
reSet1 = [
SELECT Id, Name, TracingCode__c, Bar_Code__c, Report_Product_Expiration__c
@@ -468,13 +520,21 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
str +
' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ str +
+ ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
+ )
+ );
+ }
ErrorIdMap.put(str, str);
ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
}
@@ -526,6 +586,8 @@
}
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '绠＄悊缂栫爜涓虹┖鐨勪骇鍝� ' + ErrorIdMap));
//鏁翠綋鍒拌揣
+ System.debug('EsetId===>' + EsetId);
+ System.debug('ArrType===>' + ArrType);
if (EsetId == null || EsetId == '') {
if (ArrType != 'ReG') {
//鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
@@ -589,6 +651,65 @@
}
}
}
+ System.debug('reSet1===>' + reSet1);
+ //add by Wang Xueqin
+ //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
+ reSet1 = [
+ SELECT
+ Id,
+ Name,
+ Intra_Trade_List_RMB__c,
+ Asset_Model_No__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Bar_Code__c,
+ Arrive_date__c,
+ Send_Date__c,
+ Consumable_order_minor__r.Name,
+ Consumable_order_minor__c,
+ Dealer_Arrive__c,
+ Guarantee_period_for_products__c,
+ CFDA_Status__c,
+ ProductPacking_list_manual__c,
+ Report_Product_Approbation__c,
+ Report_Product_Expiration__c,
+ Box_Piece__c,
+ Rrturn_count__c,
+ Product_Type__c,
+ ContractNo_text__c,
+ Consumable_order_minor__r.ContractNo__c
+ FROM Consumable_order_details2__c
+ WHERE
+ Bar_Code__c IN :BarCodeListP
+ AND (NOT Product_Type__c LIKE :userPro_Typestr)
+ ];
+
+ if (reSet1.size() > 0) {
+ for (Integer i = 0; i < reSet1.size(); i++) {
+ if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
+ // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
+ continue;
+ } else {
+ String str =
+ '浜у搧绫诲瀷[' +
+ reSet1[i].Product_Type__c +
+ ']涓庣敤鎴风殑绫诲瀷[' +
+ userPro_Type +
+ ']涓嶇';
+ ConsumableorderdetailsRecordserror.add(
+ new ConsumableorderdetailsInfo(reSet1[i], str)
+ );
+ ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
+ }
+ }
+ }
+ System.debug('reSet1===>1' + reSet1);
+ //end
+
//閿�鍞骇鍝�
reSet1 = [
SELECT
@@ -1284,14 +1405,23 @@
reSet1[i].Lose_Flag__c == true &&
reSet1[i].ToDueDateDays__c >= 0
) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add(
'浜у搧' +
reSet1[i].Consumable_Product__r.Name +
'瀛樺湪涓㈠け璁板綍'
- )
- ); //濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
+ '浜у搧' +
+ reSet1[i].Consumable_Product__r.Name +
+ '瀛樺湪涓㈠け璁板綍'
+ )
+ ); //濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
+ }
}
if (
reSet1[i].Lose_Flag__c == true &&
@@ -1531,15 +1661,22 @@
reSet[i].Bar_Code__c != str &&
reSet[i].TracingCode__c == barMcodeMap.get(str)
) {
- // 20220815 ljh SWAG-CH65B7 start
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add(
'鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- )
- );
- // 20220815 ljh SWAG-CH65B7 end
+ );
+ } else {
+ // 20220815 ljh SWAG-CH65B7 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
+ '鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
+ )
+ );
+ // 20220815 ljh SWAG-CH65B7 end
+ }
}
if (barMcodeMap.get(str) == reSet[i].TracingCode__c) {
reSet[i].Bar_Code__c = str;
@@ -1586,16 +1723,27 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'barcode' +
str +
'涓庡嚭搴撳崟' +
reSet1[i].Sale_orderName__c +
' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'barcode' +
+ str +
+ '涓庡嚭搴撳崟' +
+ reSet1[i].Sale_orderName__c +
+ ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
+ )
+ );
+ }
ErrorIdMap.put(str, str);
ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
}
@@ -1635,23 +1783,36 @@
if (ArrType != 'ReG') {
inventoryEntryNoESetId(notInlist);
if (notInStorelist.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
+ )
+ );
+ }
return;
}
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError =
'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
- )
- );
+ notInlist +
+ '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' +
+ notInlist +
+ '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
+ )
+ );
+ }
return;
}
}
@@ -1659,12 +1820,17 @@
//add by rentx 2021-01-27 start
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('BarCode鍙�:' + str + HosErrorMap.get(str) + '');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
+ )
+ );
+ }
}
}
//add by rentx 2021-01-27 end
@@ -2161,12 +2327,17 @@
if (notInlist.size() > 0) {
inventoryEntry(notInlist);
if (notInStorelist.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
+ )
+ );
+ }
return;
}
}
@@ -2175,12 +2346,17 @@
//add by rentx 2021-01-27 start 褰撹鍗曚负鍖婚櫌鐗逛环绫诲瀷鐨勮鍗曟椂,濡傛灉鎵句笉鍒癰arcode,涓嶈В鏋�,骞朵笖榛樿璇arcode瀵瑰簲鐨勬槑缁�2涓洪潪鍖婚櫌鐗逛环浜у搧,鐩存帴鎶ラ敊
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
+ )
+ );
+ }
}
}
//add by rentx 2021-01-27 end
@@ -2216,14 +2392,23 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
+ )
+ );
+ }
continue;
} else {
//if(barCodeList[i].substring(0,2) !='01'){
@@ -2234,12 +2419,19 @@
try {
Decimal test = Decimal.valueOf(janCodeMark);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -2251,12 +2443,19 @@
barCodeList[i].length() - 5
) != '250'
) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -2269,16 +2468,27 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勭敓浜ф棩鏈�' +
+ productDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -2307,16 +2517,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -2361,16 +2582,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -2424,30 +2656,42 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
+ )
+ );
+ }
continue;
}
}
- // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
- // continue;
- // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -2544,25 +2788,41 @@
barCodeList[i].length() - 5
) != '250'
) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
+ )
+ );
+ }
continue;
}
List<String> otCodeList = new List<String>();
Map<String, String> otCodeMap = new Map<String, String>();
if (barCodeList[i].length() < 7) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
+ )
+ );
+ }
continue;
} else if (barCodeList[i].length() == 11) {
String otCode4 = barCodeList[i].substring(3, 7);
@@ -2604,21 +2864,31 @@
barOtcodeMap.put(barCodeList[i], otCodeMap);
barCode241List.add(barCodeList[i]);
} else {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
+ )
+ );
+ }
+ continue;
+ }
+ } else {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
+ } else {
ApexPages.addmessage(
new ApexPages.message(
ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
)
);
- continue;
}
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
- )
- );
continue;
}
}
@@ -2681,9 +2951,9 @@
}
}
if (errorMap.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -2691,8 +2961,21 @@
']涓庣敤鎴风被鍨媅' +
userPro_Type +
']涓嶇'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙穂' +
+ errorMap.values() +
+ ']浜у搧绫诲瀷[' +
+ product_Type +
+ ']涓庣敤鎴风被鍨媅' +
+ userPro_Type +
+ ']涓嶇'
+ )
+ );
+ }
}
}
}
@@ -2728,9 +3011,9 @@
}
}
if (errorMap.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -2738,8 +3021,21 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙穂' +
+ errorMap.values() +
+ ']浜у搧绫诲瀷[' +
+ product_Type +
+ ']涓庣敤鎴穂' +
+ userPro_Type +
+ ']绫诲瀷涓嶇'
+ )
+ );
+ }
}
product2InStore = [
SELECT
@@ -2780,16 +3076,27 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勭敓浜ф棩鏈�' +
+ productDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -2843,16 +3150,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -2936,16 +3254,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -3003,15 +3332,24 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
+ )
+ );
+ }
continue;
}
}
@@ -3021,12 +3359,19 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -3103,26 +3448,42 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
+ )
+ );
+ }
continue;
} else {
janCodeMark = barCodeList[i].substring(2, 16);
try {
Decimal test = Decimal.valueOf(janCodeMark);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -3134,12 +3495,19 @@
barCodeList[i].length() - 5
) != '250'
) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -3152,16 +3520,27 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勭敓浜ф棩鏈�' +
+ productDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -3190,16 +3569,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -3244,16 +3634,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -3304,15 +3705,24 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
+ )
+ );
+ }
continue;
}
}
@@ -3322,12 +3732,19 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -3413,25 +3830,39 @@
barCodeList[i].length() - 5
) != '250'
) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
+ )
+ );
+ }
continue;
}
List<String> otCodeList = new List<String>();
Map<String, String> otCodeMap = new Map<String, String>();
if (barCodeList[i].length() < 7) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
+ )
+ );
+ }
continue;
} else if (barCodeList[i].length() == 11) {
String otCode4 = barCodeList[i].substring(3, 7);
@@ -3473,14 +3904,23 @@
barOtcodeMap.put(barCodeList[i], otCodeMap);
barCode241List.add(barCodeList[i]);
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
barCodeList[i] +
')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ barCodeList[i] +
+ ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
+ )
+ );
+ }
continue;
}
}
@@ -3520,9 +3960,9 @@
}
}
if (errorMap.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3530,8 +3970,21 @@
']涓庣敤鎴风殑绫诲瀷[' +
userPro_Type +
']涓嶇'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙穂' +
+ errorMap.values() +
+ ']浜у搧绫诲瀷[' +
+ product_Type +
+ ']涓庣敤鎴风殑绫诲瀷[' +
+ userPro_Type +
+ ']涓嶇'
+ )
+ );
+ }
}
}
product2InStore = [
@@ -3623,9 +4076,9 @@
}
}
if (errorMap.size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3633,8 +4086,21 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙穂' +
+ errorMap.values() +
+ ']浜у搧绫诲瀷[' +
+ product_Type +
+ ']涓庣敤鎴穂' +
+ userPro_Type +
+ ']绫诲瀷涓嶇'
+ )
+ );
+ }
}
product2InStore = [
SELECT
@@ -3674,16 +4140,27 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勭敓浜ф棩鏈�' +
+ productDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -3738,16 +4215,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -3826,16 +4314,27 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')鐨勬粎鑿屾湁鍔规湡闄�' +
+ expirationDateStr +
+ '閿欒锛�'
+ )
+ );
+ }
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -3885,15 +4384,24 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
+ String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add(
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' +
+ bar +
+ ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
+ )
+ );
+ }
continue;
}
}
@@ -3903,12 +4411,17 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ errorList.add('浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
+ )
+ );
+ }
continue;
}
}
@@ -3956,20 +4469,30 @@
if (notEqualBARcodeCunMap.size() > 0) {
for (String widget : notEqualBARcodeCunMap.keySet()) {
if (notEqualBARcodeCunMap.get(widget).size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
- )
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add('浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��');
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
+ '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
+ )
+ );
+ }
for (
String barcodeListTTT : (List<String>) notEqualBARcodeCunMap.get(
widget
)
) {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add(barcodeListTTT);
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
+ }
}
}
}
@@ -4398,9 +4921,14 @@
ConsumableorderdetailsRecords.size() < 1 &&
consumableInventory.size() < 1
) {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = '涓嶅瓨鍦ㄥ埌璐ф槑缁�';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
+ );
+ }
return null;
}
if (EsetId != null && EsetId != '') {
@@ -4408,24 +4936,40 @@
if (resultcheck.length() > 0) {
for (String widget : overOrderBARcodeCunMap.keySet()) {
if (overOrderBARcodeCunMap.get(widget).size() > 0) {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add(
'浜у搧' +
widget +
'鏈鍒拌揣鏁伴噺瓒呰繃' +
overOrderBARcodeCunMap.get(widget).size() +
'涓璐х殑鏁伴噺銆�'
- )
- );
+ );
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
+ '浜у搧' +
+ widget +
+ '鏈鍒拌揣鏁伴噺瓒呰繃' +
+ overOrderBARcodeCunMap.get(widget).size() +
+ '涓璐х殑鏁伴噺銆�'
+ )
+ );
+ }
for (
String barcodeListTTT : (List<String>) overOrderBARcodeCunMap.get(
widget
)
) {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ warningList.add(barcodeListTTT);
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
+ }
}
}
}
@@ -4458,6 +5002,7 @@
arriveId = orderMain.id;
Decimal arriveAmount = 0;
for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsUse) {
+ //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------'));
Consumable_order_details2__c insDetails = new Consumable_order_details2__c();
insDetails.Id = ass.esd.Id;
insDetails.Consumable_Arrived_order__c = orderMain.id;
@@ -4584,6 +5129,7 @@
if (updateconsumableorderdetails2.size() > 0) {
update updateconsumableorderdetails2;
}
+
List<Consumable_order_details2__c> insertconsumableorderdetails2 = new List<Consumable_order_details2__c>();
for (Consumable_order_details2__c Cod2 : consumableorderdetails2Insert) {
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------'));
@@ -4621,7 +5167,7 @@
i++;
}
- // return null;
+ //return null;
if (insertconsumableorderdetails2.size() > 0) {
insert insertconsumableorderdetails2;
@@ -4681,7 +5227,12 @@
// Integer a = 1/0;
} catch (Exception e) {
Database.rollback(sp);
- ApexPages.addMessages(e);
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = e.getLineNumber() + '---' + e.getMessage();
+ } else {
+ ApexPages.addMessages(e);
+ }
return null;
}
if (resultcheck.length() > 0) {
@@ -4689,6 +5240,7 @@
} else if (resultcheckWithoutOrder.size() > 0) {
return null;
} else {
+ urlType = 'UnabletoEdit';
return UnabletoEdit();
// return null;
}
@@ -5098,11 +5650,7 @@
Inventory_Order_Sheet.Order_ProType__c = userPro_Type;
insert Inventory_Order_Sheet;
inventory_Order_id = Inventory_Order_Sheet.id;
- List<Consumable_order__c> consumable_order_Inv = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :Inventory_Order_Sheet.id
- ];
+ //List<Consumable_order__c> consumable_order_Inv = [SELECT Name FROM Consumable_order__c WHERE id =:Inventory_Order_Sheet.id]; //Commented By Li Jun 20230616
// WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
List<Consumable_order_details2__c> codcList = new List<Consumable_order_details2__c>();
@@ -5123,7 +5671,11 @@
codi.esd.Return_reason__c == null ||
codi.esd.Return_reason__c == ''
) {
- codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
+ if (isLwc) {
+ returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
+ } else {
+ codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
+ }
return null;
}
@@ -5134,7 +5686,11 @@
codi.esd.Bar_Code__c;
Integer deliverycnt = BarcodeCntMap.get(key);
if (codi.esd.Rrturn_count__c > deliverycnt) {
- codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
+ if (isLwc) {
+ returnError = '瓒呭嚭鍑哄簱鏁伴噺';
+ } else {
+ codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
+ }
return null;
}
}
@@ -5355,6 +5911,7 @@
codcList.add(codi.esd);
}
}
+
//鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
Integer i = 1;
//for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
@@ -5368,9 +5925,17 @@
// }
if (ass.ReturnReason == null || ass.ReturnReason == '') {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '璇疯ˉ鍏呰繑鍝佸師鍥�')
- );
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '璇疯ˉ鍏呰繑鍝佸師鍥�'
+ )
+ );
+ }
return null;
}
@@ -5469,13 +6034,33 @@
// WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
// return ToReturnGoodsPage();
if (hasLoseGoods) {
+ urlType = 'ToInventoryGoodsPage';
return ToInventoryGoodsPage();
// return null;
} else {
+ urlType = 'ToReturnGoodsPage';
return ToReturnGoodsPage();
// return null;
}
// WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
+ } else {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
+ )
+ );
+ }
+ return null;
+ }
+ } else {
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
} else {
ApexPages.addmessage(
new ApexPages.message(
@@ -5483,17 +6068,17 @@
'娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
)
);
- return null;
}
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧')
- );
return null;
}
} catch (Exception e) {
Database.rollback(sp);
- ApexPages.addMessages(e);
+ //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
+ if (isLwc) {
+ returnError = e.getLineNumber() + '---' + e.getMessage();
+ } else {
+ ApexPages.addMessages(e);
+ }
return null;
}
}
@@ -5575,7 +6160,7 @@
return ref;
}
- class ConsumableorderdetailsInfo implements Comparable {
+ public class ConsumableorderdetailsInfo implements Comparable {
public Consumable_order_details2__c esd { get; set; }
public Product2__c Prod { get; set; }
public String ProductName { get; set; }
@@ -5593,6 +6178,10 @@
public Decimal arrivedCount { get; set; }
public String ReportProductExpirationDate { get; set; }
+
+ public ConsumableorderdetailsInfo() {
+ }
+
public ConsumableorderdetailsInfo(
Consumable_order_details2__c e,
string str
--
Gitblit v1.9.1