From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++------
1 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 952e6da..f45fa59 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -74,23 +74,68 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
+
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
- orderDetl.setQty(orderDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(orderNo);
- orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ if (orderDetls.size() == wrkDetls.size()) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(orderDetl.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(orderNo);
+ orderDetl.setStatus(1);
+ orderDetl.setCreateTime(order.getCreateTime());
+ orderDetl.setCreateBy(order.getCreateBy());
+ orderDetl.setUpdateTime(order.getUpdateTime());
+ orderDetl.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+ } else {
+ for (OrderDetl orderDetl : orderDetls) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(orderDetl.getBatch()) || Cools.isEmpty(wrkDetl.getBatch())) {
+ if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
+ OrderDetl newOrderDetl = new OrderDetl();
+ newOrderDetl.sync(wrkDetl);
+ newOrderDetl.setAnfme(orderDetl.getAnfme());
+ newOrderDetl.setQty(orderDetl.getAnfme());
+ newOrderDetl.setOrderId(order.getId());
+ newOrderDetl.setOrderNo(orderNo);
+ newOrderDetl.setStatus(1);
+ newOrderDetl.setCreateTime(order.getCreateTime());
+ newOrderDetl.setCreateBy(order.getCreateBy());
+ newOrderDetl.setUpdateTime(order.getUpdateTime());
+ newOrderDetl.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlService.insert(newOrderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ break;
+ }
+ } else {
+ if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
+ OrderDetl newOrderDetl = new OrderDetl();
+ newOrderDetl.sync(wrkDetl);
+ newOrderDetl.setAnfme(orderDetl.getAnfme());
+ newOrderDetl.setQty(orderDetl.getAnfme());
+ newOrderDetl.setOrderId(order.getId());
+ newOrderDetl.setOrderNo(orderNo);
+ newOrderDetl.setStatus(1);
+ newOrderDetl.setCreateTime(order.getCreateTime());
+ newOrderDetl.setCreateBy(order.getCreateBy());
+ newOrderDetl.setUpdateTime(order.getUpdateTime());
+ newOrderDetl.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlService.insert(newOrderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ break;
+ }
+ }
+ }
}
}
}
@@ -166,6 +211,11 @@
}
@Override
+ public List<Order> selectComplete8() {
+ return this.baseMapper.selectComplete8();
+ }
+
+ @Override
public boolean addToLogTable(Order order) {
return this.baseMapper.addToLogTable(order) > 0;
}
@@ -175,4 +225,14 @@
return this.baseMapper.selectorderNoL(orderNo);
}
+ @Override
+ public Order selectOrderMoveStatus() {
+ return this.baseMapper.selectOrderMoveStatus();
+ }
+
+ @Override
+ public Order selectOrderMoveStatusInitial() {
+ return this.baseMapper.selectOrderMoveStatusInitial();
+ }
+
}
--
Gitblit v1.9.1