From da13bea76b64183790ab17775f04d43d8c7f6607 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 26 十二月 2025 14:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 856304a..4103eea 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -87,11 +87,24 @@
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("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
+
+ // 绌烘墭鐩樻寜鐓ф墭鐩樼爜鍒嗛厤搴撲綅
+ else if (param.getIoType() == 10) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ if (!param.getBarcode().startsWith("6") && !param.getBarcode().startsWith("7") && !param.getBarcode().startsWith("8")){
+ return R.error("涓嶅瓨鍦ㄧ殑鎵樼洏绫诲瀷");
+ }
+ }
+
+
if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -432,7 +445,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
+// StartupDto dto = commonService.getLocNoEmpty(1, 10, devpNo, null, null, null, locTypeDto);
+ StartupDto dto = commonService.getLocNoEmptyNew(1, 10, devpNo,locTypeDto,barcode);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1