From 03210aeb31d8e9dfa3c1f9f065587d7208d80dd8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 10 一月 2023 12:51:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 50e7ad1..986c290 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -125,7 +125,11 @@
}
} else {
// 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
+// List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
+
+ List<OrderDto> orderDtoList = new ArrayList<>();
+ orderDtoList.add(new OrderDto(locDto.getOrderNo(),locDto.getMatnr(),locDto.getAnfme()));
+
for (OrderDto one : orderDtoList) {
OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
@@ -140,12 +144,16 @@
}
for (OrderDto orderDto : orderDtos) {
Order order = orderService.selectByNo(orderDto.getOrderNo());
- if (order.getSettle() > 2) {
- return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(order)){
+ if (order.getSettle() > 2) {
+ return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
- if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
- return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(orderDetl)){
+ if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
+ return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
}
@@ -174,7 +182,7 @@
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
- locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
+// locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
}
return R.ok();
}
@@ -206,7 +214,8 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+ int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo()));
+ int ioType = (issued >= locDetl.getAnfme() && count == 1 ? 101 : 103);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
locDto.setStaNos(staNos);
locDtos.add(locDto);
--
Gitblit v1.9.1