From 0df8f305406412a1229bf412a574cb026ac802cf Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 24 九月 2021 13:03:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 8c7ff75..e27f27c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -11,7 +11,9 @@
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.common.service.erp.ErpService;
 import com.zy.common.service.erp.entity.OutStockBillEntry;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -23,6 +25,7 @@
 /**
  * Created by vincent on 2020/7/6
  */
+@Slf4j
 @Service
 @RestController
 public class WorkLogHandler extends AbstractHandler<String> {
@@ -43,6 +46,8 @@
     private ErpService erpService;
     @Autowired
     private OutStockService outStockService;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
 
     @GetMapping("/test1")
     public String test1(String barcode){
@@ -93,14 +98,24 @@
                 // 鑾峰彇宸ヤ綔妗e唴鐗╂枡娓呭崟
                 List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
                 for (WrkDetl wrkDetl: wrkDetls) {
-                    if (!Cools.isEmpty(wrkDetl.getMemo())) {
+                    if (!Cools.isEmpty(wrkDetl)) {
+                        Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+                        log.info("incrementCPakOut---" + wrkMast.getWrkNo() + "----FInterI" + FInterI);
+                        if (!Cools.isEmpty(FInterI)) {
+                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+                                log.error("erpService.incrementCPakOut");
+                                exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
+                            }
+//                            if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
+//                                exceptionHandle("[xtyasrs]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
+//                            }
+                        }
                         if (wrkDetl.getMemo().equals("鍘熸潗鏂�")) {
                             // 寰呭疄鐜�
+
+
                         } else if (wrkDetl.getMemo().equals("鎴愬搧")) {
-                            Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
-                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
-                                exceptionHandle("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", wrkDetl.getMatnr());
-                            }
+
                         }
                     }
                 }

--
Gitblit v1.9.1