From 7cc80b9ba2e63fb6545142635e470c473cc68f2f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 13:05:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java |   58 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
index 25b3e41..ed36a71 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -39,6 +39,7 @@
     @Autowired
     private WrkMastService wrkMastService;
 
+    @Transactional
     public ReturnT<String> start(WrkMast wrkMast,WrkMast wrkMastOther) {
         try {
             Date now = new Date();
@@ -65,7 +66,7 @@
                 return FAIL;
             }
             String[] strings = staNoOther(locMast1.getLocNo());
-            if (Cools.isEmpty(strings)){
+            if (Cools.isEmpty(strings) || Cools.isEmpty(strings[0]) || Cools.isEmpty(strings[1])){
                 return FAIL;
             }
             wrkMast.setLocNo(strings[0]);
@@ -73,7 +74,6 @@
 
             WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
 
-            wrkMastCrnService.insert(wrkMastCrn);
 
             // 鏇存柊鐩爣搴撲綅鐘舵��
             LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -87,7 +87,6 @@
                 throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
             }
 
-            wrkMastService.updateById(wrkMast);
 
             // 鏇存柊鐩爣搴撲綅鐘舵��
             LocMast locMastOther = locMastService.selectById(wrkMastOther.getLocNo());
@@ -100,8 +99,35 @@
             } else {
                 throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
             }
+            wrkMastService.updateById(wrkMast);
             wrkMastService.updateById(wrkMastOther);
 
+            wrkMastCrnService.insert(wrkMastCrn);
+
+        }catch (Exception e){
+            log.error("寮傚父锛侊紒锛�"+e);
+            return FAIL;
+        }
+        return SUCCESS;
+    }
+
+    public ReturnT<String> start(WrkMast wrkMast) {
+        try {
+            Date now = new Date();
+            LocTypeDto locTypeDto = new LocTypeDto();
+            locTypeDto.setLocType1((short)1);
+
+            String deepLocOther = getDeepLoc2(wrkMast.getSourceLocNo(), Utils.getRow(wrkMast.getSourceLocNo()));
+            if (Cools.isEmpty(deepLocOther)){
+                return FAIL;
+            }
+            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
+            if (!Cools.isEmpty(wrkMastOther)){
+                WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
+                wrkMastCrnService.insert(wrkMastCrn);
+            }else {
+                return FAIL;
+            }
         }catch (Exception e){
             log.error("寮傚父锛侊紒锛�"+e);
             return FAIL;
@@ -125,18 +151,18 @@
         }
     }
 
-    /**
-     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
-     */
-    public static String getDeepLoc(String shallowLoc,int row) {
-        if (row == 2 || row == 6) {
-            return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
-        } else if (row == 3 || row == 7) {
-            return Utils.zerofill(String.valueOf(row+1), 2) + shallowLoc.substring(2);
-        }else {
-            return shallowLoc;
-        }
-    }
+//    /**
+//     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
+//     */
+//    public static String getDeepLoc(String shallowLoc,int row) {
+//        if (row == 2 || row == 6) {
+//            return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
+//        } else if (row == 3 || row == 7) {
+//            return Utils.zerofill(String.valueOf(row+1), 2) + shallowLoc.substring(2);
+//        }else {
+//            return shallowLoc;
+//        }
+//    }
 
     /**
      * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
@@ -147,7 +173,7 @@
         } else if (row == 4 || row == 8) {
             return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
         }else {
-            return shallowLoc;
+            return null;
         }
     }
 

--
Gitblit v1.9.1