From b25fc15afed603c0c874e77d37bf93f08d5398c9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 13 二月 2025 12:18:34 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index a03bba3..3fa397e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -421,7 +421,7 @@
if (param.getDocType() != 32) {
orderDetl.setProcessSts(3);
}
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -601,7 +601,7 @@
List<DetlDto> dbList = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
if (orderDetl.getProcessSts() != 1) continue;
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(dbList, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
@@ -691,7 +691,7 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getAnfme(), orderDetl.getProcessSts());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -1374,11 +1374,16 @@
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
String odNo = uuid;
+ if (docType.getPakin() == 1) {
+ odNo += "_I";
+ } else {
+ odNo += "_O";
+ }
if (docName.contains("璋冩嫧鍗�")) {
odNo = "DB" + odNo;
} else if (docName.contains("鍔犲伐鍗�")) {
odNo = "JG" + odNo;
- }else {
+ } else {
if (docType.getPakin() == 1) {
odNo += "_I";
} else {
--
Gitblit v1.9.1