From 7cae09c8b65a1458089065d532de3691851b066d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 16:52:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..fe380cf 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("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -122,11 +122,13 @@
if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅 todo
LocMast locMast = locMastService.queryFreeLocMast(curRow, 1);
+ 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