仓库Id字段增加

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

@@ -1541,6 +1541,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			log.error("deliveryListDTO参数异常+{" + deliveryListDTO + "}");
 			return R.fail("服务器正忙!!");
 		}
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return R.fail("无仓库信息!!!");
+		}
 		//首先对配送任务进行修改
 		//查询出配送任务的基本信息
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryListDTO.getId());
@@ -1643,6 +1647,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
 				reservationEntity.setPeriodOfTime(ServiceConstant.RESERVATION_PERIOED_TIME_DAY);
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
+				reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 				BladeUser user = AuthUtil.getUser();
 				reservationEntity.setCreateUser(user.getUserId());
 				reservationEntity.setDeliveryWay(reservation.getDeliveryWay());

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

@@ -1220,6 +1220,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//1、添加配送任务
 		DistributionStockupDTO stockup = allocationDTO.getStockup();
 		DistributionStockupEntity stockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
+		stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
 		if (!Func.isBlank(stockup.getForkliftName())) {
 			stockupEntity.setAssignTime(new Date());
 			stockupEntity.setForkliftId(stockupEntity.getForkliftId());
@@ -1279,6 +1280,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			DistributionReservationDTO reservation = allocationDTO.getReservation();
 			DistributionReservationEntity reservationEntity = Func.copy(reservation, DistributionReservationEntity.class);
 			reservationEntity.setWaybillNo(k);
+			reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 			reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
 			//这里采用订单上的收货信息
 			this.save(reservationEntity);