From eae70b86a475aaba67731db87321feebdda0abda Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 12 十一月 2025 15:15:58 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/web/WcsController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 197356e..740081c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -87,8 +87,9 @@
if (countLoc > 0) {
return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
}
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countWrk > 0) {
+ if (countWrk > 0 && wrkMast.getWrkSts() != 15) {
return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
@@ -373,6 +374,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setModel(waitPakin.getModel());
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
--
Gitblit v1.9.1