修改自提订单查询

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -438,6 +438,9 @@
             <if test=" param.orderCodeNumLike != '' and param.orderCodeNumLike != null  ">and ldsa.order_code like
                 concat('%',#{param.orderCodeNumLike},'%')
             </if>
+            <if test=" param.reservation != '' and param.reservation != null  ">
+             and ldsa.reservation_status in (10,20)
+            </if>
             <if test=" param.waybillNumList != null  ">
                 and ldpl.waybill_number in
                 <foreach collection="param.waybillNumList" open="(" item="a" close=")" separator=",">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -836,9 +836,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			}
 		}
 
-		if(Func.isNotEmpty(stockArticleEntity.getReservation())){
-			stockArticleEntity.setReservationStatus("10");
-		}
+//		if(Func.isNotEmpty(stockArticleEntity.getReservation())){
+//			stockArticleEntity.setReservationStatus("10");
+//		}
 		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
 		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());