From b5c72fc1d4ff3e82921ec5f325a8acf6dd840e2e Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 21 十二月 2022 16:48:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4 +++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 ++++++----
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 +++-
src/main/java/com/zy/asrs/controller/OutController.java | 8 ++++++--
src/main/resources/application.yml | 2 +-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 6a64db6..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)) {
@@ -178,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();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 319c1a0..3f58d01 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -94,7 +94,9 @@
orderDetl.setQty(orderDetl.getAnfme());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+// List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ List<OrderDto> orderDtoList = new ArrayList<>();
+ orderDtoList.add(new OrderDto(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getAnfme()));
for (OrderDto one : orderDtoList) {
if (one.getOrderNo().equals(orderNo)) {
orderDetl.setAnfme(one.getAnfme());
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ccec27f..a9ed208 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -392,7 +392,9 @@
}
} 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 orderDto : orderDtoList) {
OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
if (orderDetl == null) {
@@ -1060,9 +1062,9 @@
if (Cools.isEmpty(locNos)) {
return;
}
- if (true && !Cools.isEmpty(locNos)) {
- throw new CoolException("鏆備笉鏀寔绉诲簱浠诲姟"); // todo:luxiaotao 绉诲簱寮�鍏�
- }
+// if (true && !Cools.isEmpty(locNos)) {
+// throw new CoolException("鏆備笉鏀寔绉诲簱浠诲姟"); // todo:luxiaotao 绉诲簱寮�鍏�
+// }
LocMast one = locMastService.selectById(locNos.get(0));
List<Integer> rows = Utils.getGroupLoc(Integer.parseInt(locNos.get(0).substring(0, 2)));
List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), one.getLocType1());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 0fbb782..c40b82e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -122,7 +122,9 @@
orderService.checkComplete(wrkDetl.getOrderNo());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+// List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ List<OrderDto> orderDtoList = new ArrayList<>();
+ orderDtoList.add(new OrderDto(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getAnfme()));
for (OrderDto one : orderDtoList) {
orderService.checkComplete(one.getOrderNo());
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 35c5c52..28bad09 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
--
Gitblit v1.9.1