From 41ce33ca359ca6f78fa76a5352d76447424158e1 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 15 三月 2022 10:56:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 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 03c59a9..4a04fc8 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -11,6 +11,7 @@
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;
@@ -24,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;
@@ -46,23 +48,11 @@
private OutStockService outStockService;
@Autowired
private JdbcTemplate jdbcTemplate;
-
- @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 OutStockDanService outStockDanService;
@Transactional
- public ReturnT<String> start(WrkMast wrkMast) {
+ public ReturnT<Exception> start(WrkMast wrkMast) {
try {
if (!Cools.isEmpty(wrkMast.getBarcode())) {
@@ -91,33 +81,24 @@
}
// erp鍏宠仈鍑哄簱璁㈠崟澶勭悊
- if (wrkMast.getIoType() == 101) {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
// 鑾峰彇宸ヤ綔妗ｅ唴鐗╂枡娓呭崟
List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
for (WrkDetl wrkDetl: wrkDetls) {
if (!Cools.isEmpty(wrkDetl)) {
- Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+ 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}]澶辫触", wrkDetl.getMatnr());
+ exceptionHandle("[xtyasrs_dual]鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0},FBillNo={1}]澶辫触", wrkDetl.getMatnr(),wrkDetl.getSupplier());
}
-// 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("鎴愬搧")) {
-
+ 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())) {
@@ -136,9 +117,9 @@
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error("fail", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ return FAIL.setContent(e);
}
return SUCCESS;
}
--
Gitblit v1.9.1