From bd79749641c8ea4d6d2f6dccaf831c8b732cf6b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 17:14:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 ++--
src/main/java/com/zy/common/model/OrderDto.java | 9 ++++++---
src/main/java/com/zy/asrs/controller/OutController.java | 6 +++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 14b79e7..cdd590c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -115,7 +115,7 @@
for (LocDto locDto : locDtos) {
if (!isJSON(locDto.getOrderNo())) {
if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
- OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
+ OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
OrderDto dto = OrderDto.find(orderDtos, orderDto);
assert dto != null;
@@ -127,7 +127,7 @@
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
for (OrderDto one : orderDtoList) {
- OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme());
+ OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), one.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
OrderDto dto = OrderDto.find(orderDtos, orderDto);
assert dto != null;
@@ -143,7 +143,7 @@
if (order.getSettle() > 2) {
return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
}
- OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
+ OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), orderDto.getBatch());
if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
}
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 3ad331c..62cca94 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -121,7 +121,7 @@
// 淇敼 erp Goods 琛�
List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls0) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
if (!Cools.isEmpty(goods)) {
if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
@@ -142,7 +142,7 @@
// 淇敼 erp Goods 琛�
List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls0) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
if (!Cools.isEmpty(goods)) {
if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
diff --git a/src/main/java/com/zy/common/model/OrderDto.java b/src/main/java/com/zy/common/model/OrderDto.java
index 362b2b7..e7e38c6 100644
--- a/src/main/java/com/zy/common/model/OrderDto.java
+++ b/src/main/java/com/zy/common/model/OrderDto.java
@@ -15,11 +15,14 @@
private String matnr;
+ private String batch;
+
private Double anfme;
- public OrderDto(String orderNo, String matnr, Double anfme) {
+ public OrderDto(String orderNo, String matnr, String batch, Double anfme) {
this.orderNo = orderNo;
this.matnr = matnr;
+ this.batch = batch;
this.anfme = anfme;
}
@@ -28,7 +31,7 @@
return false;
}
for (OrderDto orderDto : list) {
- if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+ if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(orderDto.getBatch(), dto.getBatch())) {
return true;
}
}
@@ -40,7 +43,7 @@
return null;
}
for (OrderDto orderDto : list) {
- if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+ if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(dto.getBatch(), orderDto.getBatch())) {
return orderDto;
}
}
--
Gitblit v1.9.1