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/OrderPakoutServiceImpl.java |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
similarity index 77%
rename from src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
rename to src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 6214367..914edc5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.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.OrderDetlPakoutMapper;
+import com.zy.asrs.mapper.OrderPakoutMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.model.DetlDto;
 import lombok.extern.slf4j.Slf4j;
@@ -21,25 +21,25 @@
 import java.util.List;
 
 @Slf4j
-@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {
+@Service("orderPakoutService")
+public class OrderPakoutServiceImpl extends ServiceImpl<OrderPakoutMapper, OrderPakout> implements OrderPakoutService {
 
     @Autowired
-    private OrderDetlMapper orderDetlMapper;
+    private OrderDetlPakoutMapper orderDetlPakoutMapper;
     @Autowired
     private OpenService openService;
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
-    private OrderDetlService orderDetlService;
+    private OrderDetlPakoutService orderDetlPakoutService;
     @Autowired
     private DocTypeService docTypeService;
     @Autowired
     private WrkDetlService wrkDetlService;
 
     @Override
-    public OrderPakin selectByNo(String orderNo) {
-        List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+    public OrderPakout selectByNo(String orderNo) {
+        List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
         if (Cools.isEmpty(orderList)) {
             return null;
         }
@@ -48,7 +48,7 @@
 
     @Override
     public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
-        return orderDetlMapper.selectWorkingDetls(orderId);
+        return orderDetlPakoutMapper.selectWorkingDetls(orderId);
     }
 
     @Override
@@ -58,11 +58,11 @@
 
     @Override
     public void checkComplete(String orderNo) {
-        OrderPakin order = this.selectByNo(orderNo);
+        OrderPakout order = this.selectByNo(orderNo);
         if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
             return;
         }
-        List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
+        List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
         boolean complete = true;
         for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
             if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
@@ -74,7 +74,7 @@
             // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
             DocType docType = docTypeService.selectById(order.getDocType());
             if (null != docType && docType.getPakout() == 1) {
-                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+                if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
                     throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
                 }
                 List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
@@ -89,7 +89,7 @@
                     orderDetlPakout.setCreateBy(order.getCreateBy());
                     orderDetlPakout.setUpdateTime(order.getUpdateTime());
                     orderDetlPakout.setUpdateBy(order.getUpdateBy());
-                    if (!orderDetlService.insert(orderDetlPakout)) {
+                    if (!orderDetlPakoutService.insert(orderDetlPakout)) {
                         throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
                     }
                 }
@@ -128,7 +128,7 @@
                 openService.pakoutOrderCreate(openParam);
             }
 
-            OrderPakin order = this.selectByNo(orderNo);
+            OrderPakout order = this.selectByNo(orderNo);
             if (null == order) {
                 throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
             }
@@ -137,11 +137,11 @@
             }
             for (DetlDto detlDto : detlDtos) {
                 // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlPakoutService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
                 // 淇敼璁㈠崟浣滀笟鏁伴噺
-                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlPakoutService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
             }
@@ -157,36 +157,36 @@
         if (!this.deleteById(orderId)) {
             throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
         }
-        orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+        orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
     }
 
     @Override
-    public List<OrderPakin> selectComplete() {
+    public List<OrderPakout> selectComplete() {
         return this.baseMapper.selectComplete();
     }
 
     @Override
-    public List<OrderPakin> selectComplete8() {
+    public List<OrderPakout> selectComplete8() {
         return this.baseMapper.selectComplete8();
     }
 
     @Override
-    public boolean addToLogTable(OrderPakin order) {
+    public boolean addToLogTable(OrderPakout order) {
         return this.baseMapper.addToLogTable(order) > 0;
     }
 
     @Override
-    public List<OrderPakin> selectorderNoL(String orderNo) {
+    public List<OrderPakout> selectorderNoL(String orderNo) {
         return this.baseMapper.selectorderNoL(orderNo);
     }
 
     @Override
-    public OrderPakin selectOrderMoveStatus() {
+    public OrderPakout selectOrderMoveStatus() {
         return this.baseMapper.selectOrderMoveStatus();
     }
 
     @Override
-    public OrderPakin selectOrderMoveStatusInitial() {
+    public OrderPakout selectOrderMoveStatusInitial() {
         return this.baseMapper.selectOrderMoveStatusInitial();
     }
 

--
Gitblit v1.9.1