From c1b460aa526fb2e8193249c3389f9c222236a941 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Thu, 23 Nov 2023 16:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasereceiptJobMainServiceImpl.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
index 219bcc7e..660ce76f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
@@ -443,6 +443,15 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 inspectRequestMainService.createInspectRequestMain(inspectRequestMainCreateReqVO);
             }
         }
+        if("EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
+            for(TransactionCreateReqVO transactionCreateReqVO : transactionCreateReqVOList) {
+                transactionCreateReqVO.setInventoryStatus("OK");
+            }
+        }
+        //增加库存事务
+        transactionService.createTransaction(transactionCreateReqVOList);
+        //移除预计入
+        expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber());
         //采购收货记录 生成后免检物品 创建 上架申请
         if(switchDO2.getEffectiveSetValue().equals("TRUE") && "EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
             PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO();
@@ -471,15 +480,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
             putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList);
             putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO);
         }
-        if("EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
-            for(TransactionCreateReqVO transactionCreateReqVO : transactionCreateReqVOList) {
-                transactionCreateReqVO.setInventoryStatus("OK");
-            }
-        }
-        //增加库存事务
-        transactionService.createTransaction(transactionCreateReqVOList);
-        //移除预计入
-        expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber());
         //变更记录
         trendsApi.createTrends(purchasereceiptJobMainDO.getId(), "purchasereceiptJob", "执行了采购收货任务", TrendsTypeEnum.UPDATE);
         return number;