From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 15 +++++++++++++--
1 files changed, 13 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 46005e3..d7516d7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -73,7 +73,7 @@
if (wrkMast != null && wrkMast.getIoType() == 103) {
return R.parse(CodeRes.PICK_600);
}
- return R.parse(CodeRes.NO_COMB_700);
+ return R.error(param.getBarcode() + "姝ゆ潯鐮佹湭缁勬墭锛岃鍏堢粍鎵橈紒");
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",param.getBarcode())
@@ -175,6 +175,17 @@
break;
}
}
+ String fullPlt = "N";
+ for (WaitPakin waitPakin : waitPakins) {
+ if (Cools.isEmpty(waitPakin.getIsFull())) {
+ fullPlt = "N";
+ break;
+ }
+ if (waitPakin.getIsFull().equals("Y")) {
+ fullPlt = "Y";
+ break;
+ }
+ }
StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
int workNo = dto.getWorkNo();
@@ -191,7 +202,7 @@
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(fullPlt); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
--
Gitblit v1.9.1