From 983c8fc9697223956db395af1b781ddb75c6e0b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 16:01:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 625f2f2..9dec861 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,7 +71,7 @@
break;
}
}
- if (complete) {
+ if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) == 0) {
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
@@ -84,6 +85,7 @@
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());
@@ -140,6 +142,10 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
}
+ // 宸ヤ綔妗ｆ槑缁嗘洿鏂板崟鎹紪鍙�
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ }
} catch (Exception e) {
log.error("", e);
return false;
@@ -155,4 +161,23 @@
orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
}
+ @Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
+ public List<OrderMergeVo> mergePreview(List<Long> ids) {
+ List<OrderMergeVo> result = new ArrayList<>();
+ for (Long orderId : ids) {
+ Order order = this.selectById(orderId);
+ // 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
+ List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+
+ }
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.1