1.修复定制品备货的报错

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java

@@ -103,25 +103,15 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionReservationStocklistService distributionReservationStocklistService;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
-	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
-	private final IDistributionAsyncService distributionAsyncService;
 	private final DistributionReservationMapper distributionReservationMapper;
 	private final IDisStockListDetailService disStockListDetailService;
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
-	private final RabbitTemplate rabbitTemplate;
-
-
 	private final IDistributionStockListService distributionStockListService;
 
-
-	private final IDisStockOrdercodeRecoService disStockOrdercodeRecoService;
 	private final IDistributionReservationStockarticleService distributionReservationStockarticleService;
-	private final IWarehouseUpdownStockUpAreaClient warehouseUpdownStockUpAreaClient;
 
 	private final BladeRedis redis;
-	private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
-	private final IDistributionNodeWorkService distributionNodeWorkService;
 	private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
 
 

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

@@ -61,9 +61,9 @@
         <where>
             ldsi.reservation_id = #{param.reservationId} and ldsi.stockup_id = #{param.stockupId}
             and ldpl.order_package_code = #{param.packetBarCode}
-            <if test="param.orderCode != '' and param.orderCode != null">
-                and ldpl.order_code = #{param.orderCode}
-            </if>
+<!--            <if test="param.orderCode != '' and param.orderCode != null">-->
+<!--                and ldpl.order_code = #{param.orderCode}-->
+<!--            </if>-->
         </where>
 
     </select>

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

@@ -2196,19 +2196,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					case 1:
 						//订单
 						String orderCode = stockupDTO.getOrderCode();
-						QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
-						if (stockupDTO.getOrderCode().contains(",")) {
-							stockupDTO.setOrderCodeList(stockupDTO.getOrderCode().split(","));
-							queryWrapper.in("order_self_numbering", stockupDTO.getOrderCodeList());
-							stockupDTO.setOrderCode(null);
-						} else {
-							queryWrapper.eq("order_self_numbering", orderCode);
-						}
+//						QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
+//						if (stockupDTO.getOrderCode().contains(",")) {
+//							stockupDTO.setOrderCodeList(stockupDTO.getOrderCode().split(","));
+//							queryWrapper.in("order_self_numbering", stockupDTO.getOrderCodeList());
+//							stockupDTO.setOrderCode(null);
+//						} else {
+//							queryWrapper.eq("order_self_numbering", orderCode);
+//						}
 						String packetBarCode = stockupDTO.getPacketBarCode();
 						Integer integer = baseMapper.selectPackageExist(stockupDTO);
 						//查询包件信息
 						if (ObjectUtils.isNotNull(integer) && integer > 0) {
 							//存在
+							QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
 							queryWrapper.eq("coding", packetBarCode);
 							queryWrapper.eq("stockup_id", stockupId);
 							queryWrapper.eq("reservation_id", reservationId);