From 8ba4f65089aef9ab488574a70a0738f45ce4ab10 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 01 四月 2024 08:50:55 +0800
Subject: [PATCH] #立库转平库

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index c81f99a..6dc7887 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -86,25 +86,6 @@
                 waitPakinService.delete(wrapper);
             }
 
-            // erp鍏宠仈鍑哄簱璁㈠崟澶勭悊
-            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
-                EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
-                // 鑾峰彇宸ヤ綔妗e唴鐗╂枡娓呭崟
-                List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
-                for (WrkDetl wrkDetl: wrkDetls) {
-                    if (!Cools.isEmpty(wrkDetl)) {
-                        Integer FInterI = outStockDanService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
-                        if (!Cools.isEmpty(FInterI)) {
-                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
-                                exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
-                            }
-                            if (!outStockDanService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
-                                exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
-                            }
-                        }
-                    }
-                }
-            }
             if (!Cools.isEmpty(wrkMast.getPdcType()) && wrkMast.getPdcType().equals("Y")){
                 List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                 if (Cools.isEmpty(wrkDetls)){
@@ -158,6 +139,25 @@
                     }
                 }
             }
+            // erp鍏宠仈鍑哄簱璁㈠崟澶勭悊
+            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
+                EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
+                // 鑾峰彇宸ヤ綔妗e唴鐗╂枡娓呭崟
+                List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
+                for (WrkDetl wrkDetl: wrkDetls) {
+                    if (!Cools.isEmpty(wrkDetl)) {
+                        Integer FInterI = outStockDanService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+                        if (!Cools.isEmpty(FInterI)) {
+                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+                                exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
+                            }
+                            if (!outStockDanService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+                                exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
+                            }
+                        }
+                    }
+                }
+            }
 
             // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
             if (!wrkMastLogService.save(wrkMast.getWrkNo())) {

--
Gitblit v1.9.1