From 3df9a5570891321c390ef423fafd1dcacb1930b1 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 18 三月 2026 09:19:06 +0800
Subject: [PATCH] 1.修复先进先出规则
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 9ed7473..c603ccc 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,7 +94,10 @@
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setProddate(wrkDetl.getProddate());//鐢熶骇鏃ユ湡
+ locDetl.setDeadline(wrkDetl.getDeadline());//鍒版湡鏃ユ湡
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setSuppCode(Cools.isEmpty(wrkDetl.getSuppCode()) ? null : wrkDetl.getSuppCode());
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -121,6 +125,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);
@@ -206,7 +211,9 @@
locDetl.setBatch(detlDto.getBatch()); // 鎵瑰彿
locDetl.setThreeCode(detlDto.getCsocode());
locDetl.setDeadTime(detlDto.getIsoseq());
- locDetl.setAppeTime(now);
+ locDetl.setProddate(detlDto.getProddate());
+ locDetl.setDeadline(detlDto.getDeadline());
+ locDetl.setAppeTime(wrkDetl.get(0).getAppeTime());
locDetl.setAppeUser(9527L);
locDetl.setModiTime(now);
locDetl.setModiUser(9527L);
@@ -217,6 +224,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);
@@ -232,6 +240,7 @@
//娓呯┖婧愬簱浣嶆暟鎹� 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)) {
@@ -262,6 +271,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)) {
@@ -271,6 +282,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);
@@ -294,6 +306,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)) {
@@ -302,6 +316,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);
@@ -326,6 +341,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);
@@ -336,6 +352,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);
@@ -391,6 +408,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);
@@ -404,6 +422,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);
@@ -418,6 +437,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