From 93cf1a27f5d4ff504d691d68c40a622a6424e782 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 14 五月 2025 09:40:20 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/common/service/CommonService.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 27935c9..3695334 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,5 +1,6 @@
 package com.zy.common.service;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.param.*;
@@ -174,7 +175,7 @@
     }
 
     //鍏ュ簱浠诲姟
-    public boolean createInTask(CreateInTaskParam param) {
+    public synchronized boolean createInTask(CreateInTaskParam param) {
         Date now = new Date();
         LocMast locMast = locMastService.queryByLoc(param.getLocNo());
         if (null == locMast) {
@@ -183,6 +184,10 @@
 
         if (!locMast.getLocSts().equals("O")) {
             throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+        }
+        WrkMast wms_wrk_no = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo()));
+        if (wms_wrk_no!=null){
+            throw new CoolException("宸ヤ綔褰撳凡缁忓瓨鍦�");
         }
 
         // 鑾峰彇宸ヤ綔鍙�
@@ -215,7 +220,7 @@
     }
 
     //鍑哄簱浠诲姟
-    public boolean createOutTask(CreateOutTaskParam param) {
+    public synchronized boolean createOutTask(CreateOutTaskParam param) {
         Date now = new Date();
         LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo());
         if (null == locMast) {
@@ -225,7 +230,10 @@
         if (!locMast.getLocSts().equals("F")) {
             throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
         }
-
+        WrkMast wms_wrk_no = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo()));
+        if (wms_wrk_no!=null){
+            throw new CoolException("宸ヤ綔褰撳凡缁忓瓨鍦�");
+        }
         // 鑾峰彇宸ヤ綔鍙�
         int workNo = getWorkNo(WrkIoType.OUT.id);
         // 淇濆瓨宸ヤ綔妗�

--
Gitblit v1.9.1