From 00e147ec892cb1e89d0698787a8c60da1014cdb7 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 17:42:22 +0800
Subject: [PATCH] Community升级
---
force-app/main/default/classes/LexArriveGoodsController.cls | 180 ++++++++++++++++++++++-------------------------------------
1 files changed, 68 insertions(+), 112 deletions(-)
diff --git a/force-app/main/default/classes/LexArriveGoodsController.cls b/force-app/main/default/classes/LexArriveGoodsController.cls
index 125ba47..ca55da3 100644
--- a/force-app/main/default/classes/LexArriveGoodsController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsController.cls
@@ -1,9 +1,9 @@
public without sharing class LexArriveGoodsController {
-
//鍒濆鍖�
@AuraEnabled
public static Results init(String arrType, String eSetId) {
Results results = new Results();
+ results.isNoteStay = LexUtility.getIsNoteStay();
try {
ArriveGoodsController arrController = new ArriveGoodsController(eSetId, arrType);
arrController.isLwc = true;
@@ -25,20 +25,20 @@
public static Results searchProduct(String barcode, String arrControllerStr) {
Results results = new Results();
try {
- System.debug('arrControllerStr:'+arrControllerStr);
- ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ System.debug('arrControllerStr:' + arrControllerStr);
+ ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
arrController.barcode = barcode;
arrController.returnError = null;
arrController.warningList = new List<String>();
arrController.errorList = new List<String>();
arrController.SearchPro();
results.arrGoodCon = JSON.serialize(arrController);
- if(arrController.returnError != null && arrController.returnError != ''){
+ if (arrController.returnError != null && arrController.returnError != '') {
results.result = 'Fail';
results.errorMsgList = arrController.errorList;
results.warningMsgList = arrController.warningList;
results.errorMsg = arrController.returnError;
- }else {
+ } else {
results.coc = arrController.coc;
results.saveFLGbln = arrController.saveFLGbln;
results.returnFLGbln = arrController.ReturnFLGbln;
@@ -63,20 +63,20 @@
public static Results arriveGoodsConfim(String arrControllerStr) {
Results results = new Results();
try {
- ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
arrController.returnError = null;
arrController.warningList = new List<String>();
arrController.errorList = new List<String>();
Pagereference page = arrController.ArriveGoodsConfim();
results.arrGoodCon = JSON.serialize(arrController);
- if(arrController.returnError != null && arrController.returnError != ''){
+ if (arrController.returnError != null && arrController.returnError != '') {
results.result = 'Fail';
results.errorMsgList = arrController.errorList;
results.warningMsgList = arrController.warningList;
results.errorMsg = arrController.returnError;
- }else {
- if(arrController.urlType == 'UnabletoEdit'){
- results.url = '/lexarrivegsdetails?EsetId='+arrController.arriveId;
+ } else {
+ if (arrController.urlType == 'UnabletoEdit') {
+ results.url = '/lexarrivegsdetails?EsetId=' + arrController.arriveId;
}
results.errorMsgList = arrController.errorList;
results.warningMsgList = arrController.warningList;
@@ -88,31 +88,35 @@
}
return results;
}
-
+
//鐧诲綍杩斿搧
@AuraEnabled
public static Results updateGoodsOfReturn(String arrControllerStr, String showGoodsofReturnListStr) {
Results results = new Results();
try {
- List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>)JSON.deserialize(showGoodsofReturnListStr, List<ConsumableorderdetailsInfo>.class);
- ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
+ List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
+ showGoodsofReturnListStr,
+ List<ConsumableorderdetailsInfo>.class
+ );
+ ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
arrController.ShowGoodsofReturnList = changeType2(showGoodsofReturnList);
arrController.returnError = null;
arrController.warningList = new List<String>();
arrController.errorList = new List<String>();
+ StaticParameter.ConsumableOrderTrigger = true; //Add by Li Jun for bypass ConsumableOrderTrigger 20230616
Pagereference page = arrController.UpdateGoodsOfReturn();
results.arrGoodCon = JSON.serialize(arrController);
- if(arrController.returnError != null && arrController.returnError != ''){
+ if (arrController.returnError != null && arrController.returnError != '') {
results.result = 'Fail';
results.errorMsgList = arrController.errorList;
results.warningMsgList = arrController.warningList;
results.errorMsg = arrController.returnError;
- }else {
- if(arrController.urlType == 'ToReturnGoodsPage'){
- results.url = '/s/detail/'+arrController.return_Order_id;
+ } else {
+ if (arrController.urlType == 'ToReturnGoodsPage') {
+ results.url = '/detail/' + arrController.return_Order_id;
}
- if(arrController.urlType == 'ToInventoryGoodsPage'){
- results.url = '/s/detail/'+arrController.inventory_Order_id;
+ if (arrController.urlType == 'ToInventoryGoodsPage') {
+ results.url = '/detail/' + arrController.inventory_Order_id;
}
results.errorMsgList = arrController.errorList;
results.warningMsgList = arrController.warningList;
@@ -125,50 +129,54 @@
return results;
}
- public static List<ConsumableorderdetailsInfo> changeType1(List<ArriveGoodsController.ConsumableorderdetailsInfo> conList){
+ public static List<ConsumableorderdetailsInfo> changeType1(List<ArriveGoodsController.ConsumableorderdetailsInfo> conList) {
List<ConsumableorderdetailsInfo> conList1 = new List<ConsumableorderdetailsInfo>();
- for(ArriveGoodsController.ConsumableorderdetailsInfo con : conList){
- ConsumableorderdetailsInfo con1 = new ConsumableorderdetailsInfo();
- con1.esd = con.esd;
- con1.Prod = con.Prod;
- con1.ProductName = con.ProductName;
- con1.barCodeNo = con.barCodeNo;
- con1.sterilizationlimitDate = con.sterilizationlimitDate;
- con1.serialNoorLotNo = con.serialNoorLotNo;
- con1.tracingCodeNo = con.tracingCodeNo;
- con1.ReturnReason = con.ReturnReason;
- con1.oldConsumableCount = con.oldConsumableCount;
- con1.ErrorReason = con.ErrorReason;
- con1.canEdit = con.canEdit;
- con1.intMark = con.intMark;
- con1.arriveAmount = con.arriveAmount;
- con1.arrivedCount = con.arrivedCount;
- con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
- conList1.add(con1);
+ if (conList != null) {
+ for (ArriveGoodsController.ConsumableorderdetailsInfo con : conList) {
+ ConsumableorderdetailsInfo con1 = new ConsumableorderdetailsInfo();
+ con1.esd = con.esd;
+ con1.Prod = con.Prod;
+ con1.ProductName = con.ProductName;
+ con1.barCodeNo = con.barCodeNo;
+ con1.sterilizationlimitDate = con.sterilizationlimitDate;
+ con1.serialNoorLotNo = con.serialNoorLotNo;
+ con1.tracingCodeNo = con.tracingCodeNo;
+ con1.ReturnReason = con.ReturnReason;
+ con1.oldConsumableCount = con.oldConsumableCount;
+ con1.ErrorReason = con.ErrorReason;
+ con1.canEdit = con.canEdit;
+ con1.intMark = con.intMark;
+ con1.arriveAmount = con.arriveAmount;
+ con1.arrivedCount = con.arrivedCount;
+ con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
+ conList1.add(con1);
+ }
}
return conList1;
}
- public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(List<ConsumableorderdetailsInfo> conList){
+ public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(List<ConsumableorderdetailsInfo> conList) {
List<ArriveGoodsController.ConsumableorderdetailsInfo> conList1 = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
- for(ConsumableorderdetailsInfo con : conList){
- ArriveGoodsController.ConsumableorderdetailsInfo con1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
- con1.esd = con.esd;
- con1.Prod = con.Prod;
- con1.ProductName = con.ProductName;
- con1.barCodeNo = con.barCodeNo;
- con1.sterilizationlimitDate = con.sterilizationlimitDate;
- con1.serialNoorLotNo = con.serialNoorLotNo;
- con1.tracingCodeNo = con.tracingCodeNo;
- con1.ReturnReason = con.ReturnReason;
- con1.oldConsumableCount = con.oldConsumableCount;
- con1.ErrorReason = con.ErrorReason;
- con1.canEdit = con.canEdit;
- con1.intMark = con.intMark;
- con1.arriveAmount = con.arriveAmount;
- con1.arrivedCount = con.arrivedCount;
- con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
- conList1.add(con1);
+ if (conList != null) {
+ for (ConsumableorderdetailsInfo con : conList) {
+ ArriveGoodsController.ConsumableorderdetailsInfo con1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
+ con1.esd = con.esd;
+ con1.Prod = con.Prod;
+ con1.ProductName = con.ProductName;
+ con1.barCodeNo = con.barCodeNo;
+ con1.sterilizationlimitDate = con.sterilizationlimitDate;
+ con1.serialNoorLotNo = con.serialNoorLotNo;
+ con1.tracingCodeNo = con.tracingCodeNo;
+ con1.ReturnReason = con.ReturnReason;
+ con1.oldConsumableCount = con.oldConsumableCount;
+ con1.ErrorReason = con.ErrorReason;
+ con1.canEdit = con.canEdit;
+ con1.intMark = con.intMark;
+ con1.arriveAmount = con.arriveAmount;
+ con1.arrivedCount = con.arrivedCount;
+ con1.ReportProductExpirationDate = con.ReportProductExpirationDate;
+ conList1.add(con1);
+ }
}
return conList1;
}
@@ -202,6 +210,8 @@
public List<String> errorMsgList;
@AuraEnabled
public List<String> warningMsgList;
+ @AuraEnabled
+ public Boolean isNoteStay;
}
public class ConsumableorderdetailsInfo implements Comparable {
@@ -236,63 +246,9 @@
@AuraEnabled
public String ReportProductExpirationDate { get; set; }
- public ConsumableorderdetailsInfo(){
-
+ public ConsumableorderdetailsInfo() {
}
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e, string str) {
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- ErrorReason = str;
- intMark = 1;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
- }
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
- canEdit = false;
- if (e.Box_Piece__c == '鐩�') {
- e.Rrturn_count__c = 1;
- canEdit = true;
- }
- esd = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
- }
-
- public ConsumableorderdetailsInfo(Product2__c e, List<String> barinfoL) {
- esd = new Consumable_order_details2__c();
- ProductName = e.Name__c;
- Prod = e;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- ReturnReason = '';
- }
-
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e, List<String> barinfoL) {
- esd = e;
- Prod = e.Consumable_Product__r;
- barCodeNo = barinfoL[0];
- if (String.isNotBlank(barinfoL[1])) {
- sterilizationlimitDate = Date.valueOf(barinfoL[1]);
- }
- serialNoorLotNo = barinfoL[2];
- tracingCodeNo = barinfoL[3];
- if (e.Report_Product_Expiration__c != null) {
- ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
- }
- }
- public ConsumableorderdetailsInfo(Product2__c e) {
- Prod = e;
- }
// 鎺掑簭
public Integer compareTo(Object compareTo) {
return null;
--
Gitblit v1.9.1