From 1236197ab939a618b82b9e9ea6fddf94b8740b58 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 十月 2025 10:36:09 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d8c57c9..833b36a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -80,7 +80,12 @@
boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")){
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍏�)", Boolean.TRUE);
+ }else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -231,7 +236,12 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")){
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍑�)", Boolean.FALSE);
+ }else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -278,7 +288,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),param.getFromOrderNo()
, detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
dto.setTemp1(param.getQuality());
if (DetlDto.has(list, dto)) {
--
Gitblit v1.9.1