From 77ce9b966a4965bf1d5bdcb1dbd8e76dd45a8c53 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 17:06:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 062b200..f2819c7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -87,9 +87,9 @@
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
-
+ int rowCount = eRow - sRow + 1;
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- Shelves shelves = new Shelves(8, crn_qty);
+ Shelves shelves = new Shelves(rowCount, crn_qty);
curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -120,13 +120,19 @@
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
int inQty = staNo.getInQty();
if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
- // 鏌ユ壘搴撲綅 todo
- LocMast locMast = locMastService.queryFreeLocMast(curRow, 1);
+ // 鏌ユ壘搴撲綅
+ LocMast locMast = locMastService.queryFreeLocMast(curRow);
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ locNo = locMast.getLocNo();
+
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+ } else {
+ throw new CoolException("鐩爣绔欎笉鍙敤");
}
-
-
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
}
return locNo;
}
--
Gitblit v1.9.1