From 6f8d0f89691d8c5e89ff22b02b61408bdbb27d10 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Mar 2024 16:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E9=87=8F=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DistributionStockArticleOweDTO.java        |  1 -
 .../mapper/DistributionStockArticleMapper.xml      |  4 ++--
 .../impl/DistributionParcelListServiceImpl.java    | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 5 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 a636c824c..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 warehouseEntryTimeEnd;
 	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 e2c163331..939d577d6 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
@@ -525,7 +525,7 @@
             <if test="  param.customerAddress != null   and param.customerAddress != '' ">and ldsa.customer_address like
                 concat('%',#{param.customerAddress},'%')
             </if>
-            <if test="  param.trays != null   and param.trays != '' ">and lwtg.tray_code like
+            <if test=" param.trays != null   and param.trays != '' ">and lwtg.tray_code like
                 concat('%',#{param.trays},'%')
             </if>
             <if test="  param.allocation != null   and param.allocation != '' ">and lwug.position_code like
@@ -609,7 +609,7 @@
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
-            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0
+            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0 AND  ldsa.hand_quantity > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 8491ef481..aeeedaf1b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -526,12 +526,22 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);                        //修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
-					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+//					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+					stockArticleEntity.setHandQuantity(0);
 					distributionStockArticleMapper.updateById(stockArticleEntity);
 				} else {
 					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
 					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
-					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+//					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+					//统计订单在库数量
+//					List<DistributionParcelListEntity> parcelListEntities = this.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+//						.eq(DistributionParcelListEntity::getStockArticleId, oo)
+//						.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+//					);
+//					int sum = parcelListEntities.stream().filter(p -> "1".equals(p.getConditions())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
+//					distributionStockArticleEntity.setHandQuantity(sum);
+//					distributionStockArticleEntity.setIncomingNum(sum);
+
 					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
 				}
 			});