From eea34e49d048ed36d4afc3ffa08c08fb38c81e7d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 12 六月 2025 15:08:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/common/web/WcsController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 41b126b..e376d22 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()) {
@@ -176,9 +185,12 @@
 //        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 + ""));
+//        dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
 
         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