From 2652245dcba9a47e1159550304e7a9b0b332b42a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 16:02:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2f22fbd..8e1074e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -14,7 +14,7 @@
import java.util.List;
/**
- * 鍙屾繁寮忚揣鏋舵牳蹇冨姛鑳�
+ * 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
@Service
@@ -63,9 +63,15 @@
}
}
if (workNo > 0){
- // todo
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
+ }
+ }
+ if (workNo == 0) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ if (wrkMastService.selectById(workNo)!=null) {
+ throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
@@ -100,6 +106,7 @@
for (List<Integer> node : shelves.nodes){
if (node.contains(curRow)) {
crnNo = shelves.nodes.indexOf(node) + 1;
+ break;
}
}
BasCrnp crnp = basCrnpService.selectById(crnNo);
@@ -119,7 +126,7 @@
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- int inQty = staNo.getInQty();
+ int inQty = staNo.getInQty()==null?0:staNo.getInQty();
if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
LocMast locMast = locMastService.queryFreeLocMast(curRow);
--
Gitblit v1.9.1