From 389b839f1eb7708d3becb2f1c94e126814ada785 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 26 Jul 2023 18:08:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListEntity.java       | 14 ++++++--
 .../vo/DistributionDeliveryListVO.java        |  5 ---
 .../impl/BasicPropertyfieldServiceImpl.java   |  4 +--
 .../mapper/DistributionDeliveryListMapper.xml | 34 +++++++++----------
 .../DistributionDeliverySelfMapper.java       |  1 +
 .../DistributionDeliveryListServiceImpl.java  | 27 ++++++++++++++-
 6 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
index 4002783b4..b483fde24 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
@@ -118,6 +118,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "配送司机（名称）")
 	private String driverName;
+	/**
+	 * 制单时间
+	 */
+	@ApiModelProperty(value = "制单时间")
+	private String preparationTime;
 	/**
 	 * 配送名称
 	 */
@@ -159,6 +164,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "配送件数")
 	private Integer deliveryNumber;
+	/**
+	 * 配送总库存品数
+	 */
+	@ApiModelProperty(value = "配送总库存品数")
+	private Integer inventoryNub;
 	/**
 	 * 扫描件数
 	 */
@@ -211,9 +221,9 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "增值服务总费用")
 	private BigDecimal fee;
 	/**
-	 * 任务时间
+	 * 配车时间
 	 */
-	@ApiModelProperty(value = "任务时间")
+	@ApiModelProperty(value = "配车时间")
 	private String taskTime;
 
 	/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
index d3f80e210..3e6f8f8e3 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
@@ -42,11 +42,6 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
 	private Integer loadNub;
 
 
-	/**
-	 * 配送总库存品数
-	 */
-	@ApiModelProperty(value = "配送总库存品数")
-	private Integer inventoryNub;
 
 
 	/**
diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java
index f4c5b70a6..6ea9e6fd1 100644
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java
@@ -78,8 +78,8 @@ public class BasicPropertyfieldServiceImpl extends BaseServiceImpl<BasicProperty
 	@Override
 	public Integer deleteByMasterId(List<Long> masterId) {
 		//将值表也删除
-		QueryWrapper<BasicPropertyvalueEntity> wrappervalus = new QueryWrapper();
-		basicPropertyvalueMapper.delete(wrappervalus.lambda().in(BasicPropertyvalueEntity::getMasterId,masterId));
+//		QueryWrapper<BasicPropertyvalueEntity> wrappervalus = new QueryWrapper();
+//		basicPropertyvalueMapper.delete(wrappervalus.lambda().in(BasicPropertyvalueEntity::getMasterId,masterId));
 		QueryWrapper<BasicPropertyfieldEntity> wrapper = new QueryWrapper();
 		return baseMapper.delete(wrapper.lambda().in(BasicPropertyfieldEntity::getMasterId,masterId));
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 215a0c947..be5cdefcd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -543,25 +543,26 @@
     </select>
     <select id="selectDistributionAppDeliveryListPage" resultType="com.logpm.distribution.vo.app.DistributionAppDeliveryListVO">
         SELECT
-        lddl.id id,
-        lddl.train_number trainNumber,
-        lddl.warehouse_name warehouseName,
-        lddl.warehouse_id warehouseId,
+        DISTINCT lddl.id id,
+--         lddl.train_number trainNumber,
+--         lddl.warehouse_name warehouseName,
+--         lddl.warehouse_id warehouseId,
         lddl.type type,
         lddl.kind kind,
         lddl.vehicle_name vehicleName,
         lddl.driver_name driverName,
         lddl.vehicle_id vehicleId,
         lddl.driver_id driverId,
-        lddl.distribution_company distributionCompany,
-        lddl.state state,
-        (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',')  FROM
-        logpm_distribution_signfor lds
-        join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
-        join logpm_distribution_stockup_info ldsi on ldr.id =  ldsi.reservation_id
-        join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
-        WHERE  lds.delivery_id =  lddl.id
-        ) forkliftName,
+        lddl.preparation_time preparationTime,
+--         lddl.distribution_company distributionCompany,
+--         lddl.state state,
+--         (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',')  FROM
+--         logpm_distribution_signfor lds
+--         join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
+--         join logpm_distribution_stockup_info ldsi on ldr.id =  ldsi.reservation_id
+--         join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
+--         WHERE  lds.delivery_id =  lddl.id
+--         ) forkliftName,
         lddl.create_time createTime,
         (SELECT COALESCE(COUNT(*), 0)  FROM logpm_distribution_signfor lds WHERE lds.delivery_id =lddl.id) customersNumber,
         lddl.price price,
@@ -580,16 +581,15 @@
         WHERE lds.delivery_id =  lddl.id
         ) deliveryNumber,
         lddl.loading_team_id loadingTeamId,
-        lddl.loading_team_name loadingTeamName,
+        (SELECT GROUP_CONCAT(DISTINCT ldsu.loader_name SEPARATOR ',') from  logpm_distribution_signfor lds INNER JOIN logpm_distribution_stockup_info AS ldsi ON lds.reservation_id = ldsi.reservation_id
+        INNER JOIN logpm_distribution_stockup AS ldsu ON ldsu.id = ldsi.stockup_id WHERE  lds.delivery_id =  lddl.id) loadingTeamName,
         (SELECT GROUP_CONCAT( lds.reservation_id SEPARATOR ',') from  logpm_distribution_signfor lds WHERE  lds.delivery_id =  lddl.id) reservationId,
         lddl.lead_time leadTime,
         lddl.order_id orderId,
         lddl.fee fee,
-        lddl.task_time taskTime,
         lddl.loading_time loadingTime,
         lddl.note_number noteNumber,
         lddl.source source,
-        lddl.vehicle_name vehicleName,
         lddl.task_time taskTime,
         (SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
         FROM
@@ -599,7 +599,7 @@
         (SELECT COALESCE(sum(lds.loaded_number), 0) FROM logpm_distribution_signfor lds WHERE
         lddl.id = lds.delivery_id) scannedNumber
         FROM
-        logpm_distribution_delivery_list lddl
+        logpm_distribution_delivery_list lddl left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
         <where>
             lddl.is_deleted =0
             <if test="param.createTime_query!=null and param.createTime_query!=''">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java
index ca6db4a0d..4abb9bbf5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.java
@@ -63,4 +63,5 @@ public interface DistributionDeliverySelfMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
     List<DistributionDeliverySelfVO> getDeliverySelfInfo(@Param("id")String id);
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index c33deb3f7..230448cec 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -51,6 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 配送管理 服务实现类
@@ -78,6 +79,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionDeliveryTripartiteMapper distributionDeliveryTripartiteMapper;
 	private final DistributionReservationStockarticleMapper distributionReservationStockarticleMapper;
 	private final DistributionStockupMapper distributionStockupMapper;
+	private final DistributionStockMapper distributionStockMapper;
 	private final BladeRedis bladeRedis;
 	private final IDistributionAsyncService distributionAsyncService;
 	private final IDictBizClient dictBizClient;
@@ -986,7 +988,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO);
 		//转换字典字段
 		for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
-			R<String> distribution_type = dictBizClient.getValue("distribution_type", distributionAppDeliveryListVO.getType() );
+			//查询下面的预约单
+			List<DistributionSignforEntity> distributionSignforEntityList = distributionSignforMapper.selectList(new QueryWrapper<DistributionSignforEntity>().lambda()
+				.eq(DistributionSignforEntity::getDeliveryId,distributionAppDeliveryListVO.getId())
+			);
+			//提取id
+			List<Long> reList = distributionSignforEntityList.stream().map(DistributionSignforEntity::getId).collect(Collectors.toList());
 			distributionAppDeliveryListVO.setType_name(dictBizClient.getValue("distribution_type", distributionAppDeliveryListVO.getType() ).getData());
 			//查询是否配车
 			Integer aLong = 0;
@@ -1002,6 +1009,24 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			if (aLong ==0 && aLong2 ==0){distributionAppDeliveryListVO.setVehicleStatus_name("未配车");}
 			//查询是否备货
+			distributionAppDeliveryListVO.setIsstock("备货完成");
+			Integer reNub = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
+				.in(DistributionStockEntity::getReservationId,reList)
+			).intValue();
+			Integer deliveryNumber = distributionAppDeliveryListVO.getDeliveryNumber();
+			 if(reNub<deliveryNumber){distributionAppDeliveryListVO.setIsstock("备货未完成");}
+			 //查询司机
+			List<DistributionAppDeliverySelfVO> distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId());
+			 if (distributionAppDeliverySelfVOS.size()>0){
+				 StringBuilder stringBuilder = new StringBuilder();
+				 distributionAppDeliverySelfVOS.forEach(e->{
+					 if (e.getIsMaster() ==2){
+						 stringBuilder.append(e.getDriverName()).append("(主)");
+					 }else { stringBuilder.append(e.getDriverName()).append("(副)");}
+				 });
+				 distributionAppDeliveryListVO.setDriverName(stringBuilder.toString());
+			 }
+
 		}
 
 		return page.setRecords(distributionAppDeliveryListVOS);