From 7cae09c8b65a1458089065d532de3691851b066d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 16:52:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..783dda8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -6,9 +6,8 @@
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 com.zy.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,9 +23,7 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private DoubleDeepService doubleDeepService;
- @Autowired
- private WrkLastnoService wrkLastnoService;
+ private CommonService commonService;
@Override
@Transactional
@@ -38,7 +35,16 @@
// 绔欑偣鐘舵�佹娴�
basDevpService.checkSiteStatus(param.getDevpNo());
// 鐢熸垚宸ヤ綔鍙�
- int workNo = doubleDeepService.getWorkNo(wrkLastnoService.selectById(0));
+ int workNo = commonService.getWorkNo(0);
+ if (workNo == 0) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ if (wrkMastService.selectById(workNo)!=null) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
+ }
+ }
+ // 妫�绱㈠簱浣�
+ String locNo = commonService.getLocNo(1, param.getDevpNo());
// if (staNo == null || staNo.get)
--
Gitblit v1.9.1