From 2226c83bff81543472286adea44638e8def2d1bf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 六月 2020 09:00:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 31 ++++++++++++++++++++++++++++---
src/main/java/com/zy/asrs/service/BasDevpService.java | 2 +-
src/main/java/com/zy/asrs/controller/WorkController.java | 5 +++--
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 3 ++-
5 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index be58a56..84fe6c7 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -6,6 +6,7 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +17,7 @@
* Created by vincent on 2020/6/10
*/
@RestController
-public class WorkController {
+public class WorkController extends BaseController {
@Autowired
private WorkService workService;
@@ -33,7 +34,7 @@
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R start(@RequestBody FullStoreParam fullStoreParam) {
System.out.println(JSON.toJSONString(fullStoreParam));
- workService.startupFullStore(fullStoreParam);
+ workService.startupFullStore(fullStoreParam,getUserId());
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 5d49482..bb560d7 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -9,6 +9,6 @@
List<Integer> getAvailableDevp();
- void checkSiteStatus(Integer devpNo);
+ BasDevp checkSiteStatus(Integer devpNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 9a88fc2..daa5504 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -8,6 +8,6 @@
* 鍏ㄦ澘鍏ュ簱
* @param param
*/
- void startupFullStore(FullStoreParam param);
+ void startupFullStore(FullStoreParam param, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 8bf09f4..a66375b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -23,7 +23,7 @@
}
@Override
- public void checkSiteStatus(Integer devpNo) {
+ public BasDevp checkSiteStatus(Integer devpNo) {
BasDevp station = selectById(devpNo);
if (station == null){
throw new CoolException("绔欑偣涓嶅瓨鍦�");
@@ -40,5 +40,6 @@
if(wrkMastService.getWorkingMast(devpNo)>0){
throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
+ return station;
}
}
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 45e2e6a..99a10d6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -3,6 +3,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
@@ -13,6 +14,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
/**
* Created by vincent on 2020/6/11
@@ -29,13 +32,13 @@
@Override
@Transactional
- public void startupFullStore(FullStoreParam param) {
+ public void startupFullStore(FullStoreParam param, Long userId) {
// 鍙傛暟闈炵┖鍒ゆ柇
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
throw new CoolException(BaseRes.PARAM);
}
// 婧愮珯鐐圭姸鎬佹娴�
- basDevpService.checkSiteStatus(param.getDevpNo());
+ BasDevp staNo = basDevpService.checkSiteStatus(param.getDevpNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
if (workNo == 0) {
@@ -49,11 +52,33 @@
StartupDto dto = commonService.getLocNo(1, param.getDevpNo());
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
- // todo
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(10D); // 浼樺厛绾э細10
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setCtnType(staNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(new Date());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("娉ㄥ叆sql澶辫触");
}
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+
}
}
--
Gitblit v1.9.1