From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/common/web/WcsController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3579926..d3956e8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -308,7 +308,8 @@
WaitPakin waitPakin1 = waitPakins.get(0);
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
-
+ findLocNoAttributeVo.setAreaId(waitPakin1.getAreaId());
+ findLocNoAttributeVo.setOrderNo(waitPakin1.getOrderNo());
// StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
if (dto == null) {
@@ -470,6 +471,7 @@
WrkDetl wrkDetl = wrkDetlList.get(0);
findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
findLocNoAttributeVo.setBatch(wrkDetl.getBatch());
+ findLocNoAttributeVo.setOrderNo(wrkDetl.getOrderNo());
// StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
if (dto == null) {
@@ -615,14 +617,14 @@
String sourcecLocNo = wrkMast.getSourceLocNo();
//鏇存柊宸ヤ綔鏄庣粏骞舵竻绌烘簮搴撲綅
for (WrkDetl wrkDetl : wrkDetls){
- LocDetl locDetl = locDetlService.selectItem(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ LocDetl locDetl = locDetlService.selectItemCarton(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode());
if (null != locDetl && wrkMast.getIoType() == 103) {//鎷ｆ枡
- if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new CoolException("response.picking_inbound_update_detail_failed");
}
}else if(wrkMast.getIoType() == 107){//鐩樼偣
- if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBarcode())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new CoolException("response.picking_inbound_update_detail_failed");
}
--
Gitblit v1.9.1