From 445985f6e49939040cf0dea547f0917cbed7712f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 13:13:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a116de4..22263a3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -87,6 +87,15 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("11")) {
+ locTypeDto.setLocType2((short) 1);
+ } else if (param.getBarcode().startsWith("13")) {
+ locTypeDto.setLocType2((short) 2);
+ } else if (param.getBarcode().startsWith("16")) {
+ locTypeDto.setLocType2((short) 3);
+ } else {
+ return R.error("鏈煡鎵樼洏鐮佽鍒�");
+ }
StartupDto dto = null;
switch (param.getIoType()) {
@@ -170,15 +179,18 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
//TODO 娴嬭瘯
- StartupDto dto = new StartupDto();
- dto.setCrnNo(1);
- dto.setSourceStaNo(devpNo);
- dto.setStaNo(103);
- LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
- dto.setLocNo(locMastxx.getLocNo());
- dto.setWorkNo(Math.round(1000));
+// StartupDto dto = new StartupDto();
+// dto.setCrnNo(1);
+// dto.setSourceStaNo(devpNo);
+// dto.setStaNo(103);
+// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
+// dto.setLocNo(locMastxx.getLocNo());
+// dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
- //StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -221,10 +233,16 @@
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
+ List<WaitPakin> waitPakinList = waitPakinService.selectList(wrapper);
+ String tkFlag = null;
+ for (WaitPakin waitPakin : waitPakinList) {
+ tkFlag = waitPakin.getTkFlag();
+ }
WaitPakin setParam = new WaitPakin();
setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
setParam.setModiTime(now);
+ setParam.setTkFlag(tkFlag);
if (!waitPakinService.update(setParam, wrapper)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
--
Gitblit v1.9.1