市配配送任务编辑、配送任务增加任务号

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

@@ -225,7 +225,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 * 配车时间
 	 */
 	@ApiModelProperty(value = "配车时间")
-	private String taskTime;
+	private Date taskTime;
 
 	/**
 	 * 配送单号

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -57,7 +57,8 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/warehouse")
 @Api(value = "仓库", tags = "仓库接口")
-public class BasicdataWarehouseController extends BladeController {
+public class
+BasicdataWarehouseController extends BladeController {
 
 	private final IBasicdataWarehouseService warehouseService;
 
@@ -242,4 +243,29 @@ public class BasicdataWarehouseController extends BladeController {
 		return R.data(basicdataGoodsShelfVOList);
 	}
 
+
+
+
+
+	/*
+	1. 得到仓库列表
+			根据当前登录人
+			当前人部门
+			情况
+			1、登录人部门范围大  登录人 -- 仓库 -> 一对多
+					   递归查询
+			2、登录人部门就是营业部节点  登录人 -- 仓库 -> 一对一
+
+	2、存放用户选择的仓库id
+			key 租户Id + 用户id
+
+
+	3、Feign 获取用户选择的仓库
+			这里考虑两种情况
+			1、用户只有一个仓库信息，直接返回
+			2、用户没有选择仓库的动作，返回null
+
+
+	 */
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -26,6 +26,7 @@ import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -127,6 +128,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	public List<BasicdataWarehouseVO> getMyWarehouseList() {
 
 		// 获取当前登陆人
+		BladeUser user = AuthUtil.getUser();
+		String deptId = user.getDeptId();
 
 
 		// 获取当前登陆人能操作的仓库列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -319,9 +319,9 @@ public class DistributionDeliveryListController extends BladeController {
 
 
 	/**
-	 * 修改配送任务
+	 * 修改市配配送计划
 	 */
-	@PutMapping("/updateMarketDeliveryList")
+	@PutMapping("/updateMarketDelivery")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
 	public R<?> updateMarketDeliveryList(@RequestBody DistributionDeliveryListDTO deliveryListDTO) {
@@ -329,7 +329,4 @@ public class DistributionDeliveryListController extends BladeController {
 		return result;
 	}
 
-
-
-
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java

@@ -80,7 +80,7 @@ public class DistributionDeliveryAllocationDTO {
 	 * 任务时间
 	 */
 	@ApiModelProperty(value = "任务时间")
-	private String taskTime;
+	private Date taskTime;
 
 
 }

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

@@ -1297,6 +1297,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 
 			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
+
 				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
 				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
 			}
@@ -1368,7 +1369,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						packageNum.getAndAdd(p.getQuantity());
 					});
 					//修改订单信息
-					///TODO 这里对于包件的预约状态 需要一个方法
 					s.setReservationStatus(distributionReservationPackageService.judgmentStatus(s));
 					DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 					reservationStockarticleEntity.setReservationNum(packageNum.get());
@@ -1393,7 +1393,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionSignforEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 				distributionSignforEntity.setReservationId(distributionReservationEntity.getId());
 				distributionSignforService.save(distributionSignforEntity);
-				//TODO 这里还存在一个关于预约和备货任务的业务bug，周一问超哥
 				//这里查看这个配送任务的备货任务是否已完成，如果已完成则需要开新的备货任务，否则将这个新的预约和原来的备货任务建立绑定关系
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setReservationId(distributionReservationEntity.getId());
@@ -1831,7 +1830,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryStockupInfo.setOutboundDate(stockupInfo.getOutboundDate());
 			distributionStockupMapper.updateById(deliveryStockupInfo);
 		}
-		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		if (Func.isNotEmpty(deliveryListDTO.getTaskTime())){
+			deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		}
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
 		return R.status(true);

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

@@ -764,6 +764,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setOrderNumber(orderNum.get());
 		distributionDeliveryListEntity.setType(DistributionTypeConstant.shipie.getValue());
 		distributionDeliveryListEntity.setOrderCode(String.join(",", hashSet));
+		distributionDeliveryListEntity.setTaskTime(allocationDTO.getTaskTime());
+		distributionDeliveryListEntity.setNoteNumber(Func.random(13,RandomType.INT));
 //		if (orderIds.length() > 1) {
 //			distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString());
 //		}
@@ -1248,16 +1250,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
 		//完善配送信息
-		String taskTime = allocationDTO.getTaskTime();
+		Date taskTime = allocationDTO.getTaskTime();
 		if (!Func.isEmpty(taskTime)) {
 			distributionDeliveryListEntity.setTaskTime(taskTime);
 		}
 		distributionDeliveryListEntity.setWarehouseName(String.join(",",deliveryWarehouseName));
 		distributionDeliveryListEntity.setOrderCode(String.join(",", orderNumber));
 		distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
-//		distributionDeliveryListEntity.setDeliveryNumber(packageTotal.get());
+		distributionDeliveryListEntity.setNoteNumber(Func.random(13,RandomType.INT));
 		distributionDeliveryListEntity.setCustomersNumber(clientNum.get());
-		distributionDeliveryListEntity.setTaskTime(allocationDTO.getTaskTime());
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
 	}