From 0a1dceaa6478ec0081c38721be88fa6d807c6094 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 17 九月 2025 14:26:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 3f81f37..a496365 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2365,6 +2365,7 @@
order.setCreateTime(new Date());
order.setSettle(1L);
order.setDocType(26L);
+ order.setMemo(param.getMemo());
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
@@ -2394,6 +2395,7 @@
detl.setAnfme(1.0);
detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ detl.setMemo(param.getMemo());
orderDetlMapper.insert(detl);
} else {
throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
@@ -2405,7 +2407,7 @@
@Override
@Transactional
- public R unQualifiedOrder(ReturnOrderConfirmParam param) {
+ public R unQualifiedOrder(UnQualifiedOrderConfirmParam param) {
if (Cools.isEmpty(param.getOrderNumber())) {
param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
}
@@ -2422,6 +2424,7 @@
order.setCreateTime(new Date());
order.setSettle(1L);
order.setDocType(27L);
+ order.setMemo(param.getMemo());
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
@@ -2433,14 +2436,14 @@
// 2. 涓�涓�瀵瑰簲閬嶅巻
- List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
+ List<UnQualifiedOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
for (int i = 0; i < volList.size(); i++) {
- ReturnOrderConfirmParam.VolumeNumber vn = volList.get(i);
+ UnQualifiedOrderConfirmParam.VolumeNumber vn = volList.get(i);
// 鏌ヨ鏄惁宸插瓨鍦ㄨ detl
- OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
- param.getOrderNumber(), param.getPackageGroupNo(), vn.getVolumeNumber()
+ OrderDetl detl = orderDetlMapper.selectByOrderNoAndVolumeNo(
+ param.getOrderNumber(), vn.getVolumeNumber()
);
if (detl == null) {
@@ -2449,8 +2452,8 @@
detl.setOrderNo(param.getOrderNumber());
detl.setCreateTime(new Date());
detl.setAnfme(1.0);
- detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ detl.setMemo(param.getMemo());
orderDetlMapper.insert(detl);
} else {
throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
--
Gitblit v1.9.1