From 57e7846403cd3c72cc70e17e205c4e0d8b3aa404 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 04 十一月 2025 10:10:53 +0800
Subject: [PATCH] #1

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4e905dd..b525134 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -107,6 +107,20 @@
         sourceStaNo.setLocType1(param.getLocType1());
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
 
+        if (param.getBarcode().startsWith("4")){
+            locTypeDto.setLocType2((short) 4);
+        }else if (param.getBarcode().startsWith("5")){
+            locTypeDto.setLocType2((short) 5);
+        }else if (param.getBarcode().startsWith("6")){
+            locTypeDto.setLocType2((short) 6);
+        }else if (param.getBarcode().startsWith("7")){
+            locTypeDto.setLocType2((short) 7);
+        }else if (param.getBarcode().startsWith("8")){
+            locTypeDto.setLocType2((short) 8);
+        }else {
+            throw new CoolException("鏉$爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
+        }
+
         StartupDto dto = null;
         switch (param.getIoType()) {
             case 1://婊℃墭鐩樺叆搴�
@@ -345,8 +359,8 @@
         wrkMast.setIoPri(13D); // 浼樺厛绾�
         wrkMast.setCrnNo(dto.getCrnNo());
         wrkMast.setSourceStaNo(dto.getSourceStaNo());
-        wrkMast.setStaNo(dto.getStaNo());
-        wrkMast.setLocNo(dto.getLocNo());
+        wrkMast.setStaNo(dto.getStaNo());// 鐩爣绔�
+        wrkMast.setLocNo(dto.getLocNo());// 鐩爣搴撲綅
         wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
         wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
         wrkMast.setPicking("N"); // 鎷f枡
@@ -373,6 +387,7 @@
             wrkDetl.setIoTime(wrkMast.getIoTime());
             wrkDetl.setAppeTime(now);
             wrkDetl.setModiTime(now);
+            wrkDetl.setModel(waitPakin.getModel());
             if (!Cools.isEmpty(waitPakin.getOrderNo())) {
                 Order order = orderService.selectByNo(waitPakin.getOrderNo());
                 if (order != null) {

--
Gitblit v1.9.1