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 | 22 ++++------------------
1 files changed, 4 insertions(+), 18 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 e27f27c..c0112f1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -28,7 +28,7 @@
@Slf4j
@Service
@RestController
-public class WorkLogHandler extends AbstractHandler<String> {
+public class WorkLogHandler extends AbstractHandler<Exception> {
@Autowired
private WrkMastService wrkMastService;
@@ -49,22 +49,8 @@
@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";
- }
-
@Transactional
- public ReturnT<String> start(WrkMast wrkMast) {
+ public ReturnT<Exception> start(WrkMast wrkMast) {
try {
if (!Cools.isEmpty(wrkMast.getBarcode())) {
@@ -138,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