From 67826a2c51bbc013db409dd1a5e29dd4ba52fd72 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 09:27:47 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 87 +++++++++++++++----------------------------
1 files changed, 30 insertions(+), 57 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 e173bdb..5d585a4 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -36,8 +36,6 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderDetlService orderDetlService;
- @Autowired
- private InOutService inOutService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -69,15 +67,6 @@
throw new CoolException("绌烘澘鍏ュ簱鏉＄爜涓嶈兘涓虹┖");
}
locMast.setBarcode(wrkMast.getBarcode());
- if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==5){
- locMast.setLocType2((short)5);
- }else if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==6){
- locMast.setLocType2((short)6);
- }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==7){
- locMast.setLocType2((short)7);
- }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==8){
- locMast.setLocType2((short)8);
- }
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -120,16 +109,6 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
- locDetl.setModel(wrkDetl.getModel());
-
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -156,6 +135,9 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ if (Cools.isEmpty(wrkMast.getBarcode())) {
+ throw new CoolException("鍏ュ簱鏉＄爜涓嶈兘涓虹┖");
+ }
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -181,17 +163,6 @@
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl);
if (locDetl != null) {
-
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
-
-
if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl)) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -249,16 +220,6 @@
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
} else {
-
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
-
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
@@ -266,6 +227,7 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -294,6 +256,30 @@
// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+
+ for (WrkDetl wrkDetl : wrkDetls57) {
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl);
+ if (null != locDetl) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl)) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ } else {
+ locDetl = new LocDetl();
+ locDetl.sync(wrkDetl);
+ locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setModiTime(now);
+ locDetl.setAppeTime(now);
+ if (!locDetlService.insert(locDetl)) {
+// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -390,18 +376,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
-
- for (WrkDetl wrkDetl : wrkDetls101) {
- InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
- if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
-// inOut.setModiTime(now.toString());
- }
- if (!inOutService.updateById(inOut)){
- return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
- }
- }
-
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl);
@@ -427,9 +401,9 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setBarcode("");
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -442,9 +416,8 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
- locMast.setLocType2((short)0);
locMast.setModiTime(now);
+ locMast.setBarcode("");
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
--
Gitblit v1.9.1