From bcd8d392d27ae13ed21fc1c96920a37544992d04 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 16:24:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 850898a..8ab6a1b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -135,9 +135,9 @@
return R.error("鎵樼洏鐮佷笉瀛樺湪");
}
- startupPickPutStore(param);
+ StartupDto dto = startupPickPutStore(param);
log.info("WCS鎷ｆ枡鐩樼偣鍏ュ簱鎺ュ彛,鎵樼洏鐮�:{}", param.getBarcode());
- return R.ok();
+ return R.ok().add(dto);
}
@PostMapping("/auto/emptyIn/v1")
@@ -193,9 +193,9 @@
}
@Transactional
- public void startupPickPutStore(SearchLocParam param) {
+ public StartupDto startupPickPutStore(SearchLocParam param) {
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
if (param.getBarcode().startsWith("11")) {
@@ -214,10 +214,13 @@
}
if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
- throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟宸茬粡鎷ｉ�夌洏鐐�");
+ StartupDto dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ return dto;
}
- if (wrkMast.getIoType() != 103 || wrkMast.getIoType() != 107) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟涓嶅睘浜庢嫞閫夌洏鐐�");
}
@@ -230,7 +233,9 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
- StartupDto dto = commonService.getLocNo(1, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
+ int ioType = wrkMast.getIoType() - 50; // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+
+ StartupDto dto = commonService.getLocNo(ioType, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
if (dto == null) {
throw new CoolException("鎵句笉鍒扮┖搴撲綅");
}
@@ -247,7 +252,7 @@
Date now = new Date();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
@@ -265,13 +270,13 @@
throw new CoolException(locMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬绌哄簱浣�");
}
- locMast.setLocSts("S");
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ locMast.setLocSts("Q");
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
if (!sourceLocMast.getLocSts().equals("P")) {
throw new CoolException(sourceLocMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬P.鎷ｆ枡鐩樼偣鍑哄簱");
@@ -309,6 +314,7 @@
}
}
+ return dto;
}
/**
--
Gitblit v1.9.1