From c9345510a79c3c67e7aa8dcf36c19373c1f651e2 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 11 Mar 2024 10:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4=E3=80=81?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockListMapper.java   | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java       | 7 ++++++-
 .../service/impl/DistributionStockListServiceImpl.java     | 7 ++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
index 8f7cef4df..41fcf1452 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
@@ -101,7 +101,7 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 	 * @param stockListDTO
 	 * @return
 	 */
-	List<DistributionStockListVO> selectAllStockList(@Param("par")DistributionStockListDTO stockListDTO);
+	IPage<DistributionStockListVO> selectAllStockList(@Param("par")DistributionStockListDTO stockListDTO, IPage<DistributionStockListVO> page);
 
 	/**
 	 * 查询库存平数据
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index b325fac67..94f213ea5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -533,7 +533,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionSignfor.setExamineUserName(user.getNickName());
 		this.updatePicture(distributionSignforDTO);
 		this.updateById(distributionSignfor);
-
+		//修改预约单的签收状态和装车状态
+		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
+		reservationEntity.setId(distributionSignfor.getReservationId());
+		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
+		reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());;
+        distributionReservationService.updateById(reservationEntity);
 		distributionAsyncService.sendReviewFactory(distributionSignforDTO.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
 		//还需要对未装车未签收的包件进行状态的回退
 		boolean flag = this.judgmentSignIsHavePackage(distributionSignfor.getReservationId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index 623312356..431f446c4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -649,9 +649,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		}
 		DistributionStockListDTO stockListDTO = Func.copy(distributionStockList, DistributionStockListDTO.class);
 		stockListDTO.setWarehouseId(myCurrentWarehouse.getId());
-		List<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO);
-		page.setRecords(stockListVOList);
-		return page;
+		IPage<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO,page);
+//		List<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO,page);
+//		page.setRecords(stockListVOList);
+		return stockListVOList;
 	}
 
 	/**