From d6e6f2b259a08498b0674ee29cf2af314b45dbc5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 03 十一月 2020 10:01:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 122 +++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index efb2df8..0de4133 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,7 +7,6 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -85,54 +84,77 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
+ * @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
StartupDto startupDto = new StartupDto();
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;
-
- // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯 todo
- List<String> locNos = locDetlService.getSameDetlToday("X004073XX");
- for (String locNo : locNos) {
- // 鑾峰彇鎺�
- int row = Integer.parseInt(locNo.substring(0, 2));
- // 鍒ゆ柇鏄惁涓烘繁搴撲綅
- double remainder = Arith.remainder(row, rowCount / crn_qty);
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
-
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
-
- } else {
- continue;
- }
-
- }
-
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- 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;
- break;
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
+
+ // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯 todo:luxiaotao
+// 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) {
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
+ if (curRow == sRow) {
+ curRow = eRow;
+ } else {
+ curRow = sRow;
}
+ 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);
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -145,9 +167,11 @@
}
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 (locMast == null) {
+ locMast = locMastService.queryFreeLocMast(curRow);
+ }
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -159,7 +183,6 @@
// 杩斿洖dto
startupDto.setCrnNo(crnNo);
- startupDto.setShelves(shelves);
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
@@ -175,17 +198,34 @@
public static void main(String[] args) {
System.out.println(Arith.remainder(1, 4));
System.out.println("0200201".substring(0, 2));
- String locNo = "0100201";
+ String locNo = "0800201";
int row = Integer.parseInt(locNo.substring(0, 2));
double remainder = Arith.remainder(row, 4);
+ int targetRow;
if (remainder == 1) {
// 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- int targetRow = row + 1;
-
+ targetRow = row + 1;
} else if (remainder == 0) {
// 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
-
+ targetRow = row - 1;
} else {
+ return;
+ }
+ String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
+ System.out.println(zerofill);
+ }
+
+ 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();
}
}
--
Gitblit v1.9.1