库存品回库创建BUG

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

@@ -320,6 +320,7 @@ public class DistributionSignforAppController {
 			}
 		} catch (Exception e) {
 			log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes);
+			log.info("##############Exception", r.getMsg());
 		}
 		return r;
 	}

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

@@ -2055,7 +2055,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	 * @return
 	 */
 	@NotNull
-	private static DistributionLoadscaninvnEntity getDistributionLoadscaninvnEntity(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionDeliverySelfEntity distributionDeliverySelfEntity, DisStockListDetailEntity disStockListDetailEntity, BasicdataWarehouseEntity warehouseEntity) {
+	private static DistributionLoadscaninvnEntity getDistributionLoadscaninvnEntity(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO,
+																					DistributionDeliverySelfEntity distributionDeliverySelfEntity,
+																					DisStockListDetailEntity disStockListDetailEntity,
+																					DistributionDeliveryListEntity deliveryListEntity,
+																					BasicdataWarehouseEntity warehouseEntity) {
 		DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity();
 		BladeUser user = AuthUtil.getUser();
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -2083,11 +2087,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionLoadscaninvnEntity.setInventoryId(disStockListDetailEntity.getStockListId());
 		distributionLoadscaninvnEntity.setReservationId(disStockListDetailEntity.getReservationId());
 		distributionLoadscaninvnEntity.setOneClick(1);
+		distributionLoadscaninvnEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
+		distributionLoadscaninvnEntity.setDeliveryId(deliveryListEntity.getId());
 		distributionLoadscaninvnEntity.setWarehouseId(warehouseEntity.getId());
 		distributionLoadscaninvnEntity.setWarehouseName(warehouseEntity.getName());
 		distributionLoadscaninvnEntity.setInventoryPackageId(disStockListDetailEntity.getId());
 		distributionLoadscaninvnEntity.setLoadedNub(disStockListDetailEntity.getNum());
-		distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 		distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.zhengchang.getValue());
 		distributionLoadscaninvnEntity.setScanSynchronous(1);
 		return distributionLoadscaninvnEntity;
@@ -9834,9 +9839,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionParcelListEntity::getOrderPackageCode, loadscaninvnEntity.getOrderPackageCode())
 			.eq(DistributionParcelListEntity::getWarehouseId, loadscaninvnEntity.getWarehouseId())
 		);
+		inventoryPackageEntity.setOrderPackageCode(loadscaninvnEntity.getOrderPackageCode());
 		if (!Objects.isNull(parcelListEntity)) {
 			inventoryPackageEntity.setOrderCode(parcelListEntity.getOrderCode());
-			inventoryPackageEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
 			inventoryPackageEntity.setWaybillNumber(parcelListEntity.getWaybillNumber());
 			inventoryPackageEntity.setMaterialName(parcelListEntity.getMaterialName());
 			inventoryPackageEntity.setMaterialNumber(parcelListEntity.getMaterialCode());