From 41abebc43c322c5d708d2b5be39ce8141f4fb70e Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 13 一月 2026 14:09:30 +0800
Subject: [PATCH] #

---
 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 65b61be..aa00ad7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -395,6 +395,10 @@
      */
     @Transactional
     public StartupDto startupFullReassign(String workNo, int[] row) {
+        if (row.length == 0) {
+            throw new CoolException(workNo + "宸ヤ綔锛學CS涓婃姤鏃犲彲鐢ㄨ澶�");
+        }
+
         WrkMast sourceWrkMast = wrkMastService.selectByTaskNo(workNo);
         if(sourceWrkMast == null) {
             throw new CoolException(workNo + "宸ヤ綔鏁版嵁涓嶅瓨鍦�");
@@ -468,10 +472,18 @@
      */
     @Transactional
     public StartupDto applyChangeLocNo(String wcsLocNo, int[] row) {
+        if (row.length == 0) {
+            throw new CoolException(wcsLocNo + "搴撲綅锛學CS涓婃姤鏃犲彲鐢ㄨ澶�");
+        }
+
         String sourceLocNo = loc(wcsLocNo);
         LocMast sourceLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", sourceLocNo));
         if (sourceLocMast == null) {
             throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+        }
+
+        if(!sourceLocMast.getLocSts().equals("F")) {
+            throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
         }
         List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
         LocDetl sourceLocDetl = locDetlList.get(0);
@@ -501,7 +513,7 @@
         WrkMast wrkMast = new WrkMast();
         wrkMast.setWrkNo(workNo);
         wrkMast.setIoTime(now);
-        wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+        wrkMast.setWrkSts(12L); // 宸ヤ綔鐘舵��
         wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
         wrkMast.setIoPri(10D);
         wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�

--
Gitblit v1.9.1