From 9d9206ceb0c9fa20b272adcc11c2ce5fc9293eb7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:33:52 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index 923c0f0..ccbd2b3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -38,6 +38,11 @@
private DocTypeService docTypeService;
@Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
public List<OrderDetl> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -69,7 +74,7 @@
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍏ュ簱鍗昐H");
+ openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openParam.setHostId(hostId);
openService.pakinOrderCreate(openParam);
@@ -78,7 +83,7 @@
OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
openParam.setOrderNo(orderNo);
openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍑哄簱鍗昐H");
+ openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
openParam.setOrderDetails(detlDtos);
openParam.setHostId(hostId);
openService.pakoutOrderCreate(openParam);
@@ -131,22 +136,23 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.getById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
+ List<OrderDetl> orderDetlList = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
+// if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+// }
+// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
+ for (OrderDetl orderDetl : orderDetlList) {
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(orderDetl1);
orderDetl.setQty(orderDetl.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(orderNo);
orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
+// orderDetl.setCreateTime(order.getCreateTime());
+// orderDetl.setCreateBy(order.getCreateBy());
orderDetl.setUpdateTime(order.getUpdateTime());
orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.save(orderDetl)) {
+ if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
}
--
Gitblit v1.9.1