From 2e82ef6fd6dfbcb1eb88a8d4b705eae7fb99065b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 06 六月 2025 17:04:11 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 77062bf..58fba3f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -49,13 +49,24 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private OrderDetlPakoutServiceImpl orderDetlPakoutService;
+ @Autowired
+ private OrderPakoutServiceImpl orderPakoutService;
+ @Autowired
+ private OrderPakinServiceImpl orderPakinService;
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
+ OrderPakin orderPakin = orderPakinService.selectByNo(param.getOrderNo());
Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ if (!Cools.isEmpty(orderPakin)) {
+ if (orderPakin.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+ orderPakinService.remove(orderPakin.getId());
+ orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -218,9 +229,12 @@
Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- //TODO
- //throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(orderPakout)) {
+ if (orderPakout.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderPakoutService.remove(orderPakout.getId());
}
orderService.remove(order.getId());
}
@@ -238,7 +252,7 @@
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getCstmrName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -274,6 +288,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());
@@ -293,6 +308,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