From 995aeeda06e8e06a8880eb2e04e239cf03fada7c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 15:40:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 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 2f34254..e8693dc 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,7 @@
 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;
@@ -11,7 +12,6 @@
 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;
@@ -47,6 +47,15 @@
     }
 
     @Override
+    public List<Order> selectBySettle(Long settle) {
+        List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("settle", settle));
+        if (Cools.isEmpty(orderList)) {
+            return new ArrayList<>();
+        }
+        return orderList;
+    }
+
+    @Override
     public List<OrderDetl> selectWorkingDetls(Long orderId) {
         return orderDetlMapper.selectWorkingDetls(orderId);
     }
@@ -57,9 +66,14 @@
     }
 
     @Override
+    public boolean updateSettleStep(Long orderId, Long settle, Long userId, Integer step, String memo, String remark) {
+        return this.baseMapper.updateSettleStep(orderId, settle, userId, step, memo, remark) > 0;
+    }
+
+    @Override
     public void checkComplete(String orderNo) {
         Order order = this.selectByNo(orderNo);
-        if (order.getSettle() >= 4L) {
+        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
             return;
         }
         List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -107,7 +121,8 @@
         try {
             List<DetlDto> detlDtos = new ArrayList<>();
             wrkDetls.forEach(wrkDetl -> {
-                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
             });
             String orderNo = "HAND" + snowflakeIdWorker.nextId();
             if (pakin) {
@@ -137,12 +152,16 @@
             }
             for (DetlDto detlDto : detlDtos) {
                 // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+                }
+                // 淇敼璁㈠崟浣滀笟鏁伴噺
+                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
+                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
             }
         } catch (Exception e) {
-            log.error("", e);
+            log.error("saveHandlerOrder===>>", e);
             return false;
         }
         return true;
@@ -161,4 +180,39 @@
         return this.baseMapper.selectComplete();
     }
 
+    @Override
+    public List<Order> selectComplete1() {
+        return this.baseMapper.selectComplete1();
+    }
+
+    @Override
+    public List<Order> selectComplete99() {
+        return this.baseMapper.selectComplete99();
+    }
+
+    @Override
+    public List<Order> selectComplete8() {
+        return this.baseMapper.selectComplete8();
+    }
+
+    @Override
+    public boolean addToLogTable(Order order) {
+        return this.baseMapper.addToLogTable(order) > 0;
+    }
+
+    @Override
+    public List<Order> selectorderNoL(String orderNo) {
+        return this.baseMapper.selectorderNoL(orderNo);
+    }
+
+    @Override
+    public Order selectOrderMoveStatus() {
+        return this.baseMapper.selectOrderMoveStatus();
+    }
+
+    @Override
+    public Order selectOrderMoveStatusInitial() {
+        return this.baseMapper.selectOrderMoveStatusInitial();
+    }
+
 }

--
Gitblit v1.9.1