From 4f200849487fc6f914e237d5af3ecefd6d802457 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 10 七月 2023 09:52:59 +0800
Subject: [PATCH] backup1007
---
force-app/main/default/classes/ArriveGoodsController.cls | 1171 ++++++++++++++--------------------------------------------
1 files changed, 291 insertions(+), 880 deletions(-)
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index 8e2988f..85af333 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -88,9 +88,8 @@
//public String[] proidList =new String[]{};
public Decimal orderCountAll = 0;
public Decimal orderCountNotarrive = 0;
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public id return_Order_id = null;
- public id inventory_Order_id = null;
+ private id return_Order_id = null;
+ private id inventory_Order_id = null;
public boolean ReturnFLGbln { get; set; }
public boolean saveFLGbln { get; set; }
public String ArrType { get; set; }
@@ -103,14 +102,6 @@
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');
@@ -130,29 +121,6 @@
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
@@ -392,18 +360,6 @@
//========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>();
@@ -411,10 +367,6 @@
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>();
@@ -485,16 +437,12 @@
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>();
- //绉诲埌鏈�涓婅竟 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;
- // }
+ if (barcode == null || barcode.trim() == '') {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
+ );
+ return;
+ }
//瀵规瘮鍏ㄩ儴搴撳瓨涓槸鍚﹀瓨鍦ㄧ鐞嗙紪鐮佷竴鏍凤紝barcode鍙蜂笉涓�鏍风殑浜у搧
reSet1 = [
SELECT Id, Name, TracingCode__c, Bar_Code__c, Report_Product_Expiration__c
@@ -520,21 +468,13 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
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);
}
@@ -586,8 +526,6 @@
}
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '绠＄悊缂栫爜涓虹┖鐨勪骇鍝� ' + ErrorIdMap));
//鏁翠綋鍒拌揣
- System.debug('EsetId===>' + EsetId);
- System.debug('ArrType===>' + ArrType);
if (EsetId == null || EsetId == '') {
if (ArrType != 'ReG') {
//鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
@@ -651,65 +589,6 @@
}
}
}
- 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
@@ -1405,23 +1284,14 @@
reSet1[i].Lose_Flag__c == true &&
reSet1[i].ToDueDateDays__c >= 0
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
'浜у搧' +
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 &&
@@ -1661,22 +1531,15 @@
reSet[i].Bar_Code__c != str &&
reSet[i].TracingCode__c == barMcodeMap.get(str)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ // 20220815 ljh SWAG-CH65B7 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
'鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- );
- } 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
- }
+ )
+ );
+ // 20220815 ljh SWAG-CH65B7 end
}
if (barMcodeMap.get(str) == reSet[i].TracingCode__c) {
reSet[i].Bar_Code__c = str;
@@ -1723,27 +1586,16 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'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);
}
@@ -1783,36 +1635,23 @@
if (ArrType != 'ReG') {
inventoryEntryNoESetId(notInlist);
if (notInStorelist.size() > 0) {
- //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 {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError =
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱';
- } else {
ApexPages.addmessage(
new ApexPages.message(
ApexPages.severity.ERROR,
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
)
);
+ return;
}
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' +
+ notInlist +
+ '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
+ )
+ );
return;
}
}
@@ -1820,17 +1659,12 @@
//add by rentx 2021-01-27 start
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- //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) + ''
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
+ )
+ );
}
}
//add by rentx 2021-01-27 end
@@ -2327,17 +2161,12 @@
if (notInlist.size() > 0) {
inventoryEntry(notInlist);
if (notInStorelist.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
+ )
+ );
return;
}
}
@@ -2346,17 +2175,12 @@
//add by rentx 2021-01-27 start 褰撹鍗曚负鍖婚櫌鐗逛环绫诲瀷鐨勮鍗曟椂,濡傛灉鎵句笉鍒癰arcode,涓嶈В鏋�,骞朵笖榛樿璇arcode瀵瑰簲鐨勬槑缁�2涓洪潪鍖婚櫌鐗逛环浜у搧,鐩存帴鎶ラ敊
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- //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 + '鏄潪鍖婚櫌鐗逛环浜у搧'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
+ )
+ );
}
}
//add by rentx 2021-01-27 end
@@ -2392,23 +2216,14 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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'){
@@ -2419,19 +2234,12 @@
try {
Decimal test = Decimal.valueOf(janCodeMark);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -2443,19 +2251,12 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -2468,27 +2269,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -2517,27 +2307,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -2582,27 +2361,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -2656,42 +2424,30 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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 {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -2788,41 +2544,25 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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);
@@ -2864,31 +2604,21 @@
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;
}
}
@@ -2951,9 +2681,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -2961,21 +2691,8 @@
']涓庣敤鎴风被鍨媅' +
userPro_Type +
']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风被鍨媅' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
+ )
+ );
}
}
}
@@ -3011,9 +2728,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3021,21 +2738,8 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
+ )
+ );
}
product2InStore = [
SELECT
@@ -3076,27 +2780,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -3150,27 +2843,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -3254,27 +2936,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -3332,24 +3003,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3359,19 +3021,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3448,42 +3103,26 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3495,19 +3134,12 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -3520,27 +3152,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -3569,27 +3190,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -3634,27 +3244,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -3705,24 +3304,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3732,19 +3322,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3830,39 +3413,25 @@
barCodeList[i].length() - 5
) != '250'
) {
- //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] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ 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) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧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);
@@ -3904,23 +3473,14 @@
barOtcodeMap.put(barCodeList[i], otCodeMap);
barCode241List.add(barCodeList[i]);
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3960,9 +3520,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3970,21 +3530,8 @@
']涓庣敤鎴风殑绫诲瀷[' +
userPro_Type +
']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
+ )
+ );
}
}
product2InStore = [
@@ -4076,9 +3623,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -4086,21 +3633,8 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
+ )
+ );
}
product2InStore = [
SELECT
@@ -4140,27 +3674,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -4215,27 +3738,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -4314,27 +3826,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -4384,24 +3885,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -4411,17 +3903,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //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閿欒锛�'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
+ )
+ );
continue;
}
}
@@ -4469,30 +3956,20 @@
if (notEqualBARcodeCunMap.size() > 0) {
for (String widget : notEqualBARcodeCunMap.keySet()) {
if (notEqualBARcodeCunMap.get(widget).size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add('浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
+ '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
+ )
+ );
for (
String barcodeListTTT : (List<String>) notEqualBARcodeCunMap.get(
widget
)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
}
}
}
@@ -4921,14 +4398,9 @@
ConsumableorderdetailsRecords.size() < 1 &&
consumableInventory.size() < 1
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '涓嶅瓨鍦ㄥ埌璐ф槑缁�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
+ );
return null;
}
if (EsetId != null && EsetId != '') {
@@ -4936,40 +4408,24 @@
if (resultcheck.length() > 0) {
for (String widget : overOrderBARcodeCunMap.keySet()) {
if (overOrderBARcodeCunMap.get(widget).size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
'浜у搧' +
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
)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
}
}
}
@@ -5002,7 +4458,6 @@
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;
@@ -5129,7 +4584,6 @@
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------'));
@@ -5167,7 +4621,7 @@
i++;
}
- //return null;
+ // return null;
if (insertconsumableorderdetails2.size() > 0) {
insert insertconsumableorderdetails2;
@@ -5227,12 +4681,7 @@
// Integer a = 1/0;
} catch (Exception e) {
Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
+ ApexPages.addMessages(e);
return null;
}
if (resultcheck.length() > 0) {
@@ -5240,7 +4689,6 @@
} else if (resultcheckWithoutOrder.size() > 0) {
return null;
} else {
- urlType = 'UnabletoEdit';
return UnabletoEdit();
// return null;
}
@@ -5650,7 +5098,11 @@
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]; //Commented By Li Jun 20230616
+ List<Consumable_order__c> consumable_order_Inv = [
+ SELECT Name
+ FROM Consumable_order__c
+ WHERE id = :Inventory_Order_Sheet.id
+ ];
// WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
List<Consumable_order_details2__c> codcList = new List<Consumable_order_details2__c>();
@@ -5671,11 +5123,7 @@
codi.esd.Return_reason__c == null ||
codi.esd.Return_reason__c == ''
) {
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
- }
+ codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
return null;
}
@@ -5686,11 +5134,7 @@
codi.esd.Bar_Code__c;
Integer deliverycnt = BarcodeCntMap.get(key);
if (codi.esd.Rrturn_count__c > deliverycnt) {
- if (isLwc) {
- returnError = '瓒呭嚭鍑哄簱鏁伴噺';
- } else {
- codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
- }
+ codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
return null;
}
}
@@ -5911,7 +5355,6 @@
codcList.add(codi.esd);
}
}
-
//鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
Integer i = 1;
//for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
@@ -5925,17 +5368,9 @@
// }
if (ass.ReturnReason == null || ass.ReturnReason == '') {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '璇疯ˉ鍏呰繑鍝佸師鍥�'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '璇疯ˉ鍏呰繑鍝佸師鍥�')
+ );
return null;
}
@@ -6034,33 +5469,13 @@
// 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(
@@ -6068,17 +5483,17 @@
'娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
)
);
+ return null;
}
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧')
+ );
return null;
}
} catch (Exception e) {
Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
+ ApexPages.addMessages(e);
return null;
}
}
@@ -6160,7 +5575,7 @@
return ref;
}
- public class ConsumableorderdetailsInfo implements Comparable {
+ class ConsumableorderdetailsInfo implements Comparable {
public Consumable_order_details2__c esd { get; set; }
public Product2__c Prod { get; set; }
public String ProductName { get; set; }
@@ -6178,10 +5593,6 @@
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