From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 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 1a1379e..6214367 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,22 +1,17 @@
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.OrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +22,7 @@
@Slf4j
@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {
@Autowired
private OrderDetlMapper orderDetlMapper;
@@ -37,10 +32,14 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
@Override
- public Order selectByNo(String orderNo) {
- List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("order_no", orderNo));
+ public OrderPakin selectByNo(String orderNo) {
+ List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
if (Cools.isEmpty(orderList)) {
return null;
}
@@ -48,7 +47,7 @@
}
@Override
- public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -59,19 +58,43 @@
@Override
public void checkComplete(String orderNo) {
- Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ OrderPakin order = this.selectByNo(orderNo);
+ if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
- List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
boolean complete = true;
- for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
complete = false;
break;
}
}
if (complete) {
+ // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null != docType && docType.getPakout() == 1) {
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
+ for (WrkDetl wrkDetl : wrkDetls) {
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(wrkDetl);
+ orderDetlPakout.setQty(orderDetlPakout.getAnfme());
+ orderDetlPakout.setOrderId(order.getId());
+ orderDetlPakout.setOrderNo(orderNo);
+ orderDetlPakout.setStatus(1);
+ orderDetlPakout.setCreateTime(order.getCreateTime());
+ orderDetlPakout.setCreateBy(order.getCreateBy());
+ orderDetlPakout.setUpdateTime(order.getUpdateTime());
+ orderDetlPakout.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlService.insert(orderDetlPakout)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+ }
+
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -91,21 +114,21 @@
// 鐢熸垚鍏ュ簱鍗曟嵁
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
+ openParam.setDetails(detlDtos);
openService.pakinOrderCreate(openParam);
} else {
// 鐢熸垚鍑哄簱鍗曟嵁
OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
- openParam.setOrderDetails(detlDtos);
+ openParam.setDetails(detlDtos);
openService.pakoutOrderCreate(openParam);
}
- Order order = this.selectByNo(orderNo);
+ OrderPakin order = this.selectByNo(orderNo);
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
@@ -117,9 +140,13 @@
if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
}
} catch (Exception e) {
- log.error("", e);
+ log.error("saveHandlerOrder===>>", e);
return false;
}
return true;
@@ -130,7 +157,37 @@
if (!this.deleteById(orderId)) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
- orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ }
+
+ @Override
+ public List<OrderPakin> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
+ public List<OrderPakin> selectComplete8() {
+ return this.baseMapper.selectComplete8();
+ }
+
+ @Override
+ public boolean addToLogTable(OrderPakin order) {
+ return this.baseMapper.addToLogTable(order) > 0;
+ }
+
+ @Override
+ public List<OrderPakin> selectorderNoL(String orderNo) {
+ return this.baseMapper.selectorderNoL(orderNo);
+ }
+
+ @Override
+ public OrderPakin selectOrderMoveStatus() {
+ return this.baseMapper.selectOrderMoveStatus();
+ }
+
+ @Override
+ public OrderPakin selectOrderMoveStatusInitial() {
+ return this.baseMapper.selectOrderMoveStatusInitial();
}
}
--
Gitblit v1.9.1