From 65d4a072e6a382b9583cae85d5c6e59685c2c1c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 16:39:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 d15d0eb..c50a9df 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -11,8 +12,8 @@
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
@Override
public Order selectByNo(String orderNo) {
@@ -71,10 +74,11 @@
break;
}
}
- if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) == 0) {
+ if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) == 0) {
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
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() + "銆戞槑缁嗗け璐�");
}
@@ -167,14 +171,35 @@
}
@Override
- public OrderMergeVo mergePreview(List<Long> ids) {
- OrderMergeVo vo = new OrderMergeVo();
+ 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) {
+ Double leave = orderDetl.getAnfme() - orderDetl.getQty();
+ OrderMergeVo vo = new OrderMergeVo(orderDetl.getMatnr(), orderDetl.getBatch(), leave);
+ OrderDto orderDto = new OrderDto(orderDetl.getOrderNo(), null, leave);
+ if (OrderMergeVo.has(result, vo)) {
+ OrderMergeVo exist = OrderMergeVo.find(result, vo.getMatnr(), vo.getBatch());
+ assert exist != null;
+ exist.setAnfme(exist.getAnfme() + vo.getAnfme());
+ exist.getOrderDtos().add(orderDto);
+ } else {
+ vo.getOrderDtos().add(orderDto);
+ result.add(vo);
+ }
+ }
}
- return vo;
+ for (OrderMergeVo vo : result) {
+ Mat mat = matService.selectByMatnr(vo.getMatnr());
+ assert mat != null;
+ vo.setMaktx(mat.getMaktx());
+ vo.setSpecs(mat.getSpecs());
+ }
+ return result;
}
}
--
Gitblit v1.9.1