From 516e2658b2ace70975714fd23d06cfe6f35f49c5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 20 Dec 2023 14:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=A3=85=E8=BD=A6=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=81=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListController.java   |  2 +-
 .../mapper/DistributionReservationMapper.java |  2 +-
 .../mapper/DistributionReservationMapper.xml  | 39 +++++++++++++++++++
 .../IDistributionDeliveryListService.java     |  2 +-
 .../impl/DistributionAsyncServiceImpl.java    |  5 ++-
 .../DistributionDeliveryListServiceImpl.java  | 18 +++++----
 6 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index 4bccd7ad2..4e20870c8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -97,7 +97,7 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/packdetail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
-	public R<List<DistributionParcelListVO>> packdetail(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
+	public R<List<DistributionParcelListVO>> packdetail(@RequestParam Map<String,Object> distributionDeliveryInfoDTO, Query query) {
 		List<DistributionParcelListVO> parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO);
 //		IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryInfopackdetail(Condition.getPage(query), distributionDeliveryInfoDTO);
 		return R.data(parcelListEntityList);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index cd4119b9d..3130a7a2c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -123,7 +123,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @param id1
 	 * @return
 	 */
-	List<DistributionParcelListEntity> getReservationPackage(@Param("reservationId") Long id,@Param("stockArticleId") Long id1);
+	List<DistributionParcelListEntity> getReservationPackage(@Param("reservationId") Long id,@Param("stockArticleId") Long id1,@Param("param")Map<String,Object> param);
 
 	/**
 	 * 删除预约单
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index fb20be102..9445f8bec 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -704,6 +704,45 @@
             <if test="stockArticleId !=null and stockArticleId!= ''">
                 and ldrp.stock_article_id = #{stockArticleId}
             </if>
+            <if test="param.waybillNumber !=null and param.waybillNumber != ''">
+                and ldrp.waybill_number = #{param.waybillNumber}
+            </if>
+            <if test="param.serviceNumber !=null and param.serviceNumber != ''">
+                and ldrp.service_number = #{param.serviceNumber}
+            </if>
+            <if test="param.orderCode !=null and param.orderCode != ''">
+                and ldrp.order_code = #{param.orderCode}
+            </if>
+            <if test="param.orderPackageCode !=null and param.orderPackageCode != ''">
+                and ldrp.order_package_code = #{param.orderPackageCode}
+            </if>
+            <if test="param.warehouse !=null and param.warehouse != ''">
+                and ldrp.warehouse = #{param.warehouse}
+            </if>
+            <if test="param.materialName !=null and param.materialName != ''">
+                and ldrp.material_name = #{param.materialName}
+            </if>
+            <if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
+                and ldrp.accept_warehouse_name = #{param.acceptWarehouseName}
+            </if>
+            <if test="param.sendWarehouseName !=null and param.sendWarehouseName != ''">
+                and ldrp.send_warehouse_name = #{param.sendWarehouseName}
+            </if>
+            <if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
+                and ldrp.accept_warehouse_name = #{param.acceptWarehouseName}
+            </if>
+            <if test="param.trainNumber !=null and param.trainNumber != ''">
+                and ldrp.train_number = #{param.trainNumber}
+            </if>
+            <if test="param.firsts !=null and param.firsts != ''">
+                and ldrp.firsts = #{param.firsts}
+            </if>
+            <if test="param.second !=null and param.second != ''">
+                and ldrp.second = #{param.second}
+            </if>
+            <if test="param.thirdProduct !=null and param.thirdProduct != ''">
+                and ldrp.third_product = #{param.thirdProduct}
+            </if>
         </where>
     </select>
     <select id="selectPackageByReservationAndStockArticle"
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index d02bb6079..5ddb082d5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
@@ -190,7 +190,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	R<?> updateMarketDeliveryList(DistributionDeliveryListDTO deliveryListDTO);
 
 
-	List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
+	List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String,Object> distributionDeliveryInfoDTO);
 
 	/**
 	 * 查询商配计划科操作订单列表
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 6d3e54982..eaf062e4f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -710,8 +710,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			log.error("############包件信息异常:{}", parcelListEntity);
 			throw new RuntimeException("包件信息异常");
 		}
-		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-		distributionParcelListService.updateById(parcelListEntity);
+		 List<Long> ids = new ArrayList<>();
+		ids.add(parcelListEntity.getId());
+		distributionParcelListMapper.updatePackageListByIds(ids);
 		//维护包件所属订单是否均已完成装车，如果均已完成装车则订单进行装车状态的修改
 		if (parcelListEntity.getConditions() != 2) {
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
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 ecd099521..b9855a7b2 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
@@ -4195,22 +4195,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
-
+	public List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String,Object> distributionDeliveryInfoDTO) {
+		if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))){
+			return null;
+		}
+		Long deliveryId = (Long) distributionDeliveryInfoDTO.get("deliveryId");
 		//查询零担订单包件
 //		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
-		List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(distributionDeliveryInfoDTO.getDeliveryId());
+		List<DistributionStockArticleVO> deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId);
 		if (Func.isEmpty(deliveryStockArticleInfo)) {
 			log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo);
 			return null;
 		}
-		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.getReservationStockArticleByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
+		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.getReservationStockArticleByDeliveryId(deliveryId);
 		if (Func.isEmpty(reservationStockarticleEntityList)) {
 			log.error("配送任务订单查询异常:{}", reservationStockarticleEntityList);
 			return null;
 		}
 
-		List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, distributionDeliveryInfoDTO.getDeliveryId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+		List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 		Map<Long, DistributionLoadscanEntity> loadingDataMap = null;
 		if (Func.isNotEmpty(loadscanEntities)) {
 			loadingDataMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
@@ -4218,7 +4221,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
 		for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
 			if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
+				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId(),distributionDeliveryInfoDTO);
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
 					if (Func.isNotEmpty(loadingDataMap)) {
@@ -4264,8 +4267,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					distributionParcelListVOS.add(distributionParcelListVO);
 				}
 			} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
-				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
-				List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), reservationStockarticleEntity.getStockArticleId());
+				List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, reservationStockarticleEntity.getStockArticleId());
 				List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
 				for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
 					if (Func.isNotEmpty(loadingDataMap)) {