From 1ef2058876a43bdb24e59044fd620d8e0293d2b7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 十一月 2022 16:39:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 9dec861..319c1a0 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,8 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
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,9 +13,10 @@
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 com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,6 +40,8 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
@Override
public Order selectByNo(String orderNo) {
@@ -71,20 +76,33 @@
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() + "銆戞槑缁嗗け璐�");
+ 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);
+ if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ orderDetl.setQty(orderDetl.getAnfme());
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ for (OrderDto one : orderDtoList) {
+ if (one.getOrderNo().equals(orderNo)) {
+ orderDetl.setAnfme(one.getAnfme());
+ orderDetl.setQty(one.getAnfme());
+ break;
+ }
+ }
+ }
orderDetl.setStatus(1);
orderDetl.setCreateTime(order.getCreateTime());
orderDetl.setCreateBy(order.getCreateBy());
@@ -174,9 +192,27 @@
// 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
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);
+ }
}
}
+ 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