From 1fe4313bb3326afa12c827e2d620fa735b8e37fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 14:15:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 115 ++++++++++++++++++++++++++-------------------------------
1 files changed, 53 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bcc0107..1986fe9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,8 +7,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;
@@ -40,7 +40,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
- * @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) {
@@ -48,28 +48,39 @@
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;
+ // 绫诲瀷
+ switch (wrkMk) {
+ case 0: // 鍏ュ簱 1 - 3000
+ break;
+ case 1: // 鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000
+ break;
+ case 2: // 鍑哄簱 6001 -9000
+ break;
+ case 3: // 鍏朵粬 9001 -9999
+ break;
+ default:
+ break;
+ }
- while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
- } else {
- break;
- }
- }
- if (workNo > 0){
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
+ 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){
+ wrkLastno.setWrkNo(workNo);
+ wrkLastnoService.updateById(wrkLastno);
+ }
+ // 妫�楠�
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
@@ -90,11 +101,14 @@
*/
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);
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();
@@ -105,49 +119,26 @@
// 鐩爣搴撲綅
LocMast locMast = null;
- // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
- for (String locNo : locNos) {
- // 鑾峰彇鎺�
- int row = Integer.parseInt(locNo.substring(0, 2));
- // 鍒ゆ柇鏄惁涓烘繁搴撲綅
- double remainder = Arith.remainder(row, rowCount / crn_qty);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- continue;
- }
- String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast targetLocMast = locMastService.selectById(targetLocNo);
- if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) {
- locMast = targetLocMast;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
-
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- Shelves shelves = new Shelves(rowCount, crn_qty);
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
+ if (curRow == sRow) {
+ curRow = eRow;
+ } else {
+ curRow = sRow;
}
- for (List<Integer> node : shelves.nodes){
- if (node.contains(curRow)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
- break;
- }
- }
+ crnNo = whsType;
+// Shelves shelves = new Shelves(rowCount, crn_qty);
+// curRow = shelves.start(curRow);
+// if (curRow < 0) {
+// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+// }
+// for (List<Integer> node : shelves.nodes){
+// if (node.contains(curRow)) {
+// crnNo = shelves.nodes.indexOf(node) + 1;
+// break;
+// }
+// }
}
basCrnpService.checkSiteStatus(crnNo);
@@ -162,7 +153,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) {
// 鏌ユ壘搴撲綅
if (locMast == null) {
locMast = locMastService.queryFreeLocMast(curRow);
--
Gitblit v1.9.1