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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fe380cf..f2819c7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -120,10 +120,14 @@
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 {
--
Gitblit v1.9.1