From 2b7d6339d1ff61ab767340fdc4ef59603dc9e6e5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 09:07:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 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 a411865..81d90f1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,15 +1,16 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SnowflakeIdWorker;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.ReturnT;
-import com.zy.system.entity.Config;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.service.ErpService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,8 +19,9 @@
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
-public class WorkLogHandler extends AbstractHandler<Config> {
+public class WorkLogHandler extends AbstractHandler<String> {
@Autowired
private WrkMastService wrkMastService;
@@ -29,42 +31,75 @@
private WrkDetlService wrkDetlService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
- @Override
@Transactional
- public ReturnT<Config> start() {
+ public ReturnT<String> start(WrkMast wrkMast) {
try {
- WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
- if (null == wrkMast) {
- return SUCCESS;
+ // 鍏ュ簱 --------------------------------------------------------------------------------
+ if (wrkMast.getWrkSts() == 5) {
+ // 鍏ㄦ澘鍏ュ簱
+ if (wrkMast.getIoType() == 1) {
+ // 鍏ュ簱閫氱煡鍗�
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+ // 鎷ｆ枡鍐嶅叆搴�
+ } else if (wrkMast.getIoType() == 53) {
+
+ }
+
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getWrkSts() == 15) {
+
}
+
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ for (WrkDetl wrkDetl : wrkDetlService.selectByWrkNo(wrkMast.getWrkNo())) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ orderService.checkComplete(wrkDetl.getOrderNo());
+ }
+ }
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle(""); // todo
+ exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMast)) {
- exceptionHandle("1111"); // todo
+ exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle(""); // todo
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- exceptionHandle(""); // todo
+// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
+ log.error("fail", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- Config config = new Config(
- "name", // 鍚嶇О[闈炵┖]
- "code", // 缂栫爜[闈炵┖]
- "val", // 瀵瑰簲鍊糩闈炵┖]
- (short)1, // 绫诲瀷[闈炵┖]
- (short)1 // 鐘舵�乕闈炵┖]
- );
- return FAIL.setMsg(e.getMessage()).setContent(config);
+ return FAIL.setMsg(e.getMessage());
}
return SUCCESS;
}
--
Gitblit v1.9.1