From 07dad0e9ef89346439cfcfb5978b0f1cb8f1b512 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 27 五月 2025 12:31:30 +0800
Subject: [PATCH] 新增PDA并板操作
---
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f7fee95..059ecb0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -84,9 +84,12 @@
return R.parse(CodeRes.NO_COMB_700);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0) {
+ return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
+ if (countWrk > 0) {
+ return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
if (Cools.isEmpty(param.getLocType1())) {
@@ -363,10 +366,9 @@
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
- OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch(),waitPakin.getAnfme());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
- }
+ OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
+ wrkDetl.setBatch(orderDetl.getBatch());
+ wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
wrkDetl.setLuHao(orderDetl.getLuHao());
--
Gitblit v1.9.1