From 6a478880c4aa9c62e960a72591b1eb3ea92c223f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 15:33:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 118 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8eae96c..530f2d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -6,8 +6,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
+import com.zy.common.model.enums.WorkNoType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,10 +34,12 @@
private BasDevpService basDevpService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
+ * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -45,27 +47,30 @@
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- int workNo = 0;
- // 鍏ュ嚭搴撶被鍨�
- if (wrkLastno.getWrkMk() == 0) {
- workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getSNo();
- int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
-
- while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
- } else {
- break;
- }
+ int workNo = wrkLastno.getWrkNo();
+ int sNo = wrkLastno.getSNo();
+ int eNo = wrkLastno.getENo();
+ workNo = workNo>=eNo ? sNo : workNo+1;
+ while (true) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ if (null != wrkMast) {
+ workNo = workNo>=eNo ? sNo : workNo+1;
+ } else {
+ break;
}
- if (workNo > 0){
- // todo
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
+ }
+ // 淇敼搴忓彿璁板綍
+ if (workNo > 0){
+ wrkLastno.setWrkNo(workNo);
+ wrkLastnoService.updateById(wrkLastno);
+ }
+ // 妫�楠�
+ if (workNo == 0) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ if (wrkMastService.selectById(workNo)!=null) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
@@ -74,45 +79,49 @@
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
+ * @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
StartupDto startupDto = new StartupDto();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
+ startupDto.setWorkNo(workNo);
+ if (sourceStaNo < 100) {
+ whsType = 1;
+ } else {
+ whsType = 2;
+ }
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- if (rowLastno.getWhsType() == 1){
+ if (whsType == 1 || whsType == 2){
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
+
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- Shelves shelves = new Shelves(rowCount, crn_qty);
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- // 鍫嗗灈鏈哄彿
- int crnNo = 0;
- for (List<Integer> node : shelves.nodes){
- if (node.contains(curRow)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ curRow = curRow == sRow ? eRow : sRow;
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo;
+ switch (whsType) {
+ case 1:
+ crnNo = 1;
break;
- }
+ case 2:
+ crnNo = 2;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
}
- BasCrnp crnp = basCrnpService.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- throw new CoolException("鍫嗗灈鏈虹紪鍙烽敊璇�");
- }
- if (!"Y".equals(crnp.getInEnable())) {
- throw new CoolException("褰撳墠鍫嗗灈鏈烘棤娉曞叆搴�");
- }
+
+ basCrnpService.checkSiteStatus(crnNo);
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", 1)
+ .eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
@@ -121,7 +130,7 @@
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
+ if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
LocMast locMast = locMastService.queryFreeLocMast(curRow);
if (Cools.isEmpty(locMast)) {
@@ -135,15 +144,30 @@
// 杩斿洖dto
startupDto.setCrnNo(crnNo);
- startupDto.setShelves(shelves);
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
} else {
- throw new CoolException("鐩爣绔欎笉鍙敤");
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
+ } else {
+ throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
}
return startupDto;
}
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
+ return msg;
+ } else if (msg.length() > count) {
+ return msg.substring(0, 16);
+ } else {
+ StringBuilder msgBuilder = new StringBuilder(msg);
+ for(int i = 0; i < count - msg.length(); ++i) {
+ msgBuilder.insert(0, "0");
+ }
+ return msgBuilder.toString();
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1