From 3ad547eeda731d9522061c60332b591dd2253b03 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 19 十一月 2025 14:57:34 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 bd61ed2..0705f50 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -38,6 +38,8 @@
private OrderDetlService orderDetlService;
@Autowired
private InOutService inOutService;
+ @Autowired
+ private MatService matService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -120,13 +122,18 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setModel(wrkDetl.getModel());
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
- inOut.setModiTime(now.toString());
+ inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
+ inOut.setBrand(wrkDetl.getZpallet());//鎵樼洏鏉＄爜
+ inOut.setTemp2(mat.getName());//濂楀彿
+ inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
+// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -183,10 +190,12 @@
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
+ inOut.setTemp1("涓嶅湪搴�");//灞炴�� 鏄惁鍦ㄥ簱
+ inOut.setBrand("");//鎵樼洏鏉＄爜
+ inOut.setTemp3("");
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -251,10 +260,12 @@
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
- inOut.setTemp1("鍦ㄥ簱");
+ inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
+ inOut.setBrand(wrkDetl.getZpallet());//鎵樼洏鏉＄爜
+ inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -393,10 +404,12 @@
for (WrkDetl wrkDetl : wrkDetls101) {
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
- inOut.setTemp1("涓嶅湪搴�");
+ inOut.setTemp1("涓嶅湪搴�");//灞炴�� 鏄惁鍦ㄥ簱
+ inOut.setBrand("");//鎵樼洏鏉＄爜
+ inOut.setTemp3("");//搴撲綅鍙�
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
}
--
Gitblit v1.9.1