From 5ef746eb014ff4e1249823f3b07c6d9840e2181b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 08:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/common/web/WcsController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 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..b1bc5a0 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(Math.random() * 1000 + ""));
- //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();
// 鐢熸垚宸ヤ綔妗�
--
Gitblit v1.9.1