From 3c66dbbe60470f294b4fa7c1816c2e923aab29be Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 02 十二月 2022 23:38:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 ++++++++++++++-------
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++++++--
3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8063a13..f07e3ce 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -143,6 +143,9 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ if (orderDetl.getBatch() == null) {
+ orderDetl.setBatch("");
+ }
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index fff66e0..b6b2cd2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -102,13 +102,8 @@
combMat.setBatch("");
}
}
- for (CombParam.CombMat combMat : param.getCombMats()) {
- Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
- OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
- if ( combMat.getAnfme() > (orderDetl.getAnfme() - sum)) {
- throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
- }
- }
+
+
Date now = new Date();
@@ -152,6 +147,18 @@
}
// 鍏宠仈缁勬墭
} else {
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
+ OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
+ if (orderDetl == null) {
+ throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
+
+ }
+ Double anfme = orderDetl.getAnfme();
+ if ( anfme > (anfme - sum)) {
+ throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
+ }
+ }
Order order = orderService.selectByNo(param.getOrderNo());
if (order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e49a7ad..e2f75df 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -171,7 +171,7 @@
integer = rowLastnoService.selectNextWhsType();
BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
.eq("crn_no", i));
- if (crn_no.getInEnable().equals("Y")){
+ if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts().equals("3")){
break;
}
}
@@ -250,8 +250,18 @@
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ int rowCount = rowLastnoService.selectCount(null);
+ Integer integer = 1;
+ for (int i = 1; i <= rowCount; i++) {
+ integer = rowLastnoService.selectNextWhsType();
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", i));
+ if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts().equals("3")){
+ break;
+ }
+ }
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1