From 8687f74a7e45949d6fc451e151a00b18f9dd0ca7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 08:09:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2178765..217b51e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -205,7 +205,7 @@
                     //杩囨护鍒ゆ柇锛岄槻姝㈡嫞鏂欏啀鍏ュ簱璐х墿锛岀粡杩囧叆搴撶珯鍐嶅叆搴撴椂锛岃閫�鍥炲埌閫�搴撶珯
                     WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
                     if (wrkMast1 !=null){
-                        if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
+                        if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()== 57 || wrkMast1.getIoType()==104){
                             continue;
                         }
                     }
@@ -445,6 +445,8 @@
                             stnNo =204;
                         }else if(wrkMast.getCrnNo() == 3) {
                             stnNo = 304;
+                        }else if(wrkMast.getCrnNo() == 4) {
+                            stnNo = 311;
                         }
                     } else if(wrkMast.getIoType() == 107){ //鐩樼偣鍑哄簱
                         if(wrkMast.getCrnNo() == 1) {
@@ -453,6 +455,8 @@
                             stnNo =201;
                         }else if(wrkMast.getCrnNo() == 3) {
                             stnNo = 301;
+                        }else if(wrkMast.getCrnNo() == 4) {
+                            stnNo = 314;
                         }
                     }
                     if (stnNo == 0) {

--
Gitblit v1.9.1