From 8ba4f65089aef9ab488574a70a0738f45ce4ab10 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 01 四月 2024 08:50:55 +0800
Subject: [PATCH] #立库转平库
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 58 ++++++++++++++++------------------------------------------
1 files changed, 16 insertions(+), 42 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 4d56e19..e764dcf 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,7 +1,6 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -32,14 +31,12 @@
private LocDetlService locDetlService;
@Autowired
private WaitPakinService waitPakinService;
- @Autowired
- private BasDevpService basDevpService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 4) {
return doIn(wrkMast);
- // 14.鍑哄簱瀹屾垚
+ // 14.鍑哄簱瀹屾垚
} else if (wrkMast.getWrkSts() == 14) {
return doOut(wrkMast);
}
@@ -218,21 +215,17 @@
}
}
// todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
- // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
- if (Cools.isEmpty(wrkMast.getCtnNo()) || !wrkMast.getCtnNo().equals("Y")) {
- // 淇敼婧愬簱浣嶇姸鎬� ==> O
- LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
- if (null != sourceLoc) {
- sourceLoc.setBarcode("");
- sourceLoc.setLocSts("O");
- sourceLoc.setModiTime(now);
- sourceLoc.setIoTime(now);
- if (!locMastService.updateById(sourceLoc)) {
- exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- }
+ // 淇敼婧愬簱浣嶇姸鎬� ==> O
+ LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
+ if (null != sourceLoc) {
+ sourceLoc.setBarcode("");
+ sourceLoc.setLocSts("O");
+ sourceLoc.setModiTime(now);
+ sourceLoc.setIoTime(now);
+ if (!locMastService.updateById(sourceLoc)) {
+ exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
}
-
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
@@ -291,12 +284,6 @@
exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
}
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- }
break;
// 绌烘澘鍑哄簱
case 110:
@@ -310,29 +297,16 @@
exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
}
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- }
- break;
- // 鐩樼偣鍑哄簱
- case 107:
- BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
- if (basDevp.getWrkNo().equals(wrkMast.getWrkNo())) {
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- }
- }
break;
default:
break;
}
-
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(15L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
+ }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1