From 71592bfa6e09c482ba6c12d4bacedd470fedbec8 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:48:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 1ecd46d..c14cb4f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -67,6 +67,7 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
locMast.setBarcode(wrkMast.getBarcode());
}
+ log.warn("Flag - 13,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "D");
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -93,6 +94,8 @@
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setProddate(wrkDetl.getProddate());//鐢熶骇鏃ユ湡
+ locDetl.setDeadline(wrkDetl.getDeadline());//鍒版湡鏃ユ湡
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
@@ -121,6 +124,7 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ log.warn("Flag - 14,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -190,6 +194,9 @@
}
for (DetlDto detlDto : detlDtos) {
+ if(detlDto.getAnfme() <= 0 ){
+ continue;
+ }
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -203,6 +210,8 @@
locDetl.setBatch(detlDto.getBatch()); // 鎵瑰彿
locDetl.setThreeCode(detlDto.getCsocode());
locDetl.setDeadTime(detlDto.getIsoseq());
+ locDetl.setProddate(detlDto.getProddate());
+ locDetl.setDeadline(detlDto.getDeadline());
locDetl.setAppeTime(now);
locDetl.setAppeUser(9527L);
locDetl.setModiTime(now);
@@ -214,6 +223,7 @@
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ log.warn("Flag - 15,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -229,14 +239,13 @@
//娓呯┖婧愬簱浣嶆暟鎹� P ====>> O
LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
if (locMast1.getLocSts().equals("P")) {
+ log.warn("Flag - 16,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
locMast1.setLocSts("O"); // 娓呯┖搴撲綅
locMast1.setModiTime(new Date());
if (!locMastService.updateById(locMast1)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast1.getLocNo()));
- } else {
- throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
break;
@@ -261,6 +270,8 @@
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setProddate(wrkDetl.getProddate());//鐢熶骇鏃ユ湡
+ locDetl.setDeadline(wrkDetl.getDeadline());//鍒版湡鏃ユ湡
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -270,6 +281,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ log.warn("Flag - 17,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -293,6 +305,8 @@
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setProddate(wrkDetl.getProddate());
+ locDetl.setDeadline(wrkDetl.getDeadline());
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -301,6 +315,7 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ log.warn("Flag - 18,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), wrkMast.getFullPlt().equals("Y")?"F":"D");
locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -325,6 +340,7 @@
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null != sourceLoc) {
+ log.warn("Flag - 19,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", sourceLoc.getLocNo(), sourceLoc.getLocSts(), "O");
sourceLoc.setBarcode("");
sourceLoc.setLocSts("O");
sourceLoc.setModiTime(now);
@@ -335,6 +351,7 @@
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+ log.warn("Flag - 20,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), locSts);
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -390,6 +407,7 @@
}
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ log.warn("Flag - 21,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
@@ -403,6 +421,7 @@
case 107:
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("P")) {
+ log.warn("Flag - 22,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
@@ -417,6 +436,7 @@
case 110:
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ log.warn("Flag - 23,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
--
Gitblit v1.9.1