From 5919f1e14ea00a57c6022a48ecb089e82c9f105c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 10:17:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 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 d007728..dbf3c3a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -54,7 +54,7 @@
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- OrderInAndOutUtil.query(Boolean.TRUE? "Y":"N",param.getOrderNo());
+ OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -149,8 +149,7 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, order.getId());
-
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
@@ -159,7 +158,7 @@
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
}
}
} else {
@@ -176,7 +175,7 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
@@ -185,7 +184,8 @@
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+
}
}
return results;
@@ -194,13 +194,15 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
+// Order order = orderService.selectByNo(param.getOrderNo());
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderService.remove(order.getId());
+// orderService.remove(order.getId());
+ OrderInAndOutUtil.remove(Boolean.FALSE,order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
@@ -241,9 +243,10 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+// if (!orderService.insert(order)) {
+// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+ OrderInAndOutUtil.insertOrder(Boolean.FALSE,order);
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
@@ -274,9 +277,10 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+ OrderInAndOutUtil.insertOrderDetl(Boolean.FALSE,order,orderDetl);
}
}
@@ -285,41 +289,47 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
+// Order order = orderService.selectByNo(param.getOrderNo());
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
}
}
} else {
// 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
}
}
return results;
--
Gitblit v1.9.1