1.干线代码提交

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 public class LoadCarsDTO implements Serializable {
 
 	private Long loadId;
+	private String nodeType;
 
 	private Integer pageNum;
 	private Integer pageSize;
@@ -16,4 +17,6 @@ public class LoadCarsDTO implements Serializable {
 
 	private Long warehouseId;
 
+	private Integer startCarType;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java

@@ -105,6 +105,7 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	@ApiModelProperty(name = "配载类型 配载类型：1=干线类型，2=支线类型，3=专车类型，4=外部中转,5=外围路线",notes = "")
 	private String loadType ;
 	/** 批次状态：1=已装车，2=已发车，-2=取消发车，3=网点到达，4=网点发车，5=终点到达，6=已卸车，7=已出库，8=已签收,9=出库到达 */
+	//0 未发车 10已发车 20网点到车 30网点发车
 	@ApiModelProperty(name = "批次状态：1=已装车，2=已发车，-2=取消发车，3=网点到达，4=网点发车，5=终点到达，6=已卸车，7=已出库，8=已签收,9=出库到达",notes = "")
 	private String loadStatus ;
 	/** 车辆满载率 */

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java

@@ -53,7 +53,7 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity {
 	@ApiModelProperty(name = "联系人地址",notes = "")
 	private String linkAddress ;
 	/** 节点状态 0未到达 1已到达 */
-	@ApiModelProperty(name = "节点状态 0未到达 1已到达",notes = "")
+	@ApiModelProperty(name = "节点状态 0未到达 10到车 11取消",notes = "")
 	private String nodeStatus ;
 	/** 排序 */
 	@ApiModelProperty(name = "排序",notes = "")

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java

@@ -55,5 +55,8 @@ public class TrunklineCarsOrderEntity extends TenantEntity {
 	/** 计划件数 */
 	@ApiModelProperty(name = "计划件数",notes = "")
 	private Integer planNum ;
+	/** 是否是直发商家 0否 1是 */
+	@ApiModelProperty(name = "是否是直发商家 0否 1是",notes = "")
+	private String isCustomer ;
 
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -62,6 +62,7 @@ public class CarsLoadController {
 		String method = "############startCarByLoadId: ";
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
+		Integer startCarType = loadCarsDTO.getStartCarType();
 		try{
 
 			//当前登录人选择的仓库
@@ -76,6 +77,21 @@ public class CarsLoadController {
 				return R.fail(405,"请选择一条配载计划");
 			}
 
+			if(Objects.isNull(startCarType)){
+				log.warn(method+"发车类型不能为空 startCarType={}",startCarType);
+				return R.fail(405,"发车类型不能为空");
+			}
+
+			if(startCarType != 1 && startCarType != 2){
+				log.warn(method+"未知的发车类型 startCarType={}",startCarType);
+				return R.fail(405,"未知的发车类型");
+			}
+
+//			if(StringUtil.isBlank(nodeType)){
+//				log.warn(method+"节点类型不能为空 nodeType={}",nodeType);
+//				return R.fail(405,"节点类型不能为空");
+//			}
+
 			carsLoadService.startCarByLoadId(loadCarsDTO);
 			return R.success("操作成功");
 		}catch (CustomerException e){

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java

@@ -3,7 +3,13 @@ package com.logpm.trunkline.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TrunklineCarsLoadLineMapper extends BaseMapper<TrunklineCarsLoadLineEntity> {
+
+    TrunklineCarsLoadLineEntity findStartNodeByLoadId(@Param("loadId") Long loadId);
+
+	TrunklineCarsLoadLineEntity findEndNodeByLoadId(@Param("loadId") Long loadId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml

@@ -3,4 +3,20 @@
 <mapper namespace="com.logpm.trunkline.mapper.TrunklineCarsLoadLineMapper">
 
 
+    <select id="findStartNodeByLoadId" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity">
+        select *
+        from logpm_trunkline_cars_load_line
+        where load_id = #{loadId}
+        order by sort asc
+        limit 1
+    </select>
+
+    <select id="findEndNodeByLoadId" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity">
+        select *
+        from logpm_trunkline_cars_load_line
+        where load_id = #{loadId}
+        order by sort desc
+        limit 1
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java

@@ -4,4 +4,9 @@ import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
 import org.springblade.core.mp.base.BaseService;
 
 public interface ITrunklineCarsLoadLineService extends BaseService<TrunklineCarsLoadLineEntity> {
+
+    TrunklineCarsLoadLineEntity findStartNodeByLoadId(Long loadId);
+
+	TrunklineCarsLoadLineEntity findEndNodeByLoadId(Long loadId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java

@@ -12,4 +12,14 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl<TrunklineCarsLoadLineMapper, TrunklineCarsLoadLineEntity> implements ITrunklineCarsLoadLineService {
+
+	@Override
+	public TrunklineCarsLoadLineEntity findStartNodeByLoadId(Long loadId) {
+		return baseMapper.findStartNodeByLoadId(loadId);
+	}
+
+	@Override
+	public TrunklineCarsLoadLineEntity findEndNodeByLoadId(Long loadId) {
+		return baseMapper.findEndNodeByLoadId(loadId);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -12,10 +12,13 @@ import com.logpm.trunkline.service.ITrunklineCarsLoadService;
 import com.logpm.trunkline.vo.TrunklineCarsLoadVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -48,9 +51,47 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	public void startCarByLoadId(LoadCarsDTO loadCarsDTO) {
 		log.info("############startCarByLoadId: 发车");
 		Long loadId = loadCarsDTO.getLoadId();
+		Integer startCarType = loadCarsDTO.getStartCarType();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 
-		//先查询该仓库
+		//先查询车辆配载计划
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("#############startCarByLoadId: 配载计划不存在 loadId={}",loadId);
+			throw new CustomerException(400,"配载计划不存在");
+		}
+
+		if(startCarType == 1){
+			//车辆配载发车
+			//查询发站仓节点信息
+			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findStartNodeByLoadId(loadId);
+			String nodeStatus = carsLoadLineEntity.getNodeStatus();//节点状态
+			Date startDate = carsLoadLineEntity.getStartDate();
+			if(!Objects.isNull(startDate)){
+				log.warn("#############startCarByLoadId: 车辆已发车 startDate={}",startDate);
+				throw new CustomerException(405,"车辆已发车");
+			}
+			if(!"0".equals(nodeStatus)){
+				log.warn("#############startCarByLoadId: 车辆已发车 nodeStatus={}",nodeStatus);
+				throw new CustomerException(405,"车辆已发车");
+			}
+
+
+
+
+		}else if(startCarType == 2){
+			//到车管理的发车
+			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
+			String nodeStatus = carsLoadLineEntity.getNodeStatus();//节点状态
+			if(!"0".equals(nodeStatus)){
+				log.warn("#############startCarByLoadId: 车辆已发车 nodeStatus={}",nodeStatus);
+				throw new CustomerException(405,"车辆已发车");
+			}
+
+		}
+
+
+