From b248de310fd65c11f959f4cd0f02d3a6d3edb2c2 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 12 十月 2024 16:41:21 +0800
Subject: [PATCH] 优化订单上报功能
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 84 +++--------------------------------------
1 files changed, 7 insertions(+), 77 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 4a5d121..ca68042 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,23 +1,19 @@
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;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
@Slf4j
@@ -71,75 +67,6 @@
}
}
if (complete) {
- // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
- 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() + "銆戞槑缁嗗け璐�");
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
- if (orderDetls.size() == wrkDetls.size()) {
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
- 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());
- orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- }
- } else {
- for (OrderDetl orderDetl : orderDetls) {
- for (WrkDetl wrkDetl : wrkDetls) {
- if (Cools.isEmpty(orderDetl.getBatch()) || Cools.isEmpty(wrkDetl.getBatch())) {
- if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
- OrderDetl newOrderDetl = new OrderDetl();
- newOrderDetl.sync(wrkDetl);
- newOrderDetl.setAnfme(orderDetl.getAnfme());
- newOrderDetl.setQty(orderDetl.getAnfme());
- newOrderDetl.setOrderId(order.getId());
- newOrderDetl.setOrderNo(orderNo);
- newOrderDetl.setStatus(1);
- newOrderDetl.setCreateTime(order.getCreateTime());
- newOrderDetl.setCreateBy(order.getCreateBy());
- newOrderDetl.setUpdateTime(order.getUpdateTime());
- newOrderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(newOrderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- break;
- }
- } else {
- if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
- OrderDetl newOrderDetl = new OrderDetl();
- newOrderDetl.sync(wrkDetl);
- newOrderDetl.setAnfme(orderDetl.getAnfme());
- newOrderDetl.setQty(orderDetl.getAnfme());
- newOrderDetl.setOrderId(order.getId());
- newOrderDetl.setOrderNo(orderNo);
- newOrderDetl.setStatus(1);
- newOrderDetl.setCreateTime(order.getCreateTime());
- newOrderDetl.setCreateBy(order.getCreateBy());
- newOrderDetl.setUpdateTime(order.getUpdateTime());
- newOrderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(newOrderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- break;
- }
- }
- }
- }
- }
- }
-
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -204,7 +131,10 @@
}
orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
}
-
+ @Override
+ public List<Order> selectWork() {
+ return this.baseMapper.selectWork();
+ }
@Override
public List<Order> selectComplete() {
return this.baseMapper.selectComplete();
--
Gitblit v1.9.1