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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 eb8ce0a..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(
@@ -119,7 +124,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
+ //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -129,6 +134,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
, detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+ dto.setQuality(detail.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -164,6 +170,7 @@
orderDetl.setTemp2(detlDto.getTemp2());
orderDetl.setTemp3(detlDto.getTemp3());
orderDetl.setTemp4(detlDto.getTemp4());
+ orderDetl.setInspect(detlDto.getQuality());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -229,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(
@@ -276,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