From dcb21dfbb8399aadfb5b2df9ba5caa0a065ea7ee Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 31 十二月 2024 11:05:15 +0800
Subject: [PATCH] 改版2.0: 1.自动出库200站 2.自动出空板100站 3.自动移库

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c75d502..4225924 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -99,7 +99,7 @@
             }
         }else {
             //鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
-            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",101).or().eq("io_type",110));
+            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no",200).andNew().eq("io_type",101).or().eq("io_type",110));
             if(wrkCount > 0){
                 return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
             }
@@ -350,10 +350,8 @@
 //            wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
             if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11){
                 wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
-            }else if (wrkMast.getIoType()==101){
+            }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
                 wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
-            } else if (wrkMast.getIoType()==110) {
-                wrkMast.setWrkSts(7L);
             }
         }
         wrkMastService.updateById(wrkMast);

--
Gitblit v1.9.1