Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-cyz";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -268,6 +268,13 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@TableField(exist = false)
 	private String clineName;
 
+	/**
+	 * 签收件数
+	 */
+	@ApiModelProperty(value = "客户名称")
+	@TableField(exist = false)
+	private Integer signingNumber;
+
 
 
 

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

@@ -79,6 +79,24 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	@ApiModelProperty(value = "订单自编号")
 	private String orderCode;
 
+	/**
+	 * 司机名称
+	 */
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	/**
+	 * 司机电话
+	 */
+	@ApiModelProperty(value = "司机电话")
+	private String driverPhone;
+
+	/**
+	 * 车牌号
+	 */
+	@ApiModelProperty(value = "车牌号")
+	private String vehicleName;
+
 	/**
 	 * 签收数
 	 */

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-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -175,8 +175,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 
-
-
 			return baseMapper.updateById(aftersalesWorkOrder) > 0 ? true : false;
 		}
 	}

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

@@ -188,6 +188,13 @@
         WHERE
         lddl.id = lds.delivery_id
         ) scannedNumber,
+        (SELECT
+        COALESCE (sum(lds.received_quantity), 0)
+        FROM
+        logpm_distribution_signfor lds
+        WHERE
+        lddl.id = lds.delivery_id
+        ) signingNumber,
         GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName
         FROM  logpm_distribution_delivery_list lddl
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id

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

@@ -119,6 +119,11 @@
         ldr.service_number serviceNumber,
         ldsa.order_code orderCode,
         lddl.train_number trainNumber,
+        case lddl.type
+        when 1 then '商配'
+        when 2 then '市配'
+        else ''
+        end serveType,
         lddl.type type,
         ldsa.mall_name mallName,
         ldsa.warehouse warehouse,
@@ -131,6 +136,14 @@
         ldr.delivery_address deliveryAddress,
         lds.signing_time signingTime,
         lds.sjsigning_time sjsigningTime,
+        lddl.driver_name driverName,
+        lddl.vehicle_name vehicleName,
+        lddl.kind,
+        CASE lddl.kind
+        WHEN '1' THEN  (SELECT ldds.driver_phone  FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id = lddl.id AND ldds.is_master = 2)
+        WHEN '2' THEN  (SELECT lddt.driver_phone  FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id = lddl.id )
+        ELSE ''
+        END driverPhone,
         (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',')  FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName,
         (SELECT COALESCE (count(*) ,0)  FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id  =ldrs.reservation_id) totalNumber,
         (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and  ldl.signfor_state =2) signfornum

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -167,23 +167,6 @@ public class ClerkCheckPushDataQueueHandler {
 			}
 		}
 
-		//得到客户对应的签收数据
-		// TODO 这里的数据需要查询 等TJJ 空了来帮我写
-
-
-
-
-
-
-
-
-
-//		// 得到签收订单数量
-//
-////		调用方法　推送老系统　闭环
-//		SignPushDataDTO signPushDataDTO = new SignPushDataDTO();
-
-
 
 
 

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

@@ -189,6 +189,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 		distributionDeliveryList.setWarehouseIdList(collect);
 		List<DistributionDeliveryListEntity> distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList);
+
 		return page.setRecords(distributionDeliveryListEntities);
 	}
 
@@ -1429,6 +1430,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
 							loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
 							loadscanEntity.setOneClick(2);
+							loadscanEntity.setScanType(parcelListEntity.getConditions().toString());
 							loadscanEntity.setScanUser(user.getUserName());
 							loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 							loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());

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

@@ -305,6 +305,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//缺少一个异步维护包件签收的方法
 //				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
 				Integer j = distributionSignforMapper.updateSignforNum(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+				warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 
 			} else {
 				//这里装车的数据需要进行补录
@@ -396,7 +397,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		String str = checkSignNum(distrilbutionloadingscanDTO);
 		//查询出客户下的所有包件信息
-//		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
+		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", str);
 	}
 
@@ -1020,6 +1021,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("########该客户下的库存品是否已备货:{}", isHaveCode);
 			return Resp.scanFail("操作失败", "操作失败");
 		}
+		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", "签收成功");
 
 
@@ -1792,7 +1794,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 				if (Func.isEmpty(loadscanEntities)) {
 					//没有进行过装车操作
-
 					DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
 					loadscanEntity.setPackageId(parcelListEntity.getId());
 					loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
@@ -1839,8 +1840,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 					//更新签收表的签收数量和装车数量
 					Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
-					distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(),loadscanEntity.getReservationId(),loadscanEntity.getDeliveryId());
-
+					distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
+					log.info("一件签收包件下架解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode());
 					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 				} else {
 					//存在装车数据
@@ -1863,6 +1864,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						//更新签收数量
 						Integer j = distributionSignforMapper.updateSignforNum(loadscanEntities.getDeliveryId(), loadscanEntities.getReservationId(), loadscanEntities.getPackageNub());
 						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(),loadscanEntities.getReservationId(),loadscanEntities.getDeliveryId());
+						log.info("一件签收包件解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode());
+						warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+
 					}
 				}
 				distributionParcelListService.updateById(parcelListEntity);
@@ -2830,7 +2834,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						parcelNumberEntity.setHandQuantity(handQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setDeliveryQuantity(deliveryQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setOutboundQuantity(outboundQuantity.add(signNum).intValue());
-
 					}
 				}
 			}
@@ -2870,7 +2873,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//  得到signfor的ID 获取配送计划的的信息 和配送客户的信息
 		map.put("signfor_id",distributionSignfor.getId());
 
-		rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map);
+		log.info(">>>>>>>>>>>>>>>>>>> 推送老系统 的签收数据  {} ",distributionSignfor);
+		//rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map);
 
 	}
 

blade-service/logpm-distribution/src/test/java/com/logpm/distribution/TestService.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @ExtendWith(BladeSpringExtension.class)
-@BladeBootTest(appName = "logpm-distribution-pref", enableLoader = true)
+@BladeBootTest(appName = "logpm-distribution-tjj", enableLoader = true)
 public class TestService {
 
 	@Autowired

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,"车辆已发车");
+			}
+
+		}
+
+
+
 
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml

@@ -23,7 +23,7 @@
         <result column="order_id" property="orderId"/>
         <result column="quest_type" property="questType"/>
         <result column="quest_target" property="questTarget"/>
-        <result column="orde_package_code" property="ordePackageCode"/>
+        <result column="order_package_code" property="orderPackageCode"/>
         <result column="order_package_id" property="orderPackageId"/>
         <result column="category_name" property="categoryName"/>
         <result column="stock_id" property="stockId"/>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -440,7 +440,7 @@
         lqd.stock_num stockNum,
         lqd.position_code positionCode,
         lqd.grounding_position_code groundingPositionCode,
-        lqd.orde_package_code ordePackageCode,
+        lqd.order_package_code ordePackageCode,
         lqd.order_package_id orderPackageId,
         lqd.update_time updateTime,
         ldpl.service_number serviceNumber,