From 9ced6732cf2d379f9b9d09c9f8f82fb60529d113 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 15:45:15 +0800
Subject: [PATCH] #newVersion
---
src/main/java/com/zy/common/service/CommonService.java | 80 +++++++++++-----------------------------
1 files changed, 22 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1091368..e0b307b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -5,6 +5,7 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.StartupDto;
@@ -89,6 +90,13 @@
*/
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("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -97,62 +105,20 @@
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
+
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ curRow = curRow == sRow ? eRow : sRow;
// 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- 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) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� 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;
-// }
-// }
+ int crnNo;
+ switch (whsType) {
+ case 1:
+ crnNo = 1;
+ break;
+ case 2:
+ crnNo = 2;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
}
basCrnpService.checkSiteStatus(crnNo);
@@ -169,9 +135,7 @@
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
- if (locMast == null) {
- locMast = locMastService.queryFreeLocMast(curRow);
- }
+ LocMast locMast = locMastService.queryFreeLocMast(curRow);
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1