订单维护状态取消库存品包件

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

@@ -1370,6 +1370,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("order_code", orderCode)
 			.eq("warehouse_id", warehouseId)
+			.eq("conditions", 1)
 			.eq("is_deleted", 0);
 		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 		Integer incomingNum = 0;
@@ -1549,6 +1550,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				//查询包件列表
 				List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 					.eq(DistributionParcelListEntity::getOrderCode, s)
+					.eq(DistributionParcelListEntity::getConditions, 1)
 					.eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId())
 					.eq(DistributionParcelListEntity::getWarehouseId, warehouseId)
 				);