From 33cb25f6fb87e7781bf5f62c7fa879db52d0715a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 08:57:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/web/WcsController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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..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()) {
@@ -179,6 +188,9 @@
 //        dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
 
         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