From 70f6e8941c1b6db8b05680f49760702ae5d798bf Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 28 Nov 2023 15:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appcontroller/DistributionStockupAppController.java          | 1 +
 .../logpm/distribution/mapper/DistributionStockListMapper.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index a0345da6c..54d0addb9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -1011,6 +1011,7 @@ public class DistributionStockupAppController extends BladeController {
 						entity.setConditions("0");
 						entity.setType(2);
 						entity.setAllocationId(stockupDTO.getAllocationId());
+						entity.setOutboundType(stockupEntity.getTypeService());
 						distributionStockService.save(entity);
 //								dataSourceTransactionManager.commit(transactionStatus);//提交
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 859cf37c0..f78bcddb6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -374,6 +374,7 @@
             <if test="param.materialId != null and param.materialId != '' "> and  ldsi.material_id = #{param.materialId}</if>
             <if test="param.marketId != null and param.marketId != '' "> and ldsi.market_id = #{param.marketId}</if>
             <if test="param.warehouseId != null and param.warehouseId != '' "> and ldsi.warehouse_id = #{param.warehouseId}</if>
+            <if test="param.incomingBatch != null and param.incomingBatch != '' "> and ldsi.incoming_batch = #{param.incomingBatch}</if>
             <if test="param.storeId != null and param.storeId != '' ">and ldsi.store_id = #{param.storeId} </if>
         </where>