From 9dc731ba8d1a20da3556879f0b41630bfd73dec3 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 12 一月 2026 14:07:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 138e46b..03425d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,7 +1,5 @@
 package com.zy.common.service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
@@ -26,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Random;
 
 @Slf4j
 @Service
@@ -45,6 +44,8 @@
     private NavigateUtils navigateUtils;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private BasOutStationAreaService basOutStationAreaService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
@@ -85,8 +86,18 @@
     }
 
     public boolean completeTask(CompleteTaskParam param) {
+        WrkMast wrkMast = null;
         Integer wrkNo = param.getWrkNo();
-        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+        String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+        if(wrkNo == null) {
+            if (!Cools.isEmpty(taskNo)) {
+                wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+            }
+        }else {
+            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+        }
+
         if (null == wrkMast) {
             throw new CoolException("浠诲姟涓嶅瓨鍦�");
         }
@@ -105,8 +116,18 @@
     }
 
     public boolean cancelTask(CancelTaskParam param) {
+        WrkMast wrkMast = null;
         Integer wrkNo = param.getWrkNo();
-        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+        String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+        if(wrkNo == null) {
+            if (!Cools.isEmpty(taskNo)) {
+                wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+            }
+        }else {
+            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+        }
+
         if (null == wrkMast) {
             throw new CoolException("浠诲姟涓嶅瓨鍦�");
         }
@@ -156,7 +177,6 @@
         if (!sourceCrnResult.getCrnNo().equals(targetCrnResult.getCrnNo())) {
             throw new CoolException("婧愬簱浣嶅拰鐩爣搴撲綅涓嶅湪鍚屼竴宸烽亾");
         }
-        Integer crnNo = targetCrnResult.getCrnNo();
 
         // 鑾峰彇宸ヤ綔鍙�
         int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
@@ -169,11 +189,19 @@
         wrkMast.setIoPri(ioPri);
         wrkMast.setSourceLocNo(param.getSourceLocNo());
         wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
-        wrkMast.setCrnNo(crnNo);
         wrkMast.setWmsWrkNo(param.getTaskNo());
         wrkMast.setBarcode(sourceLocMast.getBarcode());
         wrkMast.setAppeTime(now);
         wrkMast.setModiTime(now);
+
+        if (targetCrnResult.getCrnType().equals(SlaveType.Crn)) {
+            wrkMast.setCrnNo(targetCrnResult.getCrnNo());
+        } else if (targetCrnResult.getCrnType().equals(SlaveType.DualCrn)) {
+            wrkMast.setDualCrnNo(targetCrnResult.getCrnNo());
+        }else {
+            throw new CoolException("鏈煡璁惧绫诲瀷");
+        }
+
         boolean res = wrkMastService.insert(wrkMast);
         if (!res) {
             News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
@@ -277,7 +305,23 @@
         }
         Integer crnNo = findCrnResult.getCrnNo();
 
-        Integer sourceStationId = this.findOutStationId(findCrnResult, param.getStaNo());
+        Integer staNo = param.getStaNo();
+        String outArea = param.getOutArea();
+        if(Cools.isEmpty(staNo) && Cools.isEmpty(outArea)) {
+            throw new CoolException("璇蜂紶鍏ュ嚭搴撶珯鐐规垨鍑哄簱鍖哄煙");
+        }
+
+        if(Cools.isEmpty(staNo)) {
+            List<BasOutStationArea> areaList = basOutStationAreaService.selectList(new EntityWrapper<BasOutStationArea>().eq("area_code", outArea));
+            if (areaList.isEmpty()) {
+                throw new CoolException("鍑哄簱鍖哄煙涓嶅瓨鍦�");
+            }
+            int nextInt = new Random().nextInt(areaList.size());
+            BasOutStationArea basOutStationArea = areaList.get(nextInt);
+            staNo = basOutStationArea.getStationId();
+        }
+
+        Integer sourceStationId = this.findOutStationId(findCrnResult, staNo);
         if (sourceStationId == null) {
             throw new CoolException("鏈壘鍒拌緭閫佺洰鏍囩珯鐐瑰彲璧拌璺緞");
         }
@@ -293,7 +337,7 @@
         wrkMast.setIoPri(ioPri);
         wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
         wrkMast.setSourceStaNo(sourceStationId);//婧愮珯
-        wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
+        wrkMast.setStaNo(staNo);//鐩爣绔�
         wrkMast.setWmsWrkNo(param.getTaskNo());
         wrkMast.setBarcode(locMast.getBarcode());
         wrkMast.setAppeTime(now);
@@ -402,7 +446,7 @@
                     break;
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+//                e.printStackTrace();
             }
         }
         return targetStationId;
@@ -434,7 +478,7 @@
                     break;
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+//                e.printStackTrace();
             }
         }
         return finalSourceStationId;

--
Gitblit v1.9.1