From fd1bfa1163d438ec6cabfdd6e01e632d31189c80 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 12 五月 2023 12:34:10 +0800
Subject: [PATCH] 库位规则、混载库位
---
src/main/java/com/zy/common/web/WcsController.java | 5 +++--
1 files changed, 3 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 e4d81c3..825c507 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -77,7 +77,7 @@
// }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
+ if (Cools.isEmpty(waitPakins) || waitPakins.size()!=1) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
if (wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
return R.parse(CodeRes.PICK_600);
@@ -85,6 +85,7 @@
return R.parse(CodeRes.NO_COMB_700);
}
mat = matService.selectByMatnr(waitPakins.get(0).getMatnr());
+ mat.setWeight(waitPakins.get(0).getAnfme());
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
if (countLoc > 0 || countWrk > 0) {
@@ -165,7 +166,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
wrkDetl.setAnfme(mat.getWeight());
- wrkDetl.setBatch(barcode);
+ wrkDetl.setZpallet(barcode);
// wrkDetl.setAnfme(1.0D);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
--
Gitblit v1.9.1