From 39b22a93673a65872b7f63f8d5ff1c2b95ef0bbd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 15:28:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 0b71640..6517a0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -6,7 +6,6 @@
 import com.zy.asrs.entity.param.FullStoreParam;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.WorkService;
-import com.zy.asrs.service.WrkLastnoService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.service.DoubleDeepService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +24,6 @@
     private BasDevpService basDevpService;
     @Autowired
     private DoubleDeepService doubleDeepService;
-    @Autowired
-    private WrkLastnoService wrkLastnoService;
 
     @Override
     @Transactional
@@ -38,7 +35,16 @@
         // 绔欑偣鐘舵�佹娴�
         basDevpService.checkSiteStatus(param.getDevpNo());
         // 鐢熸垚宸ヤ綔鍙�
-        int workNo = doubleDeepService.getWorkNo(wrkLastnoService.selectById(0));
+        int workNo = doubleDeepService.getWorkNo(0);
+        if (workNo == 0) {
+            throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+        } else {
+            if (wrkMastService.selectById(workNo)!=null) {
+                throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
+            }
+        }
+        // 搴撲綅妫�绱�
+        String locNo = doubleDeepService.getLocNo(1);
 
 
 //        if (staNo == null || staNo.get)

--
Gitblit v1.9.1