From 0098cc3a428dd81670edc15d58199b965f7faf77 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 5 Dec 2024 15:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=E5=94=AE=E5=90=8E=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AftersalesWorkOrderServiceImpl.java      | 15 ++++++++++++++-
 .../mapper/DistributionSignforMapper.xml          | 10 +++++-----
 .../impl/DistributionStockupServiceImpl.java      |  1 +
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 021c0ba93..a6a646f7c 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -16,6 +16,8 @@
  */
 package com.logpm.aftersales.service.impl;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -2736,6 +2738,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if (!Objects.isNull(o)) {
 			ids = Func.toLongList((String) aftersalesWorkOrder.get("ids"));
 		}
+
 		//查询用户角色信息
 		BladeUser user = AuthUtil.getUser();
 		String roleName = user.getRoleName();
@@ -2796,10 +2799,20 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}
 		if (warehouseIds.isEmpty()) {
 			throw new CustomerException("当前登录人无仓库信息,请联系管理人员!!!");
-
 		}
 
+
+
 		AftersalesWorkOrderDTO workOrderDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderDTO.class);
+		if (ObjectUtil.isNotEmpty(workOrderDTO.getStartCreateTime()) || ObjectUtil.isNotEmpty(workOrderDTO.getEndCreateTime())) {
+			boolean withinOneMonth = DateUtil.between(workOrderDTO.getStartCreateTime(), workOrderDTO.getEndCreateTime(), DateUnit.DAY) <= 60;
+			if (!withinOneMonth) {
+				throw new ServiceException("创建日期不能超过两个月");
+			}
+		} else {
+				throw new ServiceException("导出时配送日期必填");
+
+		}
 		List<AftersalesWorkOrderVO> exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds);
 		return exportData;
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 307ebf9ac..104ee2c15 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -404,19 +404,19 @@
         withoutScanning,
         lds.reservation_id reservationId,
         CASE lddl.kind
-        WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id
+        WHEN '1' THEN (SELECT GROUP_CONCAT(driver_phone) FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id
         AND ldds.is_deleted = 0 AND ldds.is_master = 2)
-        WHEN '2' THEN (SELECT driver_phone FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id=
+        WHEN '2' THEN (SELECT GROUP_CONCAT(driver_phone) FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id=
         lddl.id AND lddt.is_deleted = 0)
         ELSE
         ''
         END driverPhone
         FROM
         logpm_distribution_signfor lds
-        JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
-        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id  AND lddl.is_deleted = 0 	AND lddl.customers_number > 0
+        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.is_deleted = 0  AND ldr.reservation_status != 40
         <where>
-            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND (ldr.reservation_num +
+            lds.is_deleted = 0  AND (ldr.reservation_num +
             ldr.reservation_stock_list_num) > 0 AND lddl.customers_number > 0
             <if test="param.mallName != null and param.mallName!=''">
                 and ldr.mall_name like concat('%',#{param.mallName},'%')
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index db2136383..f12fc09ae 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -3941,6 +3941,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 
 	@Override
+	@Transactional
 	public R stockupScanByStock(StockupDTO stockupDTO) {
 		//库存品扫描
 		Long reservationId = stockupDTO.getReservationId();