From 304d785396e666534ec15a3ad1ad8e41da6ffad2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 15:44:24 +0800
Subject: [PATCH] 关闭与erp的对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 7976cd9..8f53e9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,18 +60,18 @@
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
OrderPakin orderPakin = orderPakinService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(orderPakin)) {
if (orderPakin.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
orderPakinService.remove(orderPakin.getId());
- Order order = orderService.selectByNo(param.getOrderNo());
orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- Order order = new Order(
+ order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -226,20 +226,20 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(orderPakout)) {
- if (orderPakout.getSettle() > 1L) {
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderService.remove(orderPakout.getId());
- Order order = orderService.selectByNo(param.getOrderNo());
- orderPakoutService.remove(order.getId());
+ orderService.remove(order.getId());
+ OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
+ orderPakoutService.remove(orderPakout.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
- Order order = new Order(
+ order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -250,7 +250,7 @@
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getCstmrName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -286,6 +286,7 @@
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
dto.setRemark(detail.getRemark());
+ dto.setWeight(detail.getWeight());
if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
@@ -305,6 +306,7 @@
orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setWeight(detlDto.getWeight());
orderDetl.setBrand(detlDto.getBrand());
orderDetl.setStandby1(detlDto.getStandby1());
orderDetl.setStandby2(detlDto.getStandby2());
--
Gitblit v1.9.1