From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523

---
 force-app/main/default/classes/LexArriveGoodsController.cls |   79 +++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/force-app/main/default/classes/LexArriveGoodsController.cls b/force-app/main/default/classes/LexArriveGoodsController.cls
index 88293a4..b5cfbfd 100644
--- a/force-app/main/default/classes/LexArriveGoodsController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsController.cls
@@ -4,6 +4,7 @@
     @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;
@@ -127,48 +128,52 @@
 
     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){
         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 +207,8 @@
         public List<String> errorMsgList;
         @AuraEnabled
         public List<String> warningMsgList;
+        @AuraEnabled
+        public Boolean isNoteStay;
     }
 
     public class ConsumableorderdetailsInfo implements Comparable {

--
Gitblit v1.9.1