From 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 08:28:08 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
similarity index 75%
copy from src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
copy to src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index 6214367..03e3472 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -9,8 +9,8 @@
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.mapper.OrderDetlPakinMapper;
+import com.zy.asrs.mapper.OrderPakinMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -21,17 +21,17 @@
import java.util.List;
@Slf4j
-@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {
+@Service("orderPakinService")
+public class OrderPakinServiceImpl extends ServiceImpl<OrderPakinMapper, OrderPakin> implements OrderPakinService {
@Autowired
- private OrderDetlMapper orderDetlMapper;
+ private OrderDetlPakinMapper orderDetlMapper;
@Autowired
private OpenService openService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -47,7 +47,7 @@
}
@Override
- public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
+ public List<OrderDetlPakin> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -62,10 +62,10 @@
if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
+ List<OrderDetlPakin> OrderDetlPakins = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()));
boolean complete = true;
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
- if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
+ for (OrderDetlPakin OrderDetlPakin : OrderDetlPakins) {
+ if (OrderDetlPakin.getAnfme() > OrderDetlPakin.getQty()) {
complete = false;
break;
}
@@ -74,22 +74,22 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().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)) {
+ OrderDetlPakin OrderDetlPakin = new OrderDetlPakin();
+ OrderDetlPakin.sync(wrkDetl);
+ OrderDetlPakin.setQty(OrderDetlPakin.getAnfme());
+ OrderDetlPakin.setOrderId(order.getId());
+ OrderDetlPakin.setOrderNo(orderNo);
+ OrderDetlPakin.setStatus(1);
+ OrderDetlPakin.setCreateTime(order.getCreateTime());
+ OrderDetlPakin.setCreateBy(order.getCreateBy());
+ OrderDetlPakin.setUpdateTime(order.getUpdateTime());
+ OrderDetlPakin.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlPakinService.insert(OrderDetlPakin)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
}
@@ -137,11 +137,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakinService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakinService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -157,7 +157,7 @@
if (!this.deleteById(orderId)) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId));
}
@Override
--
Gitblit v1.9.1