From 830d4a2a90db1f173044531d7ddc0578cd507346 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 17:23:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/StartupDto.java | 57 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 6 +-
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 21 +++++-----
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 2
src/main/java/com/zy/asrs/service/BasDevpService.java | 2
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 2
src/main/java/com/zy/common/service/CommonService.java | 18 ++++++--
8 files changed, 88 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index e7efe2e..e19c0ea 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -8,7 +8,7 @@
public class FullStoreParam {
// 绔欑偣缂栧彿
- private String devpNo;
+ private Integer devpNo;
// 鐗╂枡鍒楄〃鏁版嵁
private List<MatCodeStore> list;
@@ -38,11 +38,11 @@
}
}
- public String getDevpNo() {
+ public Integer getDevpNo() {
return devpNo;
}
- public void setDevpNo(String devpNo) {
+ public void setDevpNo(Integer devpNo) {
this.devpNo = devpNo;
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 62a4cf5..5d49482 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(String devpNo);
+ void checkSiteStatus(Integer devpNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 7629b3c..55f5f51 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -5,6 +5,6 @@
public interface WrkMastService extends IService<WrkMast> {
- int getWorkingMast(String devpNo);
+ int getWorkingMast(Integer devpNo);
}
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 0de9f62..8bf09f4 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(String devpNo) {
+ public void checkSiteStatus(Integer devpNo) {
BasDevp station = selectById(devpNo);
if (station == null){
throw new CoolException("绔欑偣涓嶅瓨鍦�");
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 e93822e..45e2e6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -3,10 +3,12 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,15 +46,14 @@
}
}
// 妫�绱㈠簱浣�
- String locNo = commonService.getLocNo(1, param.getDevpNo());
-
-
-
-
-// if (staNo == null || staNo.get)
- // 鑾峰彇鏈�鏂扮殑宸ヤ綔妗�
-// WrkMast latestWrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().orderBy("appe_time"));
-
-
+ StartupDto dto = commonService.getLocNo(1, param.getDevpNo());
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ // todo
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("娉ㄥ叆sql澶辫触");
+ }
}
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index c3b84b3..ddcbc22 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -11,7 +11,7 @@
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
@Override
- public int getWorkingMast(String devpNo) {
+ public int getWorkingMast(Integer devpNo) {
return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
}
}
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
new file mode 100644
index 0000000..dfb624d
--- /dev/null
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -0,0 +1,57 @@
+package com.zy.common.model;
+
+/**
+ * Created by vincent on 2020/6/11
+ */
+public class StartupDto {
+
+ private Shelves shelves;
+
+ private Integer sourceStaNo;
+
+ private Integer staNo;
+
+ private Integer crnNo;
+
+ private String locNo;
+
+ public Shelves getShelves() {
+ return shelves;
+ }
+
+ public void setShelves(Shelves shelves) {
+ this.shelves = shelves;
+ }
+
+ public Integer getSourceStaNo() {
+ return sourceStaNo;
+ }
+
+ public void setSourceStaNo(Integer sourceStaNo) {
+ this.sourceStaNo = sourceStaNo;
+ }
+
+ public Integer getStaNo() {
+ return staNo;
+ }
+
+ public void setStaNo(Integer staNo) {
+ this.staNo = staNo;
+ }
+
+ public Integer getCrnNo() {
+ return crnNo;
+ }
+
+ public void setCrnNo(Integer crnNo) {
+ this.crnNo = crnNo;
+ }
+
+ public String getLocNo() {
+ return locNo;
+ }
+
+ public void setLocNo(String locNo) {
+ this.locNo = locNo;
+ }
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f2819c7..2f22fbd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.Shelves;
+import com.zy.common.model.StartupDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -76,12 +77,12 @@
* @param sourceStaNo 婧愮珯
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public String getLocNo(Integer whsType, String sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
+ StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- String locNo = null;
if (rowLastno.getWhsType() == 1){
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
@@ -111,7 +112,7 @@
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", 1)
- .eq("stnNo", sourceStaNo)
+ .eq("stn_no", sourceStaNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
@@ -125,16 +126,23 @@
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
- locNo = locMast.getLocNo();
+ String locNo = locMast.getLocNo();
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
+
+ // 杩斿洖dto
+ startupDto.setCrnNo(crnNo);
+ startupDto.setShelves(shelves);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setLocNo(locNo);
} else {
throw new CoolException("鐩爣绔欎笉鍙敤");
}
}
- return locNo;
+ return startupDto;
}
}
\ No newline at end of file
--
Gitblit v1.9.1