From 47f1ecf36f8e90443b8b862e035f6bdd7bff96e1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Mar 2024 10:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=91=98=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/dto/DistributionStockArticleOweDTO.java    | 1 -
 .../distribution/mapper/DistributionStockArticleMapper.xml  | 3 +--
 .../service/impl/DistributionSignforServiceImpl.java        | 6 ++++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
index d553d0a38..8c8aecc11 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
@@ -28,6 +28,5 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
 	private String reservation;
 	private String startDate;
 	private String entDate;
-	private String isAll;
 	private List<Long> warehouseIdList;
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 2e769b63c..1b5065a7c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -432,6 +432,7 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
             ldsa.is_deleted = 0 and ldsa.order_status in (10,20,30,40,50,60,70)
+            and ldsa.hand_quantity > 0
             <if test="param.orderCodeNumList != null">
                 and ldsa.order_code in
                 <foreach collection="param.orderCodeNumList" separator="," close=")" item="a" open="(">
@@ -473,8 +474,6 @@
             <if test="  param.startDate != null  ">and ldsa.warehouse_entry_time between #{param.startDate} and
                 #{param.entDate}
             </if>
-            <if test="  param.isAll != null  ">and ldsa.hand_quantity > 0
-            </if>
             <if test="  param.warehouseEntryTime != null  ">and DATE(ldsa.warehouse_entry_time) =
                 #{param.warehouseEntryTime}
             </if>
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 4cd3714b8..aff4a6611 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
@@ -792,6 +792,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.set(StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
 //				.set(StringUtils.isNotBlank(distributionSignfor.getSigneeName()), DistributionSignforEntity::getSigneeName, distributionSignfor.getSigneeName())
 		);
+		//维护文员上传图片视为签收完成
+		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
+		reservationEntity.setId(distributionSignfor.getReservationId());
+		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
+		reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
+		distributionReservationService.updateById(reservationEntity);
 		return R.status(update);
 	}