From 86c69620f1bb3976f01b726d3d1804527474898f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 09:34:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 2 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 1e9f89b..d986120 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.plugins.Page;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SnowflakeIdWorker;
@@ -18,6 +19,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -73,12 +75,14 @@
         }
         if (complete) {
             for (OrderDetl orderDetl : orderDetls) {
-                //鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
-                if (orderDetl.getBatch().equals("")){
+                if (Cools.isEmpty(orderDetl.getBatch())){
+                    orderDetlService.updateById(orderDetl);
+                }else if (orderDetl.getBatch().equals("")){//鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
                     orderDetl.setBatch(null);
                     orderDetlService.updateById(orderDetl);
                 }
             }
+            order.setMemo("0");
             if (!this.updateSettle(order.getId(), 4L, null)) {
                 throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
             }
@@ -150,6 +154,46 @@
     }
 
     @Override
+    public List<Order> selectCompleteSave() {
+        return this.baseMapper.selectCompleteSave();
+    }
+
+    @Override
+    public List<Order> selectComplete1() {
+        return this.baseMapper.selectComplete1();
+    }
+
+    @Override
+    public List<Order> selectCompletemEmo0() {
+        return this.baseMapper.selectCompleteMome0();
+    }
+
+    @Override
+    public List<Order> selectCompletemEmo1() {
+        return this.baseMapper.selectCompleteMome1();
+    }
+
+    @Override
+    public List<Order> selectCompletemEmo2() {
+        return this.baseMapper.selectCompleteMome2();
+    }
+
+    @Override
+    public List<Order> selectCompletemEmo3() {
+        return this.baseMapper.selectCompleteMome3();
+    }
+
+    @Override
+    public List<Order> selectCompletemEmo4() {
+        return this.baseMapper.selectCompleteMome4();
+    }
+
+    @Override
+    public List<Order> selectComplete2() {
+        return this.baseMapper.selectComplete2();
+    }
+
+    @Override
     public boolean addToLogTable(Order order) {
         return this.baseMapper.addToLogTable(order) > 0;
     }
@@ -202,4 +246,21 @@
         updateSettle(orderId,settle,1L);
     }
 
+    @Override
+    public List<Order> selectToBeHistoryOrder(boolean isERP) {
+        int settle = isERP ? 8 : 4;
+        return this.baseMapper.selectToBeHistoryOrder(settle);
+    }
+
+    @Override
+    public List<OrderListDTO> selectAllorderNo() {
+        return this.baseMapper.selectAllorderNo();
+    }
+
+    @Override
+    public Page<Order> getOrderAll(Page<Order> page) {
+        page.setRecords(baseMapper.getOrderAll(page.getCondition()));
+        page.setTotal(baseMapper.getOrderAllCount(page.getCondition()));
+        return page;
+    }
 }

--
Gitblit v1.9.1