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

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

@@ -0,0 +1,106 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * PAD备货扫描记录 实体类
+ *
+ * @author cyz
+ * @since 2023-06-26
+ */
+@Data
+@TableName("logpm_distribution_plan_log")
+@ApiModel(value = "DistributionPlanLogEntity对象", description = "计划日志")
+@EqualsAndHashCode(callSuper = true)
+public class DistributionPlanLogEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	/**
+	 * 关联ID
+	 */
+	@ApiModelProperty(value = "关联ID")
+	private Long refId;
+
+	/**
+	 * 关联任务Code
+	 */
+	@ApiModelProperty(value = "关联任务Code")
+	private String refCode;
+
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 描述
+	 */
+	@ApiModelProperty(value = "描述")
+	private String content;
+
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	private String operator;
+	/**
+	 * 货位
+	 */
+	@ApiModelProperty(value = "类型  1-预约计划,2-自提计划,3-配送计划,4-备货计划")
+	private Integer type;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadScanVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 public class TrunklineCarsLoadScanVO extends TrunklineCarsLoadScanEntity {
 
 	private Long signOrderId;
+	private Long carsLoadScanId;
 
 	private String destinationWarehouseName;
 

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

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionLoadingNumDTO;
+import com.logpm.distribution.dto.DistributionParcelNumberDTO;
+import com.logpm.distribution.dto.DistributionReservationDTO;
+import com.logpm.distribution.entity.*;
+import com.logpm.distribution.vo.*;
+import com.logpm.oldproject.dto.SignPushDataContactDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 预约列表 Mapper 接口
+ *
+ * @author TJJ
+ * @since 2023-06-12
+ */
+@Mapper
+public interface DistributionPlanLogMapper extends BaseMapper<DistributionPlanLogEntity> {
+
+
+
+
+}

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.distribution.mapper.DistributionPlanLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="reservationResultMap" type="com.logpm.distribution.entity.DistributionPlanLogEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="ref_id" property="refId"/>
+        <result column="ref_code" property="refCode"/>
+        <result column="warehouse_id" property="warehouseId"/>
+        <result column="warehouse_name" property="warehouseName"/>
+        <result column="content" property="content"/>
+        <result column="operator" property="operator"/>
+        <result column="type" property="type"/>
+    </resultMap>
+
+</mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPlanLogService.java

@@ -0,0 +1,31 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service;
+
+import com.logpm.distribution.entity.DistributionPlanLogEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * 配送计划日志服务类
+ *
+ * @author cyz
+ * @since 2023-07-25
+ */
+public interface IDistributionPlanLogService extends BaseService<DistributionPlanLogEntity> {
+
+
+}

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

@@ -264,6 +264,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	@Autowired
 	private IDistributionBillLadingScanService distributionBillLadingScanService;
 
+	@Autowired
+	private IDistributionPlanLogService distributionPlanLogService;
+
 //	private final IWarehouseRetentionScanClient warehouseRetentionScanClient;
 
 //	@Lazy
@@ -3814,9 +3817,66 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
+		//进行日志记录
+		handleUpdateDistributionLog(deliveryListEntity,user,reservationDTOS,distributionReservationEntities,myCurrentWarehouse);
 		return R.status(true);
 	}
 
+	private void handleUpdateDistributionLog(DistributionDeliveryListEntity deliveryListEntity, BladeUser user, List<DistributionReservationEntity> oldList, List<DistributionReservationEntity> newList, BasicdataWarehouseEntity myCurrentWarehouse) {
+		List<DistributionReservationEntity> addNewList = newList.stream().filter(f -> !oldList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()).contains(f.getId())).collect(Collectors.toList());
+		List<DistributionPlanLogEntity> reservationLogList= new ArrayList<>();
+		if (!addNewList.isEmpty()) {
+			//存在新增
+			for (DistributionReservationEntity reservationEntity : addNewList) {
+				String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+					+"进行预约计划新增转配送;预约计划:"+reservationEntity.getReservationCode()
+					+"车次号:"+deliveryListEntity.getTrainNumber();
+				DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity();
+				reservationPlanLogEntity.setContent(reservationContent);
+				reservationPlanLogEntity.setRefId(reservationEntity.getId());
+				reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+				reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+				reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+				reservationPlanLogEntity.setOperator(user.getNickName());
+				reservationPlanLogEntity.setType(1);
+				reservationLogList.add(reservationPlanLogEntity);
+			}
+		}
+		List<DistributionReservationEntity> deletedList = oldList.stream().filter(f -> !newList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()).contains(f.getId())).collect(Collectors.toList());
+		if (!deletedList.isEmpty()) {
+			//存在取消
+			for (DistributionReservationEntity reservationEntity : addNewList) {
+				String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+					+"进行预约计划取消转配送;预约计划:"+reservationEntity.getReservationCode()
+					+"车次号:"+deliveryListEntity.getTrainNumber();
+				DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity();
+				reservationPlanLogEntity.setContent(reservationContent);
+				reservationPlanLogEntity.setRefId(reservationEntity.getId());
+				reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+				reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+				reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+				reservationPlanLogEntity.setOperator(user.getNickName());
+				reservationPlanLogEntity.setType(1);
+				reservationLogList.add(reservationPlanLogEntity);
+			}
+		}
+		if (!reservationLogList.isEmpty()){
+			distributionPlanLogService.saveBatch(reservationLogList);
+			String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+				+"修改市配配送计划;车次号:"+deliveryListEntity.getTrainNumber()
+				+"预约编号:["+oldList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]变更为-->["+newList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]";
+			DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
+			distributionPlanLogEntity.setContent(distributionContent);
+			distributionPlanLogEntity.setRefId(deliveryListEntity.getId());
+			distributionPlanLogEntity.setRefCode(deliveryListEntity.getTrainNumber());
+			distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+			distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+			distributionPlanLogEntity.setOperator(user.getNickName());
+			distributionPlanLogEntity.setType(3);
+			distributionPlanLogService.save(distributionPlanLogEntity);
+		}
+	}
+
 	@Override
 	public IPage<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String, Object> distributionDeliveryInfoDTO) throws ParseException {
 		if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))) {
@@ -4307,7 +4367,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				.set(DistributionDeliverySelfEntity::getDepartureTime, format)
 			);
 		} else {
-			b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda().eq(DistributionDeliveryTripartiteEntity::getId, loadingId).set(DistributionDeliveryTripartiteEntity::getDepartureTime, format));
+			b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda()
+				.eq(DistributionDeliveryTripartiteEntity::getId, loadingId)
+				.set(DistributionDeliveryTripartiteEntity::getDepartureTime, format));
 
 		}
 		//修改主表状态
@@ -4324,7 +4386,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (planCount.get() != 0) {
 			builder.append("计划" + planCount.get() + "件");
 		}
-		//TODO  提示装车件数
 		Integer loadingCount = new Integer(0);
 		//查询配送任务的计划订单装车数
 		Integer packageLoadingNum = distributionLoadscanMapper.statisticsLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
@@ -4343,7 +4404,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		if (loadingCount != 0) {
 			builder.append("装车" + loadingCount + "件");
-
 		}
 		//统计该配送任务的库存品装车数
 		Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
@@ -4376,18 +4436,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public R<?> cancelMarketDeliveryListTask(Map<String, Object> distributionDeliveryListDTO) {
-		//1、查询配送计划下的预约、订单、包件信息
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Objects.isNull(myCurrentWarehouse)){
+			return R.fail(403,"未授权!!!");
+		}
+
 		String deliveryListId = (String) distributionDeliveryListDTO.get("deliveryListId");
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryListId);
 		List<DistributionSignforEntity> distributionSignforEntities = distributionSignforServicer.getBaseMapper().selectList(Wrappers.<DistributionSignforEntity>query().lambda().eq(DistributionSignforEntity::getDeliveryId, deliveryListEntity.getId()));
 		BladeUser user = AuthUtil.getUser();
+		List<DistributionReservationEntity> reservationList = new ArrayList<>();
 		distributionSignforEntities.forEach(s -> {
-			//2、将预约计划进行确认状态的回滚
-//			DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(s.getReservationId());
 			DistributionReservationEntity reservationEntity = distributionReservationMapper.selectOne(Wrappers.<DistributionReservationEntity>query().lambda()
 				.eq(DistributionReservationEntity::getId, s.getReservationId())
 				.ne(DistributionReservationEntity::getReservationStatus, ReservationStatusConstant.yiquexiao.getValue())
 			);
+			reservationList.add(reservationEntity);
 			reservationEntity.setReservationStatus(ReservationStatusConstant.yiqueren.getValue());
 			reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
 			distributionReservationMapper.updateById(reservationEntity);
@@ -4426,9 +4490,46 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//2、将这些状态修改为取消状态
 		baseMapper.deleteDeliveryListById(deliveryListId);
 		//3、处理配送表和配送计划
+		//进行取消操作日志记录
+		handleCancelDistributionLog(deliveryListEntity,user,reservationList,myCurrentWarehouse);
 		return R.status(true);
 	}
 
+	private void handleCancelDistributionLog(DistributionDeliveryListEntity deliveryListEntity, BladeUser user, List<DistributionReservationEntity> reservationList, BasicdataWarehouseEntity myCurrentWarehouse) {
+		List<DistributionPlanLogEntity> reservationLogList = new ArrayList<>();
+		//进行预约计划日志
+		for (DistributionReservationEntity reservationEntity : reservationList) {
+			String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+				+"进行预约计划取消转配送;预约计划:"+reservationEntity.getReservationCode()
+				+"车次号:"+deliveryListEntity.getTrainNumber();
+			DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity();
+			reservationPlanLogEntity.setContent(reservationContent);
+			reservationPlanLogEntity.setRefId(reservationEntity.getId());
+			reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+			reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+			reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+			reservationPlanLogEntity.setOperator(user.getNickName());
+			reservationPlanLogEntity.setType(1);
+			reservationLogList.add(reservationPlanLogEntity);
+		}
+		if (!reservationLogList.isEmpty()) {
+			distributionPlanLogService.saveBatch(reservationLogList);
+		}
+		String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+			+"取消市配配送计划;车次号:"+deliveryListEntity.getTrainNumber()
+			+"预约编号:["+reservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]";
+		DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
+		distributionPlanLogEntity.setContent(distributionContent);
+		distributionPlanLogEntity.setRefId(deliveryListEntity.getId());
+		distributionPlanLogEntity.setRefCode(deliveryListEntity.getTrainNumber());
+		distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+		distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+		distributionPlanLogEntity.setOperator(user.getNickName());
+		distributionPlanLogEntity.setType(3);
+		distributionPlanLogService.save(distributionPlanLogEntity);
+
+	}
+
 	@Override
 	public List<DistributionReservationStocklistVO> selectDistributionDeliveryinventory(IPage<Object> page, Map<String, Object> distributionInventoryDTO) {
 		if (Func.isEmpty(distributionInventoryDTO.get("deliveryId"))) {

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

@@ -0,0 +1,38 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service.impl;
+
+import com.logpm.distribution.entity.DistributionPlanLogEntity;
+import com.logpm.distribution.mapper.DistributionPlanLogMapper;
+import com.logpm.distribution.service.IDistributionPlanLogService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 通知提货记录 服务实现类
+ *
+ * @author cyz
+ * @since 2023-06-14
+ */
+@Service
+@AllArgsConstructor
+public class DistributionPlanLogServiceImpl extends BaseServiceImpl<DistributionPlanLogMapper, DistributionPlanLogEntity> implements IDistributionPlanLogService {
+
+
+
+}

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

@@ -38,23 +38,7 @@ import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.dto.DistributionStockListDTO;
 import com.logpm.distribution.dto.DistributionStockupDTO;
-import com.logpm.distribution.entity.DisStockListDetailEntity;
-import com.logpm.distribution.entity.DistributionDeliveryListEntity;
-import com.logpm.distribution.entity.DistributionDeliverySelfEntity;
-import com.logpm.distribution.entity.DistributionDeliveryTripartiteEntity;
-import com.logpm.distribution.entity.DistributionLoadscanEntity;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
-import com.logpm.distribution.entity.DistributionParcelNumberEntity;
-import com.logpm.distribution.entity.DistributionReservationEntity;
-import com.logpm.distribution.entity.DistributionReservationPackageEntity;
-import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
-import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
-import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity;
-import com.logpm.distribution.entity.DistributionSignforEntity;
-import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.entity.DistributionStockListEntity;
-import com.logpm.distribution.entity.DistributionStockupEntity;
-import com.logpm.distribution.entity.DistributionStockupInfoEntity;
+import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.mapper.DisStockListDetailMapper;
 import com.logpm.distribution.mapper.DistributionLoadscanMapper;
@@ -69,24 +53,7 @@ import com.logpm.distribution.mapper.DistributionStockListMapper;
 import com.logpm.distribution.mapper.DistributionStockMapper;
 import com.logpm.distribution.mapper.DistributionStockupInfoMapper;
 import com.logpm.distribution.mapper.DistributionStockupMapper;
-import com.logpm.distribution.service.IDisStockListDetailService;
-import com.logpm.distribution.service.IDistributionAsyncService;
-import com.logpm.distribution.service.IDistributionDeliveryListService;
-import com.logpm.distribution.service.IDistributionDeliverySelfService;
-import com.logpm.distribution.service.IDistributionDeliveryTripartiteService;
-import com.logpm.distribution.service.IDistributionLoadscaninvnService;
-import com.logpm.distribution.service.IDistributionParcelListService;
-import com.logpm.distribution.service.IDistributionParcelNumberService;
-import com.logpm.distribution.service.IDistributionReservationPackageService;
-import com.logpm.distribution.service.IDistributionReservationService;
-import com.logpm.distribution.service.IDistributionReservationStockarticleService;
-import com.logpm.distribution.service.IDistributionReservationStocklistService;
-import com.logpm.distribution.service.IDistributionReservationZeroPackageService;
-import com.logpm.distribution.service.IDistributionSignforService;
-import com.logpm.distribution.service.IDistributionStockArticleService;
-import com.logpm.distribution.service.IDistributionStockListService;
-import com.logpm.distribution.service.IDistributionStockupInfoService;
-import com.logpm.distribution.service.IDistributionStockupService;
+import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.DistributionParcelNumberVO;
 import com.logpm.distribution.vo.DistributionReservationOrderPackageVO;
@@ -301,6 +268,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Autowired
 	private IWarehouseGoodsAllocationClient warehouseGoodsAllocationClient;
 
+
+	@Autowired
+	private IDistributionPlanLogService distributionPlanLogService;
+
 //	@Autowired
 //	private IWarehouseWaybillClient warehouseWaybillClient;
 
@@ -1285,6 +1256,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			String collect = reservationEntityList.stream().filter(r -> ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","));
 			return R.fail(collect + "已进行配送  请移除");
 		}
+		//判断是否存在有取消的预约计划
+		boolean cancelMatch = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.yiquexiao.getValue().equals(r.getReservationStatus()));
+		if (cancelMatch) {
+			String collect = reservationEntityList.stream().filter(r -> ReservationStatusConstant.yiquexiao.getValue().equals(r.getReservationStatus())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","));
+			return R.fail(collect + "已进行配送  请移除");
+		}
 		boolean flag = reservationEntityList.stream().anyMatch(s -> s.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue()));
 		DistributionStockupEntity stockupEntity = null;
 		if (flag) {
@@ -1479,9 +1456,45 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionAsyncService.recordsReservationDeliveryLog(reservationEntityList, myCurrentWarehouse, user, distributionDeliveryListEntity, WorkNodeEnums.PLAN_DISTRIBUTION.getCode(), content);
 		//处理广播数据
 		handleBroadcast(distributionDeliveryListEntity,AuthUtil.getUser().getNickName(),new Date());
+		//日志记录
+		handleCreatedDistributionLog(distributionDeliveryListEntity,myCurrentWarehouse,user,reservationEntityList);
 		return R.status(true);
 	}
 
+	private void handleCreatedDistributionLog(DistributionDeliveryListEntity distributionDeliveryListEntity, BasicdataWarehouseEntity myCurrentWarehouse, BladeUser user, List<DistributionReservationEntity> reservationEntityList) {
+		List<DistributionPlanLogEntity> reservationLogList = new ArrayList<>();
+		//进行预约计划日志
+		for (DistributionReservationEntity reservationEntity : reservationEntityList) {
+			String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+				+"进行预约计划转配送;预约计划:"+reservationEntity.getReservationCode()
+				+"车次号:"+distributionDeliveryListEntity.getTrainNumber();
+			DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity();
+			reservationPlanLogEntity.setContent(reservationContent);
+			reservationPlanLogEntity.setRefId(reservationEntity.getId());
+			reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+			reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+			reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+			reservationPlanLogEntity.setOperator(user.getNickName());
+			reservationPlanLogEntity.setType(1);
+			reservationLogList.add(reservationPlanLogEntity);
+		}
+		if (!reservationLogList.isEmpty()) {
+			distributionPlanLogService.saveBatch(reservationLogList);
+		}
+		String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName()
+			+"创建市配配送计划;车次号:"+distributionDeliveryListEntity.getTrainNumber()
+			+"预约编号:["+reservationEntityList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"],总件数:"+distributionDeliveryListEntity.getDeliveryNumber();
+		DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
+		distributionPlanLogEntity.setContent(distributionContent);
+		distributionPlanLogEntity.setRefId(distributionDeliveryListEntity.getId());
+		distributionPlanLogEntity.setRefCode(distributionDeliveryListEntity.getTrainNumber());
+		distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+		distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+		distributionPlanLogEntity.setOperator(user.getNickName());
+		distributionPlanLogEntity.setType(3);
+		distributionPlanLogService.save(distributionPlanLogEntity);
+	}
+
 	/**
 	 * 处理广播数据
 	 * @param distributionDeliveryListEntity
@@ -1579,6 +1592,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//推翻原有的
 		Long id = distributionReservationDTO.getId();
 		DistributionReservationEntity reservationEntity = this.getById(id);
+		DistributionReservationEntity oldReservation = BeanUtil.copy(reservationEntity, DistributionReservationEntity.class);
 		//这里需要查询出这个预约原来的订单、包件信息
 		List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntities = distributionReservationStockarticleService.getBaseMapper().selectList(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, id).ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
 		Map<Long, List<DistributionReservationStockarticleEntity>> oldStockArticle = distributionReservationStockarticleEntities.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId));
@@ -2129,9 +2143,41 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		reservationEntity.setIsUrgent(distributionReservationDTO.getIsUrgent());
 		reservationEntity.setIsInstall(distributionReservationDTO.getIsInstall());
 		this.updateById(reservationEntity);
+		compareReservation(reservationEntity,oldReservation,AuthUtil.getUser(),myCurrentWarehouse);
+
 		return R.status(true);
 	}
 
+	/**
+	 * 比对预约计划
+	 * @param reservationEntity
+	 * @param oldReservation
+	 * @param user
+	 * @param myCurrentWarehouse
+	 */
+	private void compareReservation(DistributionReservationEntity reservationEntity, DistributionReservationEntity oldReservation, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse) {
+		Integer newPlanNum = reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum();
+		Integer oldPlanNum = oldReservation.getReservationNum() + oldReservation.getReservationStockListNum();
+			String planContent = user.getNickName()+"在"+myCurrentWarehouse.getName()
+			+"修改预约计划;预约计划编号:"+reservationEntity.getReservationCode()
+			+";收货单位:"+(reservationEntity.getReceivingUnit().equals(oldReservation.getReceivingUnit())?reservationEntity.getReceivingUnit():"由"+oldReservation.getReceivingUnit()+"变更为-->"+reservationEntity.getReceivingUnit())
+			+",收货人:"+(reservationEntity.getConsignee().equals(oldReservation.getConsignee())?reservationEntity.getConsignee():"由"+oldReservation.getConsignee()+"变更为-->"+reservationEntity.getConsignee())
+			+",联系电话:"+(reservationEntity.getDeliveryPhone().equals(oldReservation.getDeliveryPhone())?reservationEntity.getDeliveryPhone():"由"+oldReservation.getDeliveryPhone()+"变更为-->"+reservationEntity.getDeliveryPhone())
+			+",收货地址:"+(reservationEntity.getDeliveryAddress().equals(oldReservation.getDeliveryAddress())?reservationEntity.getDeliveryAddress():"由"+oldReservation.getDeliveryAddress()+"变更为-->"+reservationEntity.getDeliveryAddress())
+			+",计划件数:"+(newPlanNum.equals(oldPlanNum)?newPlanNum:"由"+oldPlanNum+"变更为-->"+newPlanNum);
+		DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
+		distributionPlanLogEntity.setContent(planContent);
+		distributionPlanLogEntity.setRefId(reservationEntity.getId());
+		distributionPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+		distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId());
+		distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName());
+		distributionPlanLogEntity.setOperator(user.getNickName());
+		distributionPlanLogEntity.setType(1);
+		distributionPlanLogService.save(distributionPlanLogEntity);
+
+
+	}
+
 	@Override
 	@Transactional
 	public R deliveryBusinessTask(DistributionDeliveryAllocationDTO allocationDTO) {
@@ -3390,9 +3436,32 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
 		reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 		distributionReservationMapper.updateById(reservationEntity);
+		//进行日志的添加
+		BladeUser user = AuthUtil.getUser();
+		handleCreatedReservationPlanLog(reservationEntity,user,myCurrentWarehouse);
 		return R.status(true);
 	}
 
+	private void handleCreatedReservationPlanLog(DistributionReservationEntity reservationEntity, BladeUser user,BasicdataWarehouseEntity warehouse) {
+		String planContent = user.getNickName()+"在"+warehouse.getName()
+			+"创建预约计划;预约计划编号:"+reservationEntity.getReservationCode()
+			+";收货单位:"+reservationEntity.getReceivingUnit()
+			+",收货人:"+reservationEntity.getConsignee()
+			+",联系电话:"+reservationEntity.getDeliveryPhone()
+			+",收货地址:"+reservationEntity.getDeliveryAddress()
+			+",计划件数:"+(reservationEntity.getReservationNum()+reservationEntity.getReservationStockListNum())
+			+",配送类型:"+(reservationEntity.getDeliveryWay().equals(DistributionTypeConstant.shangpei.getValue())?"商配":"市配");
+		DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
+		distributionPlanLogEntity.setContent(planContent);
+		distributionPlanLogEntity.setRefId(reservationEntity.getId());
+		distributionPlanLogEntity.setRefCode(reservationEntity.getReservationCode());
+		distributionPlanLogEntity.setWarehouseId(warehouse.getId());
+		distributionPlanLogEntity.setWarehouseName(warehouse.getName());
+		distributionPlanLogEntity.setOperator(user.getNickName());
+		distributionPlanLogEntity.setType(1);
+		distributionPlanLogService.save(distributionPlanLogEntity);
+	}
+
 	/**
 	 * 自提查询库存数量
 	 *

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java

@@ -9,6 +9,7 @@ import com.logpm.factory.mt.service.MtOrderLogFailRetryService;
 import com.logpm.factory.props.MtFactoryProperties;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -54,7 +55,7 @@ public class MtOrderLogFailRetryServiceImpl implements MtOrderLogFailRetryServic
 	protected final Integer SIGN_TYPE = 6;
 
 
-	@Async
+	@LogpmAsync("asyncExecutor")
 	@Override
 	public void retry(List<MtOrderLogEntity> waitData){
 		waitData.forEach(this::executeRetry);

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -113,7 +113,7 @@
         sc.name classifyName,
         sc.description classifyDesc,
         si.remark indicatorsRemark,
-        sc.examine_dept_id examineDeptId,
+        sc.create_dept examineDeptId,
         sc.examine_dept_name examineDeptName,
         psc.name parentClassifyName,
         psc.description parentClassifyDesc,

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@@ -17,6 +17,7 @@ import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDeptClient;
 import org.springblade.system.feign.IUserClient;
@@ -173,18 +174,22 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 		String endDateStr = indicatorsDTO.getEndDateStr();
 		String createDeptName = indicatorsDTO.getCreateDeptName();
 
-		Long createDept = deptClient.findIdByName(createDeptName);
+		if(StringUtil.isNotBlank(createDeptName)){
+			Long createDept = deptClient.findIdByName(createDeptName);
+			indicatorsDTO.setCreateDept(createDept);
+		}
+
 
 		Date start = CommonUtil.getStartByDateStr(startDateStr);
 		Date end = CommonUtil.getEndByDateStr(endDateStr);
 		indicatorsDTO.setStart(start);
 		indicatorsDTO.setEnd(end);
-		indicatorsDTO.setCreateDept(createDept);
+
 
 		List<ExportIndicatorsVO> list = baseMapper.selectExportList(indicatorsDTO);
 
 		for (ExportIndicatorsVO exportIndicatorsVO : list) {
-			Long deptId = exportIndicatorsVO.getCreateDept();
+			Long deptId = exportIndicatorsVO.getExamineDeptId();
 			String deptName = deptClient.findNameById(deptId);
 			exportIndicatorsVO.setCreateDeptName(deptName);
 			Long createUser = exportIndicatorsVO.getCreateUser();

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

@@ -175,6 +175,38 @@ public class TripartiteTransferController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/startCarsBefore")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "三方中转发车前验证", notes = "传入loadCarsDTO")
+	public R startCarsBefore(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############startCars: ";
+		log.info(method+"请求参数{}",loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(400,"多仓权限无法操作，请选择仓库");
+			}
+			if(Objects.isNull(loadId)){
+				log.warn(method+"三方中转id为空 loadId={}",loadId);
+				return R.fail(400,"三方中转id为空");
+			}
+
+
+			return carsLoadService.startCarsBefore(loadId,myCurrentWarehouse.getId());
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 	@ResponseBody
 	@PostMapping("/startCars")
 	@ApiOperationSupport(order = 1)
@@ -392,6 +424,7 @@ public class TripartiteTransferController {
 		String carNumber = carsLoadDTO.getCarNumber();
 		String remark = carsLoadDTO.getRemark();
 		String loadType = carsLoadDTO.getLoadType();
+		String deliveryType = carsLoadDTO.getDeliveryType();
 
 		try{
 
@@ -406,18 +439,26 @@ public class TripartiteTransferController {
 				log.warn(method+"配载id为空 loadId={}",loadId);
 				return R.fail(400,"配载id为空");
 			}
-			if(Objects.isNull(driverId)){
-				log.warn(method+"司机id为空 driverId={}",driverId);
-				return R.fail(400,"司机id为空");
-			}
 
-			if(StringUtil.isBlank(driverName)){
-				log.warn(method+"司机名称为空 driverName={}",driverName);
-				return R.fail(400,"司机名称为空");
+			if(StringUtil.isBlank(deliveryType)){
+				log.warn(method+"送货方式为空 deliveryType={}",deliveryType);
+				return R.fail(400,"送货方式为空");
 			}
-			if(StringUtil.isBlank(driverMobile)){
-				log.warn(method+"司机电话为空 driverMobile={}",driverMobile);
-				return R.fail(400,"司机电话为空");
+
+			if(deliveryType.equals("2")){
+				if(Objects.isNull(driverId)){
+					log.warn(method+"司机id为空 driverId={}",driverId);
+					return R.fail(400,"司机id为空");
+				}
+
+				if(StringUtil.isBlank(driverName)){
+					log.warn(method+"司机名称为空 driverName={}",driverName);
+					return R.fail(400,"司机名称为空");
+				}
+				if(StringUtil.isBlank(driverMobile)){
+					log.warn(method+"司机电话为空 driverMobile={}",driverMobile);
+					return R.fail(400,"司机电话为空");
+				}
 			}
 
 			if(StringUtil.isBlank(chargeType)){

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

@@ -171,4 +171,8 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
     List<ZeroNumVO> findZeroStartNum(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	List<Long> findAllIdListByLoadIdAndNoScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus);
+
+	List<LoadScanWaybillVO> findTransferLoadScanWaybillList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
 }

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

@@ -80,7 +80,8 @@
 
     <select id="loadingDetail" resultType="com.logpm.trunkline.vo.TrunklineCarsLoadScanVO">
         select cls.*,
-               lww.destination_warehouse_name
+               lww.destination_warehouse_name destinationWarehouseName,
+               cls.id carsLoadScanId
         from logpm_trunkline_cars_load_scan cls
         left join logpm_warehouse_waybill lww on cls.waybill_id = lww.id
         where cls.load_id = #{param.loadId}
@@ -496,6 +497,16 @@
         group by waybill_no
     </select>
 
+    <select id="findTransferLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
+        select waybill_no waybillNo,
+               sum(unload_num) num
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and warehouse_id = #{nodeId}
+          and waybill_no is not null
+        group by waybill_no
+    </select>
+
     <select id="findArriveLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
         select waybill_no waybillNo,
                sum(num) num
@@ -914,4 +925,11 @@
     </select>
 
 
+    <select id="findAllIdListByLoadIdAndNoScanStatus" resultType="java.lang.Long">
+        select id
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+        and scan_status != #{scanStatus}
+    </select>
+
 </mapper>

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

@@ -10,10 +10,12 @@ public interface IOpenOrderAsyncService {
 	void saveLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName);
 
 	void saveStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId);
+	void saveTripartiteStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId);
 
 	void saveCancelStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
 
 	void saveArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId);
+	void saveTripartiteArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId);
 
 	void saveCancelArriveCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
 

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

@@ -166,4 +166,8 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(Long loadId, Long warehouseId);
 
 	List<ZeroNumVO> findZeroStartNum(Long loadId, Long warehouseId);
+
+	List<Long> findAllIdListByLoadIdAndNoScanStatus(Long loadId, String scanStatus);
+
+	List<LoadScanWaybillVO> findTransferLoadScanWaybillList(Long loadId, Long nodeId);
 }

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

@@ -223,4 +223,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R selectEditDetailByLoadIdNoXz(Long loadId);
 
 	R signOrderZeroSuppleList(LoadCarsDTO loadCarsDTO);
+
+	R startCarsBefore(Long loadId, Long warehouseId);
 }

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

@@ -170,6 +170,51 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 	}
 
 
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void saveTripartiteStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId) {
+		Long loadId = carsLoadLineEntity.getLoadId();
+		Integer sort = carsLoadLineEntity.getSort();
+
+		String tenantId = AuthUtil.getTenantId();
+		BladeUser user = AuthUtil.getUser();
+//		DynamicDataSourceContextHolder.push(tenantId);
+
+		TrunklineCarsLoadEntity carsLoadEntity = trunklineCarsLoadService.getById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("##############saveStartCarLog: 配载信息不存在 loadId={}",loadId);
+			return;
+		}
+		String carsNo = carsLoadEntity.getCarsNo();
+		String carNumber = carsLoadEntity.getCarNumber();
+		String driverName = carsLoadEntity.getDriverName();
+		String driverMobile = carsLoadEntity.getDriverMobile();
+
+		Long nodeId = carsLoadLineEntity.getNodeId();
+		String nodeName = carsLoadLineEntity.getNodeName();
+
+		List<LoadScanWaybillVO> list = trunklineCarsLoadScanService.findTransferLoadScanWaybillList(loadId,nodeId);
+
+		for (LoadScanWaybillVO loadScanWaybillVO : list) {
+			String waybillNo = loadScanWaybillVO.getWaybillNo();
+			Integer num = loadScanWaybillVO.getNum();
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if(Objects.isNull(waybillEntity)){
+				log.warn("##############saveStartCarLog: 运单信息不存在 waybillNo={}",waybillNo);
+				continue;
+			}
+			Long waybillId = waybillEntity.getId();
+
+			String operationRemark = "运单装车"+num+"件  三方中转批次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+"，司机手机："+driverMobile;
+			saveLog(waybillId,waybillNo,"30",nodeName+" 三方中转装车",operationRemark,nickName,userId,nodeId,nodeName);
+
+			operationRemark = "三方中转从"+nodeName+"发车，实际发车时间"+ CommonUtil.dateToStringGeneral(new Date());
+			saveLog(waybillId,waybillNo,"40",nodeName+"已发车",operationRemark,nickName,userId,nodeId,nodeName);
+		}
+
+	}
+
+
 	private void saveTrackLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId,String warehouseName) {
 		TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
 		waybillTrackEntity.setWarehouseId(warehouseId);
@@ -249,6 +294,36 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		}
 	}
 
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void saveTripartiteArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId) {
+		Long loadId = carsLoadLineEntity.getLoadId();
+		TrunklineCarsLoadEntity carsLoadEntity = trunklineCarsLoadService.getById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("##############saveCancelStartCarLog: 配载信息不存在 loadId={}",loadId);
+			return;
+		}
+
+		Long nodeId = carsLoadLineEntity.getNodeId();
+		String nodeName = carsLoadLineEntity.getNodeName();
+
+
+		List<LoadScanWaybillVO> list = trunklineCarsLoadScanService.findArriveLoadScanWaybillList(loadId,nodeId);
+
+		for (LoadScanWaybillVO loadScanWaybillVO : list) {
+			String waybillNo = loadScanWaybillVO.getWaybillNo();
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if(Objects.isNull(waybillEntity)){
+				log.warn("##############saveCancelStartCarLog: 运单信息不存在 waybillNo={}",waybillNo);
+				continue;
+			}
+			Long waybillId = waybillEntity.getId();
+
+			String operationRemark = "三方中转到达"+nodeName+"，到达时间"+ CommonUtil.dateToStringGeneral(new Date());
+			saveLog(waybillId,waybillNo,"60",nodeName+" 三方中转到达",operationRemark,nickName,userId,nodeId,nodeName);
+		}
+	}
+
 	@LogpmAsync("asyncExecutor")
 	@Override
 	public void saveCancelArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId) {

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

@@ -404,4 +404,14 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findZeroStartNum(loadId,warehouseId);
 	}
 
+	@Override
+	public List<Long> findAllIdListByLoadIdAndNoScanStatus(Long loadId, String scanStatus) {
+		return baseMapper.findAllIdListByLoadIdAndNoScanStatus(loadId,scanStatus);
+	}
+
+	@Override
+	public List<LoadScanWaybillVO> findTransferLoadScanWaybillList(Long loadId, Long nodeId) {
+		return baseMapper.findTransferLoadScanWaybillList(loadId,nodeId);
+	}
+
 }

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

@@ -1719,6 +1719,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.data(pageList);
 	}
 
+	@Override
+	public R startCarsBefore(Long loadId, Long warehouseId) {
+		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("load_id",loadId);
+
+		List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+		Integer loadingNum = carsLoadScanEntityList.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum();
+		Integer unloadNum = carsLoadScanEntityList.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum();
+
+		Map<String,Integer> map = new HashMap<>();
+		map.put("loadingNum",loadingNum);
+		map.put("unloadNum",unloadNum);
+
+		return R.data(map);
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
@@ -2355,10 +2371,65 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		try {
 			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.FIRST_START_CARS_LOAD.getValue());
 
-			List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId);
+			openOrderAsyncService.saveTripartiteStartCarLog(carsLoadLineEntity, AuthUtil.getNickName(), AuthUtil.getUserId());
 
-			String content = "包件在 " + warehouseEntity.getName() + "三方中转发车";
-			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART.getCode(), content);
+			List<String> orderPackageCodes = new ArrayList<>();
+			List<String> noUnloadOrderPackageCodes = new ArrayList<>();
+
+				//处理三方中转未卸车数据
+			QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("load_id",loadId);
+			List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+			//把carsLoadScanEntityList中所有元素通过type进行分组
+			//通过type分组区分零担和包件
+			Map<Integer, List<TrunklineCarsLoadScanEntity>> carsLoadScanEntityMap = carsLoadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType));
+			carsLoadScanEntityMap.keySet().forEach(type -> {
+				List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = carsLoadScanEntityMap.get(type);
+				if(type == 1){
+					//包件
+					trunklineCarsLoadScanEntities.forEach(trunklineCarsLoadScanEntity -> {
+						String scanCode = trunklineCarsLoadScanEntity.getScanCode();
+						Integer num = trunklineCarsLoadScanEntity.getNum();
+						Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum();
+						Integer isData = trunklineCarsLoadScanEntity.getIsData();
+						if(unloadNum == num){
+							orderPackageCodes.add(scanCode);
+						}else{
+							//未卸车包件
+							if(isData == 1){
+								noUnloadOrderPackageCodes.add(scanCode);
+							}
+						}
+					});
+				}else if(type == 2){
+					//零担
+					//把trunklineCarsLoadScanEntities通过orderCode进行分组
+					//通过orderCode分组
+					Map<String, List<TrunklineCarsLoadScanEntity>> orderCodeMap = trunklineCarsLoadScanEntities.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getOrderCode));
+					orderCodeMap.keySet().forEach(orderCode -> {
+						List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities1 = orderCodeMap.get(orderCode);
+						Integer loadingNum = trunklineCarsLoadScanEntities1.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum();
+						Integer unloadNum = trunklineCarsLoadScanEntities1.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum();
+						int i = loadingNum - unloadNum;
+
+						DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId);
+						if(!Objects.isNull(stockArticleEntity)){
+							distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(), i);
+						}
+					});
+				}
+			});
+
+
+			if(CollUtil.isNotEmpty(orderPackageCodes)){
+				String content = "包件在 " + warehouseEntity.getName() + "三方中转发车";
+				packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART.getCode(), content);
+			}
+
+			if(CollUtil.isNotEmpty(noUnloadOrderPackageCodes)){
+				String content = "包件在 " + warehouseEntity.getName() + "三方中转取消装车";
+				packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), noUnloadOrderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+			}
 
 		} catch (Exception e) {
 			log.warn("#############startCarByLoadId: 存入日志失败");
@@ -2493,6 +2564,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.END_ARRIVE_CARS_LOAD.getValue());
 			List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId);
 
+			openOrderAsyncService.saveTripartiteArriveCarLog(carsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
+
 			String content = "包件在 " + warehouseEntity.getName() + "三方中转到达";
 			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.ARRICE_TRIPARTITE_TRANSFER_DEPART.getCode(), content);
 
@@ -2535,27 +2608,30 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400, "三方中转节点不存在");
 		}
 
-		carsLoadEntity.setSignTime(new Date());
-		carsLoadEntity.setLoadStatus("90");
-		updateById(carsLoadEntity);
 
-		trunklineCarsLoadScanService.updateScanStatusByLoadId(loadId, "3", new Date(),AuthUtil.getNickName());
+		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3");
 
-		try {
-			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.TRIPARTITE_TRANSFER_SIGN.getValue());
+		return signLoadScanByIds(scanLoadIds,warehouseId);
 
-			List<String> orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodes(loadId);
-
-			String content = "包件在" + warehouseEntity.getName() + "被三方中转整车签收";
-			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(), content);
-			// 推送签收数据给工厂
-			sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity);
-		} catch (Exception e) {
-			log.warn("###########存入日志失败");
-		}
-
-
-		return R.success("签收成功");
+//		carsLoadEntity.setSignTime(new Date());
+//		carsLoadEntity.setLoadStatus("90");
+//		updateById(carsLoadEntity);
+//
+//		trunklineCarsLoadScanService.updateScanStatusByLoadId(loadId, "3", new Date(),AuthUtil.getNickName());
+//
+//		try {
+//			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.TRIPARTITE_TRANSFER_SIGN.getValue());
+//
+//			List<String> orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodes(loadId);
+//
+//			String content = "包件在" + warehouseEntity.getName() + "被三方中转整车签收";
+//			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(), content);
+//			// 推送签收数据给工厂
+//			sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity);
+//		} catch (Exception e) {
+//			log.warn("###########存入日志失败");
+//		}
+//		return R.success("签收成功");
 	}
 
 	@Override
@@ -3647,6 +3723,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("##########addZeroSupple: 配载计划信息不存在 loadId={}", loadId);
 			return R.fail(405, "配载计划信息不存在");
 		}
+		String carsNo = carsLoadEntity.getCarsNo();
+		String carNumber = carsLoadEntity.getCarNumber();
+		String driverName = carsLoadEntity.getDriverName();
+		String driverMobile = carsLoadEntity.getDriverMobile();
 
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(carsLoadLineEntity)) {
@@ -3654,6 +3734,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划节点信息不存在");
 		}
 
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("##########addZeroSupple: 仓库信息不存在 warehouseId={}", warehouseId);
+			return R.fail(405, "仓库信息不存在");
+		}
+
+		String warehouseName = warehouseEntity.getName();
+
 		for (ZeroSuppleVO zeroSuppleVO : zeroSuppleList) {
 			String waybillNo = zeroSuppleVO.getWaybillNo();
 			String orderCode = zeroSuppleVO.getOrderCode();
@@ -3666,6 +3754,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##########addZeroSupple: 运单信息不存在 loadId={} waybillNo={}", loadId, waybillNo);
 				return R.fail(405, "运单信息不存在");
 			}
+			Long waybillId = warehouseWaybillEntity.getId();
 
 			DistributionStockArticleEntity zeroStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId);
 			if (Objects.isNull(zeroStockArticleEntity)) {
@@ -3707,6 +3796,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			distributionStockArticleClient.saveOrUpdate(zeroStockArticleEntity);
 
+			waybillPackageService.updateWaybillStatus(warehouseWaybillEntity);
+
+			String operationRemark = "运单 补录装车"+enterNum+"件  干线批次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+"，司机手机："+driverMobile;
+			openOrderAsyncService.saveLog(waybillId,waybillNo,"30",warehouseName+" 干线补录装车",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
+
 			if(!Objects.isNull(signOrderId)){
 				updateSignOrderNumBySignOrderId(signOrderId);
 //				TrunklineLoadSignOrderEntity signOrderEntity = trunklineLoadSignOrderService.getById(signOrderId);
@@ -5202,6 +5296,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("##############signScanPackageCode: 仓库信息不存在 warehouseId={}", warehouseId);
 			return R.fail(405, "仓库信息不存在");
 		}
+		String warehouseName = warehouseEntity.getName();
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if (Objects.isNull(carsLoadEntity)) {
@@ -5211,6 +5306,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		String carsNo = carsLoadEntity.getCarsNo();
 
+		Long waybillId = null;
+
 		Date date = new Date();
 		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
 		if (Objects.isNull(carsLoadScanEntity)) {
@@ -5230,6 +5327,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					inComingService.incomingPackage(inComingDTO);
 
 					String orderCode = trunklineAdvanceDetail.getOrderCode();
+					String waybillNo = trunklineAdvanceDetail.getWaybillNo();
+					waybillId = trunklineAdvanceDetail.getWaybillId();
 
 					DistributionParcelListEntity distributionParcelList = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 					if(!Objects.isNull(distributionParcelList)){
@@ -5248,6 +5347,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						carsLoadScanEntity.setLoadCode(carsNo);
 						carsLoadScanEntity.setWarehouseId(warehouseId);
 						carsLoadScanEntity.setWarehouseName(warehouseEntity.getName());
+						carsLoadScanEntity.setOrderCode(orderCode);
+						carsLoadScanEntity.setWaybillId(waybillId);
+						carsLoadScanEntity.setWaybillNo(waybillNo);
 						carsLoadScanEntity.setScanCode(orderPackageCode);
 						carsLoadScanEntity.setScanStatus("3");
 						carsLoadScanEntity.setNum(1);
@@ -5294,7 +5396,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				Long wid = parcelListEntity.getWarehouseId();
 				String wName = parcelListEntity.getWarehouse();
 				String waybillNumber = parcelListEntity.getWaybillNumber();
-				Long waybillId = parcelListEntity.getWaybillId();
+				waybillId = parcelListEntity.getWaybillId();
 				String orderCode = parcelListEntity.getOrderCode();
 				Long stockArticleId = parcelListEntity.getStockArticleId();
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
@@ -5399,6 +5501,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				carsLoadScanEntity.setSignAbnormal(0);
 			}
 
+			waybillId = carsLoadScanEntity.getWaybillId();
+
 //			Long wid = carsLoadScanEntity.getWarehouseId();
 //			if (!wid.equals(warehouseId)) {
 //				log.warn("##############signScanPackageCode: 包件不在签收计划中 loadId={},orderPackageCode={} scanStatus={}", loadId, orderPackageCode, scanStatus);
@@ -5426,6 +5530,26 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		List<String> orderPackageCodes = new ArrayList<>();
 		try {
+//			if(!Objects.isNull(waybillId)){
+//				WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+//				waybillPackageService.updateWaybillStatus(waybillEntity);
+//				WaybillLogDTO waybillLogDTO = new WaybillLogDTO();
+//				waybillLogDTO.setWarehouseId(warehouseId);
+//				waybillLogDTO.setWarehouseName(warehouseName);
+//				waybillLogDTO.setWaybillNo(waybillEntity.getWaybillNo());
+//				waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo());
+//				waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber());
+//				waybillLogDTO.setSignUser(AuthUtil.getNickName());
+//				waybillLogDTO.setSignTime(date);
+//				waybillLogDTO.setDriverName(carsLoadEntity.getDriverName());
+//				waybillLogDTO.setNum(unloadNum);
+//				waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo());
+//				waybillLogDTO.setType(1);
+//				waybillLogDTO.setUserId(AuthUtil.getUserId());
+//				waybillLogDTO.setNickName(AuthUtil.getNickName());
+//				waybillTrackService.addSignWaybillLog(waybillLogDTO);
+//			}
+
 			orderPackageCodes.add(orderPackageCode);
 			String content = "包件在 " + warehouseEntity.getName() + "直发商家签收";
 			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_DIRECT_SHIPPER.getCode(), content);
@@ -5474,8 +5598,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			signOrderEntity.setSignStatus("20");
 			signOrderEntity.setSignTime(new Date());
 		} else {
-			signOrderEntity.setSignStatus("10");
-			signOrderEntity.setSignTime(new Date());
+			if(signNum == 0){
+				signOrderEntity.setSignStatus("0");
+			}else{
+				signOrderEntity.setSignStatus("10");
+				signOrderEntity.setSignTime(new Date());
+			}
 		}
 		trunklineLoadSignOrderService.updateById(signOrderEntity);
 
@@ -5528,6 +5656,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "签收数量不能大于当前数据的装车数量");
 		}
 
+
+
 		carsLoadScanEntity.setScanStatus("3");
 		carsLoadScanEntity.setUnloadNum(enterNum);
 		carsLoadScanEntity.setUnloadAbnormal(0);
@@ -5550,6 +5680,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//重新计算签收单的数量
 		updateSignOrderNumBySignOrderId(signOrderId);
 
+		Long waybillId = carsLoadScanEntity.getWaybillId();
+		if(!Objects.isNull(waybillId)){
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+			waybillPackageService.updateWaybillStatus(waybillEntity);
+		}
+
 //		return Resp.scanSuccess("签收成功",enterNum+"件");
 		return R.success("签收成功");
 
@@ -6028,6 +6164,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 		Integer realLoadingNumber = carsLoadEntity.getRealLoadingNumber();
+		String deliveryType = carsLoadEntity.getDeliveryType();
 
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(warehouseEntity)) {
@@ -6067,26 +6204,32 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Map<String, List<TrunklineCarsLoadScanEntity>> map = trunklineCarsLoadScanEntities.stream().filter(t -> Objects.nonNull(t.getWaybillNo())).collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getWaybillNo));
 			map.keySet().forEach(waybillNo -> {
 				List<TrunklineCarsLoadScanEntity> list = map.get(waybillNo);
-				//把list中所有元素的unloadNum求和，没有值就取0
-				Integer unloadNum = list.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum();
-
-				WaybillLogDTO waybillLogDTO = new WaybillLogDTO();
-				waybillLogDTO.setWarehouseId(warehouseId);
-				waybillLogDTO.setWarehouseName(warehouseName);
-				waybillLogDTO.setWaybillNo(waybillNo);
-				waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo());
-				waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber());
-				waybillLogDTO.setSignUser(AuthUtil.getNickName());
-				waybillLogDTO.setSignTime(date);
-				waybillLogDTO.setDriverName(carsLoadEntity.getDriverName());
-				waybillLogDTO.setNum(unloadNum);
-				waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo());
-				waybillLogDTO.setType(1);
-				waybillLogDTO.setUserId(AuthUtil.getUserId());
-				waybillLogDTO.setNickName(AuthUtil.getNickName());
-				waybillTrackService.addSignWaybillLog(waybillLogDTO);
-			});
+				Integer signNum = 0;
+				if("1".equals(deliveryType)){
+					signNum = list.stream().mapToInt(t -> Objects.nonNull(t.getNum()) ? t.getNum() : 0).sum();
+				}else if("2".equals(deliveryType)){
+					signNum = list.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum();
+				}
 
+				if(signNum > 0){
+					WaybillLogDTO waybillLogDTO = new WaybillLogDTO();
+					waybillLogDTO.setWarehouseId(warehouseId);
+					waybillLogDTO.setWarehouseName(warehouseName);
+					waybillLogDTO.setWaybillNo(waybillNo);
+					waybillLogDTO.setTrainNumber(carsLoadEntity.getCarsNo());
+					waybillLogDTO.setCarNumber(carsLoadEntity.getCarNumber());
+					waybillLogDTO.setSignUser(AuthUtil.getNickName());
+					waybillLogDTO.setSignTime(date);
+					waybillLogDTO.setDriverName(carsLoadEntity.getDriverName());
+					waybillLogDTO.setNum(signNum);
+					waybillLogDTO.setSignOrderCode(carsLoadEntity.getCarsNo());
+					waybillLogDTO.setType(1);
+					waybillLogDTO.setUserId(AuthUtil.getUserId());
+					waybillLogDTO.setNickName(AuthUtil.getNickName());
+					waybillTrackService.addSignWaybillLog(waybillLogDTO);
+				}
+
+			});
 
 		} catch (Exception e) {
 			log.warn("###########存入日志失败");
@@ -6395,7 +6538,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				List<WaybillLogDTO> waybillLogDTOList = new ArrayList<>();
 
 				QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper1 = new QueryWrapper<>();
-				queryWrapper1.eq("load_id",warehouseId)
+				queryWrapper1.eq("load_id",loadId)
 					.eq("sign_order_id",signOrderId)
 					.eq("scan_status","3");
 				List<TrunklineCarsLoadScanEntity> signCarsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper1);

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

@@ -100,6 +100,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 			case 3:
 				typeStr = "配送签收";
 				break;
+			case 4:
+				typeStr = "自提签收";
+				break;
 			default:
 				typeStr = "未知签收";
 		}
@@ -114,7 +117,6 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 		String operationRemark = warehouseName+" "+typeStr+num+"件，车次号："+trainNumber+"，司机："+driverName+"，车牌号："+carNumber+"，签收人"+ signUser+"，签收单："+signOrderCode+"，签收时间"+ CommonUtil.dateToStringGeneral(signTime);
 		openOrderAsyncService.saveLog(waybillId,waybillNo,"100",warehouseName+" "+typeStr,operationRemark,nickName,userId,warehouseId,warehouseName);
 		if(type != 2){
-			warehouseWaybillEntity.setWaybillStatus("100");
 
 			//需要更新运单的状态
 			TrunklineWaybillOrderEntity waybillOrderEntity = waybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo, waybillNo);
@@ -124,11 +126,20 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 				Integer handleNumber = waybillOrderEntity.getHandleNumber();
 				int i = handleNumber + num;
 				if(waybillStatusInt < 90){
+					if(num == totalCount){
+						warehouseWaybillEntity.setWaybillStatus("100");
+						waybillOrderEntity.setHandleNumber(num);
+					}else{
+						warehouseWaybillEntity.setWaybillStatus("90");
+						waybillOrderEntity.setHandleNumber(num);
+					}
+					warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
+					waybillOrderService.updateById(waybillOrderEntity);
+				}else if(waybillStatusInt == 90){
 					if(i == totalCount){
 						warehouseWaybillEntity.setWaybillStatus("100");
 						waybillOrderEntity.setHandleNumber(i);
 					}else{
-						warehouseWaybillEntity.setWaybillStatus("90");
 						waybillOrderEntity.setHandleNumber(i);
 					}
 					warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
@@ -168,6 +179,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 			case 3:
 				typeStr = "配送签收";
 				break;
+			case 4:
+				typeStr = "自提签收";
+				break;
 			default:
 				typeStr = "未知签收";
 		}