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 941f51f08..6ff37135b 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
@@ -758,6 +758,8 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
+        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no
+        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
@@ -858,6 +860,7 @@
             <if test="par.customerAddress !=null  and par.customerAddress !=''">
                 and ldsa.customer_address like concat('%',#{par.customerAddress},'%')
             </if>
+            AND lww.check_status = 1
         </where>
         ORDER BY
         ldsa.warehouse_entry_time DESC
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 89cd67f67..ac308de89 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -801,7 +801,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo);
 
-
+		//判断是否是开单及入库的配置
+		Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId);
+		if (Boolean.TRUE.equals(aBoolean)) {
+			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(), warehouseId, warehouseName, waybillEntity);
+			waybillEntity.setStockCount(waybillEntity.getTotalCount());
+			waybillEntity.setWaybillStatus("20");
+			warehouseWaybillClient.updateEntity(waybillEntity);
+		}
 
 		//异步存入日志
 		String nickName = AuthUtil.getNickName();
@@ -972,7 +979,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 					if (Objects.isNull(basicdataCategoryEntity)) {
 						basicdataCategoryEntity = new BasicdataCategoryEntity();
 						basicdataCategoryEntity.setName(goodsName);
-						basicdataCategoryEntity.setType("10");
+						basicdataCategoryEntity.setType("1");
 						goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
 					} else {
 						goodsId = basicdataCategoryEntity.getId();