From 48d6b46ef23a321cc70e20d36a2b3bf721d05206 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:45:57 +0800
Subject: [PATCH] 电视机显示屏曲线图改成7天
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 100 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 24 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 2623345..9c12b61 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -81,7 +81,7 @@
return false;
}
Integer ioType = wrkMast.getIoType();
- return ioType != null && (ioType == 1 || ioType == 8 || ioType == 53 || ioType == 54 || ioType == 57);
+ return ioType != null && (ioType == 1 || ioType == 5 || ioType == 11 || ioType == 53 || ioType == 54 || ioType == 57);
}
private boolean needOutboundErpReport(WrkMast wrkMast) {
@@ -449,6 +449,36 @@
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
break;
+ // 娴呭簱浣嶇Щ搴�
+ case 5:
+ String changeLocSts = "D";
+ if ("N".equals(wrkMast.getEmptyMk())) {
+ changeLocSts = "F";
+ if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ LocMast changeLocSource = locMastService.selectById(wrkMast.getSourceLocNo());
+ if (null != changeLocSource) {
+ changeLocSource.setBarcode("");
+ changeLocSource.setLocSts("O");
+ changeLocSource.setModiTime(now);
+ changeLocSource.setIoTime(now);
+ if (!locMastService.updateById(changeLocSource)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ locMast.setLocSts(changeLocSts);
+ locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("娴呭簱浣嶇Щ搴� ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ break;
default:
break;
}
@@ -509,20 +539,10 @@
}
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- }
try {
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
+ if (!increasePakoutOrderQty(wrkMast, wrkDetl)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
} catch (Exception ignore) {
@@ -566,16 +586,10 @@
}
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
try {
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘閫斾腑鎹℃枡 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
+ if (!increasePakoutOrderQty(wrkMast, wrkDetl)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘閫斾腑鎹℃枡 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
} catch (Exception ignore) {
}
@@ -629,5 +643,43 @@
}
return SUCCESS;
}
-}
+ /**
+ * 鍥炲啓鍑哄簱璁㈠崟瀹屾垚鏁伴噺銆�
+ *
+ * 鏂板鐨勫欢杩熷嚭搴撹鍗曟槑缁嗘寜 pallet_id 淇濆瓨鎺ュ彛鎵樼洏鍙凤紝鍥犳浼樺厛浣跨敤 orderNo + palletId 绮剧‘鍥炲啓锛�
+ * 濡傛灉鏄巻鍙茶鍗曟垨鏃ф暟鎹病鏈� pallet_id锛屽垯閫�鍥炲師鏉ョ殑鐗╂枡/鎵规/澶囩敤瀛楁鍖归厤鏂瑰紡銆�
+ */
+ private boolean increasePakoutOrderQty(WrkMast wrkMast, WrkDetl wrkDetl) {
+ if (wrkDetl == null || Cools.isEmpty(wrkDetl.getOrderNo())) {
+ return true;
+ }
+ String palletId = null;
+ if (!Cools.isEmpty(wrkDetl.getZpallet())) {
+ palletId = wrkDetl.getZpallet();
+ } else if (wrkMast != null) {
+ palletId = wrkMast.getBarcode();
+ }
+ // stationId > 600 鐨勫欢杩熷嚭搴撹鍗曟槸涓�鎵樼洏涓�琛屾槑缁嗭紱鍚屼竴璁㈠崟銆佺墿鏂欍�佹壒娆°�佽繘浠撶紪鍙蜂笅浼氭湁澶氳銆�
+ // 鍥犳瀹屾垚鍥炲啓蹇呴』浼樺厛鐢� orderNo + palletId 绮剧‘瀹氫綅锛屽惁鍒欐棫鐨勭墿鏂欑淮搴︽煡璇細鍛戒腑澶氳銆�
+ if (!Cools.isEmpty(palletId)
+ && orderDetlPakoutService.increaseQtyByOrderNoAndPallet(wrkDetl.getOrderNo(), palletId, wrkDetl.getAnfme())) {
+ return true;
+ }
+ // 鍏煎鍘嗗彶璁㈠崟锛氭棫鏁版嵁鍙兘娌℃湁 pallet_id锛屽彧鑳介��鍥炲師鏉ョ殑鐗╂枡/鎵规/澶囩敤瀛楁鍖归厤銆�
+ // 杩欓噷涓嶅啀璋冪敤鎵归噺 update SQL锛岃�屾槸鍏堝彇涓�鏉℃槑缁嗗悗鎸� id 鏇存柊锛岄伩鍏嶉噸澶嶆槑缁嗘椂鎶婂琛� qty 涓�璧峰姞涓娿��
+ OrderDetlPakout matchedOrderDetl = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (Cools.isEmpty(matchedOrderDetl)) {
+ return true;
+ }
+ matchedOrderDetl.setQty(safeDouble(matchedOrderDetl.getQty()) + safeDouble(wrkDetl.getAnfme()));
+ matchedOrderDetl.setUpdateTime(new Date());
+ return orderDetlPakoutService.updateById(matchedOrderDetl);
+ }
+
+ private double safeDouble(Double value) {
+ return value == null ? 0.0D : value;
+ }
+}
--
Gitblit v1.9.1