From 005827136eeb432ca8b68925ffaf86b6b95c4a84 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:37 +0800
Subject: [PATCH] #盘点修改
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 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 8309fe1..4ce6e80 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -41,8 +41,8 @@
// 9.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 9) {
return doIn(wrkMast);
- // 17.鍑哄簱瀹屾垚
- } else if (wrkMast.getWrkSts() == 17) {
+ // 29.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 29) {
return doOut(wrkMast);
}
return SUCCESS;
@@ -86,14 +86,7 @@
}
// 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- } else {
- locDetl = new LocDetl();
+ LocDetl locDetl = new LocDetl();
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
@@ -103,7 +96,7 @@
if (!locDetlService.insert(locDetl)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
- }
+
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
try {
@@ -143,9 +136,15 @@
}
for (WrkDetl wrkDetl : wrkDetls53) {
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
+ locMast.getLocNo(),
+ wrkDetl.getMatnr(),
+ wrkDetl.getBatch(),
+ wrkDetl.getSuppCode(),
+ wrkDetl.getThreeCode(),
+ wrkDetl.getDeadTime())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
@@ -171,9 +170,9 @@
// 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
for (WrkDetl wrkDetl:wrkDetls54) {
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode(),wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
}
} else {
@@ -207,8 +206,21 @@
if (wrkDetls57.isEmpty()) {
exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
+ // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
+ for (WrkDetl wrkDetl : wrkDetls57) {
+ LocDetl 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());
+ }
+ }
+ // 淇敼搴撲綅鐘舵�� S ====>> F
+ if (locMast.getLocSts().equals("S")) {
locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -254,7 +266,7 @@
break;
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(10L);
+ wrkMast.setWrkSts(10L);//10.搴撳瓨鏇存柊瀹屾垚
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
@@ -306,6 +318,19 @@
}
}
break;
+ //鐩樼偣鍑哄簱
+ case 107:
+ // 淇敼搴撲綅鐘舵�� R ===>> O
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ if (!locMastService.updateById(locMast)) {
+ exceptionHandle("鐩樼偣鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+ }
+ }
+ return SUCCESS;//鐩樼偣鍙鐞嗗簱瀛樻暟鎹笉鏀瑰彉宸ヤ綔妗ｇ姸鎬�
// 绌烘澘鍑哄簱
case 110:
// 淇敼搴撲綅鐘舵�� R ===>> O
@@ -323,7 +348,7 @@
break;
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(18L);
+ wrkMast.setWrkSts(30L);//35.搴撳瓨鏇存柊瀹屾垚
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
--
Gitblit v1.9.1