From 110dced6fb43976d72e7c3a45f6f540121ff20c3 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Dec 2023 14:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E8=A3=85?=
 =?UTF-8?q?=E8=BD=A6=E5=92=8C=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionSignforAppController.java            |  8 ++++----
 .../mapper/DistributionSignforMapper.java            |  2 +-
 .../service/IDistributionSignforService.java         |  4 ++--
 .../service/impl/DistributionSignforServiceImpl.java | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
index baafb5457..6e9e60a31 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
@@ -77,8 +77,8 @@ public class DistributionSignforAppController {
 	@GetMapping("/order")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "列表", notes = "DistributionAppDeliveryListDTO")
-	public R<IPage<DistributionAppStockArticleVO>> order(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) {
-		IPage<DistributionAppStockArticleVO> pages = distributionSignforService.getAppDeliveryorderListPage(Condition.getPage(query), distributionDeliveryList);
+	public R<List<DistributionAppStockArticleVO>> order(DistributionAppDeliveryListDTO distributionDeliveryList) {
+		List<DistributionAppStockArticleVO> pages = distributionSignforService.getAppDeliveryorderListPage( distributionDeliveryList);
 		return R.data(pages);
 	}
 
@@ -88,8 +88,8 @@ public class DistributionSignforAppController {
 	@GetMapping("/inventory")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "客户查看库存品", notes = "DistributionAppDeliveryListDTO")
-	public R<IPage<DistributionAppStockArticleVO>> inventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) {
-		IPage<DistributionAppStockArticleVO> pages = distributionSignforService.selectAppDeliveryInventory(Condition.getPage(query), distributionAppDeliveryListDTO);
+	public R<List<DistributionAppStockArticleVO>> inventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		List<DistributionAppStockArticleVO> pages = distributionSignforService.selectAppDeliveryInventory(distributionAppDeliveryListDTO);
 		return R.data(pages);
 	}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 8d6629a93..8378e7ca7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -161,7 +161,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 *
 	 * @return
 	 */
-	List<DistributionAppStockArticleVO> selectAppDeliveryInventoryPage(IPage<DistributionAppStockArticleVO> page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
+	List<DistributionAppStockArticleVO> selectAppDeliveryInventoryPage(@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
 	/**
 	 * 车次查询库存品
 	 *
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index f55da369c..2cbbe7c11 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -108,7 +108,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	/**
 	 * App-签收管理 查看订单
 	 */
-	IPage<DistributionAppStockArticleVO> getAppDeliveryorderListPage(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionDeliveryList);
+	List<DistributionAppStockArticleVO> getAppDeliveryorderListPage( DistributionAppDeliveryListDTO distributionDeliveryList);
 	/**
 	 * App-签收管理 查看包条
 	 */
@@ -120,7 +120,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	/**
 	 * App-签收管理 客户查看库存品
 	 */
-	IPage<DistributionAppStockArticleVO> selectAppDeliveryInventory(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
+	List<DistributionAppStockArticleVO> selectAppDeliveryInventory( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
 	/**
 	 * App-签收管理 查看详情库存品
 	 */
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 d5d199fbe..08da0b886 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
@@ -1204,7 +1204,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));
 				BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 			}
-			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			//查询装车扫描表
 			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
@@ -1711,7 +1711,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
-	public IPage<DistributionAppStockArticleVO> getAppDeliveryorderListPage(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionDeliveryList) {
+	public List<DistributionAppStockArticleVO> getAppDeliveryorderListPage( DistributionAppDeliveryListDTO distributionDeliveryList) {
 		if (Func.isNotEmpty(distributionDeliveryList.getReservationId())) {
 			log.error("参数缺失reservationId:{}", distributionDeliveryList.getReservationId());
 		}
@@ -1858,7 +1858,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 	}
 
-		return page.setRecords(orderVos);
+		return orderVos;
 
 }
 
@@ -2146,9 +2146,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
-	public IPage<DistributionAppStockArticleVO> selectAppDeliveryInventory(IPage<DistributionAppStockArticleVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
-		List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectAppDeliveryInventoryPage(page, distributionAppDeliveryListDTO);
-		return page.setRecords(distributionAppStockArticleVOS);
+	public List<DistributionAppStockArticleVO> selectAppDeliveryInventory( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectAppDeliveryInventoryPage( distributionAppDeliveryListDTO);
+		return distributionAppStockArticleVOS;
 	}
 
 	@Override