From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
index 14ec09d..1b3cd36 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
@@ -80,6 +80,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true, hostId);
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocRangeDto(param.getLocRangeDto());
StartupDto dto = null;
switch (param.getIoType()) {
@@ -107,7 +108,9 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, devpNo, hostId, locTypeDto, 0);
+ String batch = waitPakins.get(0).getBatch();
+ String owner = waitPakins.get(0).getOwner();
+ StartupDto dto = commonService.getLocNo(1, devpNo, matNos, batch, hostId, locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -130,6 +133,8 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setHostId(hostId);
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setOwner(owner);
boolean res = wrkMastService.save(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -143,6 +148,7 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
wrkDetl.setHostId(hostId);
+ wrkDetl.setWrkMastId(wrkMast.getId());
if (!wrkDetlService.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -182,7 +188,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(10, devpNo, hostId, locTypeDto, 0);
+ StartupDto dto = commonService.getLocNo(10, devpNo, null, null, hostId, locTypeDto, 0);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -199,6 +205,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setBarcode(barcode);
+ wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
--
Gitblit v1.9.1