From 62f5cfe3033b3891fad3ab887f1310731cd49866 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 2 Apr 2025 14:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/dal/mysql/order/OrderMapper.java | 14 +---------
 .../service/manage/pack/PackServiceImpl.java  |  2 +-
 .../resources/mapper/order/OrderMapper.xml    | 28 +++++++++++++++++++
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
index 3dfbd35ed..a01ebf5b7 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
@@ -241,18 +241,6 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
     List<OrderGoodsResp> selectGoodsListByGoodsId(@Param(Constants.WRAPPER) QueryWrapperX<OrderDO> queryWrapperX);
 
 
-
-    default List<OrderDO> selectOrderList(List<Long> orderIds, Long organId) {
-        return selectList(new LambdaQueryWrapperX<OrderDO>()
-                .eqIfPresent(OrderDO::getOrganId, organId)
-                .eq(OrderDO::getDeleted, false)
-                .inIfPresent(OrderDO::getId,orderIds)
-                .eq(OrderDO::getStatus, OrderStatusEnum.FINISH_PRODUCTION.getStatus()));
-
-    }
-
-
-
     default List<OrderDO> selectOrderPackList(List<Long> orderIds, Long organId) {
         return selectList(new LambdaQueryWrapperX<OrderDO>()
                 .eq(OrderDO::getOrganId, organId)
@@ -296,7 +284,7 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
 
 
 
-    List<PackRespVO> selectOrderIds(@Param("createTime")  String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId);
+    List<PackRespVO> selectOrderIdsTrue(@Param("createTime")  String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId);
 
 
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
index 004c39861..3bb03897b 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
@@ -904,7 +904,7 @@ public class PackServiceImpl implements PackService {
         AssertUtils.notEmpty(order, ORDER_DATE_ERROR);
 
         List<PackRespVO> packRespVOList = Boolean.TRUE.equals(isUp) ?
-                ordersMapper.selectOrderIds(order.getCreateTime().toString(), getUserOrganId(), order.getId()) :
+                ordersMapper.selectOrderIdsTrue(order.getCreateTime().toString(), getUserOrganId(), order.getId()) :
                 ordersMapper.selectOrderIdsFalse(order.getCreateTime().toString(), getUserOrganId(), order.getId());
 
         if (packRespVOList.isEmpty()) {
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
index c1d788a50..63bffb46c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
@@ -438,6 +438,34 @@
 
 
 
+    <select id="selectOrderIdsTrue" resultMap="PackMap">
+
+            SELECT
+                id as orderNo,
+                custom_order_no as customOrderNo,
+                dealer as dealer,
+                dealer_phone_number as dealerPhoneNumber,
+                order_date as orderDate,
+                create_time as createTime,
+                delivery_date as deliveryDate,
+                customer as customer,
+                phone_number as phoneNumber,
+                address as address,
+                salesman as salesman,
+                splitter as splitter,
+                packaged as packaged
+            FROM orders
+            WHERE  organ_id = #{organId} and deleted = false and status in (1,2,3,4) and create_time &gt;= #{createTime}  and id != #{orderId}
+            ORDER BY create_time
+                LIMIT 1 ;
+
+
+    </select>
+
+
+
+
+
     <select id="selectOrderIdsFalse" resultMap="PackMap">