From 50dce496771f0802cc2ba5edf3b749c42611ff5f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 08 五月 2025 12:55:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 42cc7bb..fd32480 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -21,8 +21,6 @@
     @Autowired
     private WrkMastService wrkMastService;
     @Autowired
-    private WrkMastLogService wrkMastLogService;
-    @Autowired
     private WrkLastnoService wrkLastnoService;
     @Autowired
     private LocMastService locMastService;
@@ -65,6 +63,21 @@
         return workNo;
     }
 
+    //妫�娴嬪伐浣滃彿鏄惁鍦ㄦ寚瀹氱被鍨嬪伐浣滆寖鍥村唴
+    public synchronized boolean checkWorkNoContainMk(Integer workNo, Integer wrkMk) {
+        WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
+        if (Cools.isEmpty(wrkLastno)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+        }
+
+        int sNo = wrkLastno.getSNo();
+        int eNo = wrkLastno.getENo();
+        if (workNo >= sNo && workNo <= eNo) {
+            return true;
+        }
+        return false;
+    }
+
     public static String zerofill(String msg, Integer count) {
         if (msg.length() == count) {
             return msg;
@@ -94,6 +107,8 @@
             wrkMast.setWrkSts(WrkStsType.COMPLETE_MOVE.sts);
         } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
             wrkMast.setWrkSts(WrkStsType.COMPLETE_CHARGE.sts);
+        } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
+            wrkMast.setWrkSts(WrkStsType.COMPLETE_LOC_MOVE.sts);
         }
 
         wrkMast.setModiTime(new Date());
@@ -108,21 +123,31 @@
             throw new CoolException("浠诲姟涓嶅瓨鍦�");
         }
 
-        wrkMastLogService.save(wrkNo);
-        wrkMastService.deleteById(wrkNo);
+        wrkMast.setMk("taskCancel");
+        wrkMast.setModiTime(new Date());
+        wrkMastService.updateById(wrkMast);
         return true;
     }
 
     //绉诲簱浠诲姟
     public boolean createLocMoveTask(CreateLocMoveTaskParam param) {
         Date now = new Date();
-        LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo());
-        if (null == locMast) {
+        LocMast sourceLocMast = locMastService.queryByLoc(param.getSourceLocNo());
+        if (null == sourceLocMast) {
             throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
         }
 
-        if (!locMast.getLocSts().equals("F")) {
+        if (!sourceLocMast.getLocSts().equals("F")) {
             throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
+        }
+
+        LocMast locMast = locMastService.queryByLoc(param.getLocNo());
+        if (null == locMast) {
+            throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�");
+        }
+
+        if (!locMast.getLocSts().equals("O")) {
+            throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
         }
 
         // 鑾峰彇宸ヤ綔鍙�
@@ -144,6 +169,14 @@
             News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
+
+        sourceLocMast.setLocSts("R");
+        sourceLocMast.setModiTime(new Date());
+        locMastService.updateById(sourceLocMast);
+
+        locMast.setLocSts("S");
+        locMast.setModiTime(new Date());
+        locMastService.updateById(locMast);
 
         return true;
     }
@@ -181,6 +214,10 @@
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
 
+        locMast.setLocSts("S");
+        locMast.setModiTime(new Date());
+        locMastService.updateById(locMast);
+
         return true;
     }
 
@@ -216,6 +253,10 @@
             throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
         }
 
+        locMast.setLocSts("R");
+        locMast.setModiTime(new Date());
+        locMastService.updateById(locMast);
+
         return true;
     }
 

--
Gitblit v1.9.1