From 33817dd27d0527bf7eff142bf74c09fceb628590 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 24 九月 2021 13:09:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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..c0112f1 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,9 +25,10 @@
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
@RestController
-public class WorkLogHandler extends AbstractHandler<String> {
+public class WorkLogHandler extends AbstractHandler<Exception> {
@Autowired
private WrkMastService wrkMastService;
@@ -43,23 +46,11 @@
private ErpService erpService;
@Autowired
private OutStockService outStockService;
-
- @GetMapping("/test1")
- public String test1(String barcode){
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", barcode);
- // erp鍏宠仈璁㈠崟澶勭悊
- List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
- for (WaitPakin waitPakin : waitPakins) {
- boolean erpRes = erpService.incrementPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme());
- if (!erpRes) {
- exceptionHandle("鏇存柊ERP鍏ュ簱鏁版嵁[matnr={0}]澶辫触", waitPakin.getMatnr());
- }
- }
- return "ok";
- }
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
@Transactional
- public ReturnT<String> start(WrkMast wrkMast) {
+ public ReturnT<Exception> start(WrkMast wrkMast) {
try {
if (!Cools.isEmpty(wrkMast.getBarcode())) {
@@ -93,14 +84,24 @@
// 鑾峰彇宸ヤ綔妗ｅ唴鐗╂枡娓呭崟
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());
- }
+
}
}
}
@@ -123,9 +124,9 @@
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ return FAIL.setContent(e);
}
return SUCCESS;
}
--
Gitblit v1.9.1