From c49d38e3abd223c5f60d3d5fef53144a2d0c6e25 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 11:02:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +----
src/main/java/com/zy/common/service/DoubleDeepService.java | 11 ++++++++---
2 files changed, 9 insertions(+), 7 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..38ceece 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,7 @@
// 绔欑偣鐘舵�佹娴�
basDevpService.checkSiteStatus(param.getDevpNo());
// 鐢熸垚宸ヤ綔鍙�
- int workNo = doubleDeepService.getWorkNo(wrkLastnoService.selectById(0));
+ int workNo = doubleDeepService.getWorkNo(0);
// if (staNo == null || staNo.get)
diff --git a/src/main/java/com/zy/common/service/DoubleDeepService.java b/src/main/java/com/zy/common/service/DoubleDeepService.java
index 8099b40..36785d8 100644
--- a/src/main/java/com/zy/common/service/DoubleDeepService.java
+++ b/src/main/java/com/zy/common/service/DoubleDeepService.java
@@ -3,6 +3,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkLastnoService;
import com.zy.asrs.service.WrkMastService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,13 +17,16 @@
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkLastnoService wrkLastnoService;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkLastno
+ * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
* @return
*/
- public int getWorkNo(WrkLastno wrkLastno) {
+ public int getWorkNo(Integer wrkMk) {
+ WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
int workNo = 0;
// 鍏ュ嚭搴撶被鍨�
if (wrkLastno.getWrkMk() == 0) {
@@ -44,7 +48,8 @@
if (workNo > 0){
// todo
-
+ wrkLastno.setWrkNo(workNo);
+ wrkLastnoService.updateById(wrkLastno);
}
}
--
Gitblit v1.9.1