1.干线-车辆配载，三方中转bug及需求更新

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalRecordClient.java

@@ -22,8 +22,10 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 货位 Feign接口类
@@ -43,7 +45,8 @@ public interface IAftersalesAbnormalRecordClient {
     void addAbnormalRecord(@RequestBody AftersalesAbnormalRecordEntity warehouseAbnormalRecordEntity);
 
 	@GetMapping(API_PREFIX+"/findAbnormalList")
-	List<AftersalesAbnormalRecordEntity> findAbnormalList(String carsNo);
+	List<AftersalesAbnormalRecordEntity> findAbnormalList(@RequestParam("carsNo") String carsNo);
-
 
+	@GetMapping(API_PREFIX+"/findListByCarsNoAndUpWarehouseId")
+    Map<String, Integer> findListByCarsNoAndUpWarehouseId(@RequestParam("carsNo") String carsNo, @RequestParam("warehouseId") Long warehouseId);
 }

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

@@ -198,4 +198,8 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	/** 签收时间 */
 	@ApiModelProperty(name = "签收时间",notes = "")
 	private Date signTime;
+
+	/** 直发商家个数 */
+	@ApiModelProperty(name = "直发商家个数",notes = "")
+	private Integer customerNum;
 }

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

@@ -156,5 +156,17 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity {
 	/** 路桥费 */
 	@ApiModelProperty(name = "路桥费",notes = "")
 	private BigDecimal tollFee ;
+	/** 卸车报告状态0无 1有 */
+	@ApiModelProperty(name = "卸车报告状态0无 1有",notes = "")
+	private Integer unloadReportStatus;
+	/** 卸车报告第一段 */
+	@ApiModelProperty(name = "卸车报告第一段",notes = "")
+	private String reportOne;
+	/** 卸车报告第二段 */
+	@ApiModelProperty(name = "卸车报告第二段",notes = "")
+	private String reportTwo;
+	/** 卸车报告第三段 */
+	@ApiModelProperty(name = "卸车报告第三段",notes = "")
+	private String reportThree;
 
 }

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

@@ -0,0 +1,17 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UnloadReportVO implements Serializable {
+
+	private Integer loadingNum;
+	private Integer unloadNum;
+	private Integer noDataNum;
+	private Integer noPlanNum;
+	private Integer noUnloadNum;
+	private Integer manualNum;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalRecordClient.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Map;
 
 @ApiIgnore()
 @RestController
@@ -28,4 +29,9 @@ public class AftersalesAbnormalRecordClient implements IAftersalesAbnormalRecord
 			.eq("abnormal_status",0);
 		return aftersalesAbnormalRecordService.list(queryWrapper);
 	}
+
+	@Override
+	public Map<String, Integer> findListByCarsNoAndUpWarehouseId(String carsNo, Long warehouseId) {
+		return aftersalesAbnormalRecordService.findListByCarsNoAndUpWarehouseId(carsNo,warehouseId);
+	}
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.java

@@ -7,10 +7,13 @@ import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 @Mapper
 public interface AftersalesAbnormalRecordMapper extends BaseMapper<AftersalesAbnormalRecordEntity> {
 
 
 	IPage<AftersalesAbnormalRecordEntity> findPageList(IPage<Object> page, @Param("param") AbnormalRecordDTO abnormalRecordDTO);
 
+    Map<String, Integer> findListByCarsNoAndUpWarehouseId(@Param("carsNo") String carsNo, @Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml

@@ -42,4 +42,12 @@
         order by up_time desc
     </select>
 
+    <select id="findListByCarsNoAndUpWarehouseId" resultType="java.util.Map">
+        select sum(IF(abnormal_status != 1,1,0)) dealwithNum,
+               sum(IF(abnormal_status = 1,1,0)) noDealwithNum
+        from logpm_aftersales_abnormal_record
+        where cars_no = #{carsNo}
+        and up_warehouse_id = #{warehouseId}
+    </select>
+
 </mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalRecordService.java

@@ -5,9 +5,12 @@ import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
+import java.util.Map;
+
 public interface IAftersalesAbnormalRecordService extends BaseService<AftersalesAbnormalRecordEntity> {
 	R findPageList(AbnormalRecordDTO abnormalRecordDTO);
 
 	R dealAbnormal(AbnormalRecordDTO abnormalRecordDTO);
 
+    Map<String, Integer> findListByCarsNoAndUpWarehouseId(String carsNo, Long warehouseId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -15,6 +15,7 @@ import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.Map;
 import java.util.Objects;
 
 @Slf4j
@@ -75,4 +76,9 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 
 		return R.success("处理成功");
 	}
+
+	@Override
+	public Map<String, Integer> findListByCarsNoAndUpWarehouseId(String carsNo, Long warehouseId) {
+		return baseMapper.findListByCarsNoAndUpWarehouseId(carsNo,warehouseId);
+	}
 }

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

@@ -2285,6 +2285,35 @@ public class CarsLoadController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findWarehouseUnloadReport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询运配载节点卸车报告", notes = "传入loadCarsDTO")
+	public R findWarehouseUnloadReport(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############findWarehouseUnloadReport: ";
+		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(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(ObjectUtil.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
 
+			return carsLoadService.findWarehouseUnloadReport(loadCarsDTO);
+		}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,"系统异常");
+		}
+	}
 
 }

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

@@ -130,4 +130,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     List<LoadingDetailExportVO> loadingDetailExport(@Param("param") LoadCarsDTO loadCarsDTO);
 
 	Integer findSignNumByLoadId(@Param("loadId") Long loadId);
+
+    UnloadReportVO findUnloadReport(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 }

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

@@ -628,4 +628,17 @@
           and scan_status = '3'
     </select>
 
+
+    <select id="findUnloadReport" resultType="com.logpm.trunkline.vo.UnloadReportVO">
+        select sum(IF(ltcls.final_node_id = #{warehouseId},ltcls.num,0)) loadingNum,
+               sum(IF(ltcls.unload_node_id = #{warehouseId},ltcls.num,0)) unloadNum,
+               sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1' and ltcls.is_data = 0,ltcls.num,0)) noDataNum,
+               sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1' and ltco.id is null,ltcls.num,0)) noPlanNum,
+               sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status = '1',ltcls.num,0))+sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1',ltcls.num-ltcls.unload_num,0)) noUnloadNum,
+               sum(IF(ltcls.unload_node_id = #{warehouseId} and ltcls.type = 2 and ltcls.scan_status = '1',ltcls.unload_num,0)) manualNum
+        from logpm_trunkline_cars_load_scan ltcls
+                 left join logpm_trunkline_cars_order ltco on ltco.waybill_id = ltcls.waybill_id and ltco.order_code = ltcls.order_code
+        where ltcls.load_id = #{loadId}
+    </select>
+
 </mapper>

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

@@ -125,4 +125,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
     List<LoadingDetailExportVO> loadingDetailExport(LoadCarsDTO loadCarsDTO);
 
 	Integer findSignNumByLoadId(Long loadId);
+
+	UnloadReportVO findUnloadReport(Long loadId, Long warehouseId);
 }

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

@@ -212,4 +212,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R tripartiteTransferUploadSignPhoto(LoadCarsDTO loadCarsDTO);
 
+	R findWarehouseUnloadReport(LoadCarsDTO loadCarsDTO);
+
 }

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

@@ -8,6 +8,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.trunkline.entity.*;
 import com.logpm.trunkline.service.*;
+import com.logpm.trunkline.vo.UnloadReportVO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +38,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	@Autowired
 	private ITrunklineCarsLoadScanService trunklineCarsLoadScanService;
 	@Autowired
+	private ITrunklineCarsLoadLineService trunklineCarsLoadLineService;
+	@Autowired
 	private IWarehouseWaybillClient warehouseWaybillClient;
 	@Autowired
 	private ITrunklineCostShareRecordService trunklineCostShareRecordService;
@@ -403,6 +406,17 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	@Async
 	@Override
 	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId) {
+
+		UnloadReportVO unloadReportVO = trunklineCarsLoadScanService.findUnloadReport(loadId,warehouseId);
+		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
+		if(!Objects.isNull(carsLoadLineEntity)){
+			carsLoadLineEntity.setUnloadReportStatus(1);
+			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件");
+			carsLoadLineEntity.setReportTwo("无基础数据货物 "+unloadReportVO.getNoDataNum()+" 件、非计划内货物 "+unloadReportVO.getNoPlanNum()+" 件、少货 "+unloadReportVO.getNoUnloadNum()+" 件、手动确认入库 "+unloadReportVO.getManualNum()+" 件");
+			trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
+		}
+
+
 		List<TrunklineCarsLoadScanEntity> noUnloadList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoUnloadList(loadId,warehouseId);
 		for (TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity : noUnloadList) {
 			String loadCode = trunklineCarsLoadScanEntity.getLoadCode();

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

@@ -308,4 +308,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findSignNumByLoadId(loadId);
 	}
 
+	@Override
+	public UnloadReportVO findUnloadReport(Long loadId, Long warehouseId) {
+		return baseMapper.findUnloadReport(loadId,warehouseId);
+	}
+
 }

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

@@ -449,6 +449,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsOrderService.updateBatchById(ls);
 		}
 
+		carsLoadEntity.setCustomerNum(CollUtil.isEmpty(list)?0:list.size());
+		carsLoadEntity.setIsCustomer(CollUtil.isEmpty(list)?"2":"1");
+
+		updateById(carsLoadEntity);
+
 //		for (TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity : list) {
 //			Long signOrderId = trunklineLoadSignOrderEntity.getId();
 //			String mallName = trunklineLoadSignOrderEntity.getMallName();
@@ -993,6 +998,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		//无装车记录异常日志记录
 		try {
+//			carsLoadAsyncService.
+
 			carsLoadAsyncService.abnormalListUnloadCheckByLoadIdAndWarehouseId(loadId, warehouseId, currentCarsLoadLineEntity.getNodeName(), AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
 			List<String> orderPackageCodes = trunklineCarsLoadScanService.findUnloadByLoadIdAndWarehouseId(loadId, warehouseId);
 
@@ -4512,6 +4519,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("上传成功");
 	}
 
+	@Override
+	public R findWarehouseUnloadReport(LoadCarsDTO loadCarsDTO) {
+		Long loadId = loadCarsDTO.getLoadId();
+		Long warehouseId = loadCarsDTO.getWarehouseId();
+
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if (Objects.isNull(carsLoadEntity)) {
+			log.warn("##############findWarehouseUnloadReport: 找不到对应的配载信息");
+			return R.fail(405,"找不到对应的配载信息");
+		}
+		String carsNo = carsLoadEntity.getCarsNo();
+
+		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
+		//判空
+		if (Objects.isNull(carsLoadLineEntity)) {
+			log.warn("##############findWarehouseUnloadReport: 找不到对应的配载节点信息");
+			return R.fail(405,"找不到对应的配载节点信息");
+		}
+		String nodeName = carsLoadLineEntity.getNodeName();
+		Integer unloadReportStatus = carsLoadLineEntity.getUnloadReportStatus();
+		if(unloadReportStatus.equals(0)){
+			log.warn("##############findWarehouseUnloadReport: {} 还未卸车确认",nodeName);
+			return R.fail(405,nodeName+"还未卸车确认");
+		}
+
+		Map<String,String> map = new HashMap<>();
+		map.put("one",carsLoadLineEntity.getReportOne());
+		map.put("two",carsLoadLineEntity.getReportTwo());
+
+		Map<String,Integer> abnormalRecord = abnormalRecordClient.findListByCarsNoAndUpWarehouseId(carsNo,warehouseId);
+		map.put("three","当前待处理异常 "+abnormalRecord.get("dealwithNum")+" 条、已处理异常 "+abnormalRecord.get("noDealwithNum")+" 条");
+
+		return R.data(map);
+	}
+
 	@Override
 	public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) {
 		log.info("##############loadingTrayInfo: 查询托盘的货物信息");
@@ -4833,6 +4875,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划信息不存在");
 		}
 		String loadCode = carsLoadEntity.getCarsNo();
+		String loadStatus = carsLoadEntity.getLoadStatus();
+		if("80".equals(loadStatus)){
+			log.warn("##############unloadPackage: 配载计划已经卸车确认 loadId={}", loadId);
+			return R.fail(405, "配载计划已经卸车确认");
+		}
 
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(carsLoadLineEntity)) {
@@ -5234,6 +5281,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		String loadCode = carsLoadEntity.getCarsNo();
+		String loadStatus = carsLoadEntity.getLoadStatus();
+		if("80".equals(loadStatus)){
+			log.warn("##############unloadZero: 配载计划已经卸车确认 loadStatus={}", loadStatus);
+			return R.fail(405, "配载计划已经卸车确认");
+		}
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(basicdataWarehouseEntity)) {