From dc078dbd74d0028cdedb4210f0b892f88c86e41c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 13:12:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7dcb8f7..b13b748 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,7 +17,7 @@
*/
@Service
@Transactional
-public class WorkMastHandler extends AbstractHandler {
+public class WorkMastHandler extends AbstractHandler<String> {
@Autowired
private WrkMastService wrkMastService;
@@ -29,10 +30,10 @@
@Autowired
private WaitPakinService waitPakinService;
- public void start() {
+ public ReturnT<String> start() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
- return;
+ return SUCCESS;
}
for (WrkMast wrkMast : wrkMasts) {
// 4.鍏ュ簱瀹屾垚
@@ -43,6 +44,7 @@
doOut(wrkMast);
}
}
+ return SUCCESS;
}
private void doIn(WrkMast wrkMast){
@@ -308,15 +310,27 @@
break;
// 绌烘澘鍑哄簱
case 110:
-
+ // 淇敼搴撲綅鐘舵�� R ===>> O
+ if (locMast.getLocType().equals("R")) {
+ locMast.setLocType("O");
+ locMast.setBarcode("");
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ if (!locMastService.updateById(locMast)) {
+ exceptionHandle(""); // todo
+ }
+ }
break;
default:
break;
}
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(15L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ exceptionHandle(""); // todo
+ }
}
-
-
-
public static void main(String[] args) {
for (int i = 0;i<10;i++) {
--
Gitblit v1.9.1