1.干线-运单详情，配载详情完成

blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java

@@ -196,9 +196,9 @@ public class QRCodeUtil {
 		hints.put(EncodeHintType.MARGIN, 1);
 
 		MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
-		BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 100, 30, hints);
+		BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 240, 30, hints);
-		BufferedImage bufferedImage = new BufferedImage(100, 30, BufferedImage.TYPE_INT_BGR);
+		BufferedImage bufferedImage = new BufferedImage(240, 30, BufferedImage.TYPE_INT_BGR);
-		for (int x = 0; x < 100; x++) {
+		for (int x = 0; x < 240; x++) {
 			for (int y = 0; y < 30; y++) {
 				bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR);
 			}

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

@@ -94,5 +94,8 @@ public class OpenOrderDTO implements Serializable {
 
 	private Integer enterFlag;
 
+	private Integer infoType;//1跟踪 2财务  3改单
+
+	private String url;
 
 }

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

@@ -0,0 +1,47 @@
+package com.logpm.trunkline.entity;
+
+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;
+
+@Data
+@TableName("logpm_trunkline_waybill_return")
+@ApiModel(value = "TrunklineWaybillReturn对象", description = "运单回单记录表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineWaybillReturnEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+
+	/** 运单id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId ;
+
+	/** 地址 */
+	@ApiModelProperty(name = "地址",notes = "")
+	private String url;
+	/** 创建人名称 */
+	@ApiModelProperty(name = "创建人名称",notes = "")
+	private String createUserName ;
+
+}

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

@@ -53,5 +53,4 @@ public class TrunklineWaybillTrackEntity extends TenantEntity {
 	@ApiModelProperty(name = "操作人名称",notes = "")
 	private String createUserName ;
 
-
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillTrackClient.java

@@ -0,0 +1,19 @@
+package com.logpm.trunkline.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklineWaybillTrackClient {
+
+	String API_PREFIX = "trunklineWaybillOrder/client";
+
+	@GetMapping(API_PREFIX+"/addWaybillLog")
+	R addWaybillLog(@RequestParam Long waybillId, @RequestParam String waybillNo, @RequestParam String trackType, @RequestParam String refer, @RequestParam String operationRemark, @RequestParam String nickName, @RequestParam Long userId,@RequestParam Long warehouseId,@RequestParam String warehouseName);
+
+}

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoadScanWaybillVO implements Serializable {
+
+	private String waybillNo;
+
+	private Integer num;
+
+	private Integer unloadNum;
+
+}

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

@@ -10,6 +10,8 @@ import java.util.List;
 @Data
 public class TrunklineCarsLoadLoadingListVO extends TrunklineCarsLoadEntity {
 
+	private String carsNoBase64;
+
 	private String stopoverStation;
 
 	private Date unloadDate;

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

@@ -1449,4 +1449,94 @@ public class OpenOrderController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findWaybillLog")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询运单日志", notes = "传入openOrderDTO")
+	public R findWaybillLog(@RequestBody OpenOrderDTO openOrderDTO) {
+		String method = "############findWaybillLog: ";
+		log.info(method + "请求参数{}", openOrderDTO);
+		Long waybillId = openOrderDTO.getWaybillId();
+		Integer infoType = openOrderDTO.getInfoType();
+
+		try{
+
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"运单id为空 waybillId={}",waybillId);
+				return R.fail(405,"运单id为空");
+			}
+			if(Objects.isNull(infoType)){
+				log.warn(method+"明细类型不能为空 infoType={}",infoType);
+				return R.fail(405,"明细类型不能为空");
+			}
+
+			return openOrderService.findWaybillLog(waybillId,infoType);
+		}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("/saveWaybillReturn")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "上传回单", notes = "传入openOrderDTO")
+	public R saveWaybillReturn(@RequestBody OpenOrderDTO openOrderDTO) {
+		String method = "############saveWaybillReturn: ";
+		log.info(method + "请求参数{}", openOrderDTO);
+		Long waybillId = openOrderDTO.getWaybillId();
+		String url = openOrderDTO.getUrl();
+
+		try{
+
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"运单id为空 waybillId={}",waybillId);
+				return R.fail(405,"运单id为空");
+			}
+			if(StringUtil.isBlank(url)){
+				log.warn(method+"地址不能为空 url={}",url);
+				return R.fail(405,"地址不能为空");
+			}
+
+			return openOrderService.saveWaybillReturn(waybillId,url);
+		}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("/findWaybillReturnList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询回单列表", notes = "传入openOrderDTO")
+	public R findWaybillReturnList(@RequestBody OpenOrderDTO openOrderDTO) {
+		String method = "############findWaybillReturnList: ";
+		log.info(method + "请求参数{}", openOrderDTO);
+		Long waybillId = openOrderDTO.getWaybillId();
+		try{
+
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"运单id为空 waybillId={}",waybillId);
+				return R.fail(405,"运单id为空");
+			}
+
+			return openOrderService.findWaybillReturnList(waybillId);
+		}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/feign/TrunklineWaybillTrackClient.java

@@ -0,0 +1,25 @@
+package com.logpm.trunkline.feign;
+
+
+import com.logpm.trunkline.service.IOpenOrderAsyncService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@Slf4j
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class TrunklineWaybillTrackClient implements ITrunklineWaybillTrackClient {
+
+	private final IOpenOrderAsyncService openOrderAsyncService;
+
+	@Override
+	public R addWaybillLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName,Long userId,Long warehouseId, String warehouseName) {
+		openOrderAsyncService.saveLog(waybillId,waybillNo,trackType,refer,operationRemark,nickName,userId,warehouseId,warehouseName);
+
+		return R.success("调用成功");
+	}
+}

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

@@ -89,4 +89,9 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 
     void updateScanStatus(@Param("loadScanIds") List<Long> loadScanIds, @Param("scanStatus") String scanStatus);
 
+    List<LoadScanWaybillVO> findLoadScanWaybillList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
+
+	List<LoadScanWaybillVO> findArriveLoadScanWaybillList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
+
+	List<LoadScanWaybillVO> findUnloadLoadScanWaybillList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
 }

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

@@ -412,4 +412,37 @@
         </if>
     </update>
 
+
+    <select id="findLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
+        select waybill_no waybillNo,
+               sum(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
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and final_node_id = #{nodeId}
+          and waybill_no is not null
+        group by waybill_no
+    </select>
+
+    <select id="findUnloadLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
+        select waybill_no waybillNo,
+               sum(num) num,
+               sum(IF(unload_node_id = null,0,num)) unloadNum
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and final_node_id = #{nodeId}
+          and (unload_node_id = #{nodeId} or unload_node_id is null)
+          and waybill_no is not null
+        group by waybill_no
+    </select>
+
 </mapper>

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

@@ -54,4 +54,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
 	void clearSignOrderId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
     TrunklineCarsOrderEntity findEntityByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
+
+    List<TrunklineCarsOrderEntity> findLoadingList(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
 }

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

@@ -261,4 +261,12 @@
         and waybill_no =#{waybillNo}
     </select>
 
+    <select id="findLoadingList" resultType="com.logpm.trunkline.entity.TrunklineCarsOrderEntity">
+        select *
+        from logpm_trunkline_cars_order
+        where load_id = #{loadId}
+        and node_id = #{nodeId}
+        and real_num > 0
+    </select>
+
 </mapper>

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

@@ -0,0 +1,9 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.trunkline.entity.TrunklineWaybillReturnEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TrunklineWaybillReturnMapper extends BaseMapper<TrunklineWaybillReturnEntity> {
+}

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

@@ -0,0 +1,6 @@
+<?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.trunkline.mapper.TrunklineWaybillReturnMapper">
+
+
+</mapper>

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

@@ -3,10 +3,12 @@ package com.logpm.trunkline.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TrunklineWaybillTrackMapper extends BaseMapper<TrunklineWaybillTrackEntity> {
 
-
+    List<TrunklineWaybillTrackEntity> findWaybillLog(@Param("waybillId") Long waybillId, @Param("trackType") String trackType);
-
 }

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

@@ -2,5 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper">
 
+    <select id="findWaybillLog" resultType="com.logpm.trunkline.entity.TrunklineWaybillTrackEntity">
+        select *
+        from logpm_trunkline_waybill_track
+        where 1=1
+        and waybill_id = #{waybillId}
+          and is_deleted = 0
+        <if test="trackType == null">
+            and track_type != '888'
+            and track_type != '999'
+        </if>
+        <if test="trackType != null and trackType != ''">
+            and track_type = #{trackType}
+        </if>
+        order by create_time asc
+
+    </select>
+
 
 </mapper>

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

@@ -0,0 +1,10 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
+import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
+
+public interface ICarsLoadAsyncService {
+
+	void saveLog(TrunklineCarsLoadEntity carsLoadEntity, TrunklineCarsLoadLineEntity carsLoadLineEntity, int cardLoadType,String nickName,Long userId);
+
+}

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

@@ -0,0 +1,18 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
+
+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 saveCancelStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
+
+	void saveArriveCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId);
+
+	void saveCancelArriveCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
+
+	void saveUnloadStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
+
+}

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

@@ -73,6 +73,12 @@ public interface IOpenOrderService {
 
 	R findArrPrice(OpenOrderDTO openOrderDTO);
 
+	R findWaybillLog(Long waybillId,Integer infoType);
+
+	R saveWaybillReturn(Long waybillId, String url);
+
+	R findWaybillReturnList(Long waybillId);
+
 
 //	R findWaybillInfo(String waybillNo);
 }

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

@@ -83,4 +83,10 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<LoadingListGoodsVO> findUnloadGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo);
 
     void updateScanStatus(List<Long> loadScanIds, String scanStatus);
+
+    List<LoadScanWaybillVO> findLoadScanWaybillList(Long loadId, Long nodeId);
+
+	List<LoadScanWaybillVO> findArriveLoadScanWaybillList(Long loadId, Long nodeId);
+
+	List<LoadScanWaybillVO> findUnloadLoadScanWaybillList(Long loadId, Long nodeId);
 }

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

@@ -52,4 +52,5 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
 
 	TrunklineCarsOrderEntity findEntityByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long loadId, Long warehouseId, String orderCode, String waybillNo);
 
+    List<TrunklineCarsOrderEntity> findLoadingList(Long loadId, Long nodeId);
 }

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

@@ -0,0 +1,7 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineWaybillReturnEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrunklineWaybillReturnService extends BaseService<TrunklineWaybillReturnEntity> {
+}

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

@@ -3,5 +3,8 @@ package com.logpm.trunkline.service;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.List;
+
 public interface ITrunklineWaybillTrackService extends BaseService<TrunklineWaybillTrackEntity> {
+    List<TrunklineWaybillTrackEntity> findWaybillLog(Long waybillId, String trackType);
 }

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

@@ -0,0 +1,137 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
+import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
+import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity;
+import com.logpm.trunkline.service.ICarsLoadAsyncService;
+import com.logpm.trunkline.service.ITrunklineCarsLoadLogService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.TenantNum;
+import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Objects;
+
+@Slf4j
+@AllArgsConstructor
+@Service
+public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
+
+	private final ITrunklineCarsLoadLogService trunklineCarsLoadLogService;
+
+	@Async
+	@Override
+	public void saveLog(TrunklineCarsLoadEntity carsLoadEntity, TrunklineCarsLoadLineEntity carsLoadLineEntity, int cardLoadType,String nickName,Long userId) {
+		String nodeName = null;
+		Integer planLoadingNumber = null;
+		Integer realLoadingNumber = null;
+		Date startDate = null;
+		Long nodeId = null;
+		if(!Objects.isNull(carsLoadLineEntity)){
+			nodeName = carsLoadLineEntity.getNodeName();
+			planLoadingNumber = carsLoadLineEntity.getPlanLoadingNumber();
+			realLoadingNumber = carsLoadLineEntity.getRealLoadingNumber();
+			startDate = carsLoadLineEntity.getStartDate();
+			nodeId = carsLoadLineEntity.getNodeId();
+		}
+		String carsNo = carsLoadEntity.getCarsNo();
+		String carNumber = carsLoadEntity.getCarNumber();
+		String driverName = carsLoadEntity.getDriverName();
+		String driverMobile = carsLoadEntity.getDriverMobile();
+		String carsLineName = carsLoadEntity.getCarsLineName();
+
+		String now = CommonUtil.dateToString(new Date());
+		TrunklineCarsLoadLogEntity carsLoadLogEntity = new TrunklineCarsLoadLogEntity();
+		carsLoadLogEntity.setNodeId(nodeId);
+		carsLoadLogEntity.setNodeName(nodeName);
+		carsLoadLogEntity.setLoadId(carsLoadEntity.getId());
+		carsLoadLogEntity.setLoadCode(carsNo);
+		carsLoadLogEntity.setCarNumber(carNumber);
+		carsLoadLogEntity.setDriverName(driverName);
+		carsLoadLogEntity.setDriverMobile(driverMobile);
+		carsLoadLogEntity.setCreateUserName(nickName);
+		carsLoadLogEntity.setCreateUser(userId);
+		carsLoadLogEntity.setUpdateUser(userId);
+		carsLoadLogEntity.setTenantId(TenantNum.HUITONGCODE);
+		carsLoadLogEntity.setAbstText(CarsLoadLogTypeConstant.getName(cardLoadType));
+		String content = "";
+		switch (cardLoadType){
+			case 0:
+				content = "【"+nodeName+"】取消配载计划，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile;
+				break;
+			case 1:
+				content = "【"+nodeName+"】创建配载计划，路线："+carsLineName+"，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile;
+				break;
+			case 2:
+				content = "【"+nodeName+"】修改配载计划，路线："+carsLineName+"，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile;
+				break;
+			case 3:
+				content = "【"+nodeName+"】始发仓装车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，计划发货："+planLoadingNumber+"，实际装车："+realLoadingNumber+"，装车时间："+ now;
+				break;
+			case 4:
+				content = "【"+nodeName+"】始发仓发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，计划发货："+planLoadingNumber+"，实际装车："+realLoadingNumber+"，发车时间："+ CommonUtil.dateToString(startDate);
+				break;
+			case 5:
+				content = "【"+nodeName+"】始发仓取消发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，取消时间："+ now;
+				break;
+			case 6:
+				content = "【"+nodeName+"】网点到车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点到车时间："+ now;
+				break;
+			case 7:
+				content = "【"+nodeName+"】网点取消到车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点取消到车时间："+ now;
+				break;
+			case 8:
+				content = "【"+nodeName+"】网点卸车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点卸车时间："+ now;
+				break;
+			case 9:
+				content = "【"+nodeName+"】网点修改配载，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点修改配载时间："+ now;
+				break;
+			case 10:
+				content = "【"+nodeName+"】网点装车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点装车时间："+ now;
+				break;
+			case 11:
+				content = "【"+nodeName+"】网点发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点发车时间："+ now;
+				break;
+			case 12:
+				content = "【"+nodeName+"】网点取消发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，网点取消发车时间："+ now;
+				break;
+			case 13:
+				content = "【"+nodeName+"】终点到达，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，终点到达时间："+ now;
+				break;
+			case 14:
+				content = "【"+nodeName+"】终点取消到达，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，终点取消到达时间："+ now;
+				break;
+			case 15:
+				content = "【"+nodeName+"】终点卸车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile+"，终点卸车时间："+ now;
+				break;
+			default:
+				content = "【"+nodeName+"】其他日志，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+					"，司机手机号："+driverMobile;
+		}
+		carsLoadLogEntity.setContent(content);
+		carsLoadLogEntity.setType(cardLoadType);
+		trunklineCarsLoadLogService.save(carsLoadLogEntity);
+	}
+
+}

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

@@ -0,0 +1,222 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
+import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
+import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
+import com.logpm.trunkline.service.*;
+import com.logpm.trunkline.vo.LoadScanWaybillVO;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.TenantNum;
+import org.springblade.common.utils.CommonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
+
+	@Autowired
+	private ITrunklineWaybillTrackService trunklineWaybillTrackService;
+	@Lazy
+	@Autowired
+	private ITrunklineCarsLoadService trunklineCarsLoadService;
+	@Autowired
+	private ITrunklineCarsLoadScanService trunklineCarsLoadScanService;
+	@Autowired
+	private IWarehouseWaybillClient warehouseWaybillClient;
+	@Autowired
+	private ITrunklineCarsLoadLineService trunklineCarsLoadLineService;
+
+	@Async
+	@Override
+	public void saveLog(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);
+		waybillTrackEntity.setWarehouseName(warehouseName);
+		waybillTrackEntity.setWaybillId(waybillId);
+		waybillTrackEntity.setWaybillNo(waybillNo);
+		waybillTrackEntity.setTrackType(trackType);
+		waybillTrackEntity.setRefer(refer);
+		waybillTrackEntity.setOperationRemark(operationRemark);
+		waybillTrackEntity.setCreateUserName(nickName);
+		waybillTrackEntity.setTenantId(TenantNum.HUITONGCODE);
+		waybillTrackEntity.setCreateUser(userId);
+		waybillTrackEntity.setUpdateUser(userId);
+		trunklineWaybillTrackService.save(waybillTrackEntity);
+	}
+
+	@Async
+	@Override
+	public void saveStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity,String nickName,Long userId) {
+		Long loadId = carsLoadLineEntity.getLoadId();
+		Integer sort = carsLoadLineEntity.getSort();
+		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();
+
+		String nextWarehouseName = "";
+		TrunklineCarsLoadLineEntity nextCarsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndSort(loadId, sort + 1);
+		if(!Objects.isNull(nextCarsLoadLineEntity)){
+			nextWarehouseName = nextCarsLoadLineEntity.getNodeName();
+		}
+
+		List<LoadScanWaybillVO> list = trunklineCarsLoadScanService.findLoadScanWaybillList(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+"已发车到"+nextWarehouseName,operationRemark,nickName,userId,nodeId,nodeName);
+		}
+
+	}
+
+	@Async
+	@Override
+	public void saveCancelStartCarLog(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.findLoadScanWaybillList(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,"50",nodeName+" 干线取消发车",operationRemark,nickName,userId,nodeId,nodeName);
+		}
+	}
+
+	@Async
+	@Override
+	public void saveArriveCarLog(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);
+		}
+	}
+
+	@Async
+	@Override
+	public void saveCancelArriveCarLog(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,"70",nodeName+" 取消到达",operationRemark,nickName,userId,nodeId,nodeName);
+		}
+	}
+
+	@Async
+	@Override
+	public void saveUnloadStartCarLog(TrunklineCarsLoadLineEntity carsLoadLineEntity, String nickName,Long userId) {
+		Long loadId = carsLoadLineEntity.getLoadId();
+		TrunklineCarsLoadEntity carsLoadEntity = trunklineCarsLoadService.getById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("##############saveUnloadStartCarLog: 配载信息不存在 loadId={}",loadId);
+			return;
+		}
+
+		Long nodeId = carsLoadLineEntity.getNodeId();
+		String nodeName = carsLoadLineEntity.getNodeName();
+
+
+		List<LoadScanWaybillVO> list = trunklineCarsLoadScanService.findUnloadLoadScanWaybillList(loadId,nodeId);
+
+		for (LoadScanWaybillVO loadScanWaybillVO : list) {
+			String waybillNo = loadScanWaybillVO.getWaybillNo();
+			Integer num = loadScanWaybillVO.getNum();
+			Integer unloadNum = loadScanWaybillVO.getUnloadNum();
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if(Objects.isNull(waybillEntity)){
+				log.warn("##############saveUnloadStartCarLog: 运单信息不存在 waybillNo={}",waybillNo);
+				continue;
+			}
+			Long waybillId = waybillEntity.getId();
+
+			String operationRemark = nodeName+"干线卸车确认，到车/卸车："+num+"/"+unloadNum+"，卸车时间"+ CommonUtil.dateToStringGeneral(new Date());
+			saveLog(waybillId,waybillNo,"80",nodeName+" 干线卸车",operationRemark,nickName,userId,nodeId,nodeName);
+		}
+	}
+}

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

@@ -80,6 +80,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final IBasicdataForwardingUnitClient basicdataForwardingUnitClient;
 	private final IBasicdataFreightClient basicdataFreightClient;
 
+	private final IOpenOrderAsyncService openOrderAsyncService;
+	private final ITrunklineWaybillReturnService trunklineWaybillReturnService;
+
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {
 		IPage<Object> page = new Page<>();
@@ -280,6 +283,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"仓库信息不存在");
 		}
 		String warehouseCode = basicdataWarehouseEntity.getWarehouseCode();
+		String warehouseName = basicdataWarehouseEntity.getName();
+
 
 		//如果运单号为空则自动生成运单号
 		if(StringUtil.isBlank(waybillNo)){
@@ -527,29 +532,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			trunklineBillladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
 		}
 
-		try{
+		//异步存入日志
-			TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
+		String nickName = AuthUtil.getNickName();
-			waybillTrackEntity.setWarehouseId(warehouseId);
+		Long userId = AuthUtil.getUserId();
-			waybillTrackEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+
-			waybillTrackEntity.setWaybillId(waybillId);
+		String createOperationRemark = "创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime());
-			waybillTrackEntity.setWaybillNo(waybillNo);
+		openOrderAsyncService.saveLog(waybillId,waybillNo,"10","创建运单",createOperationRemark,nickName,userId,warehouseId,warehouseName);
-			waybillTrackEntity.setTrackType("10");
+
-			waybillTrackEntity.setRefer("创建运单");
+		Integer totalCount = waybillEntity.getTotalCount();
-			waybillTrackEntity.setOperationRemark("创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime()));
+		Integer stockCount = waybillEntity.getStockCount();
-			waybillTrackEntity.setCreateUserName(AuthUtil.getNickName());
+		if(totalCount.equals(stockCount)){
-			trunklineWaybillTrackService.save(waybillTrackEntity);
+			createOperationRemark = "运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(new Date());
-
+			openOrderAsyncService.saveLog(waybillId,waybillNo,"20","已入库",createOperationRemark,nickName,userId,warehouseId,warehouseName);
-			Integer totalCount = waybillEntity.getTotalCount();
-			Integer stockCount = waybillEntity.getStockCount();
-			if(totalCount.equals(stockCount)){
-				waybillTrackEntity.setId(null);
-				waybillTrackEntity.setTrackType("20");
-				waybillTrackEntity.setRefer("已入库");
-				waybillTrackEntity.setOperationRemark("运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(new Date()));
-				trunklineWaybillTrackService.save(waybillTrackEntity);
-			}
-		}catch (Exception e){
-			log.warn("###############openWaybill: 存入日志失败");
 		}
 
 		return R.success("开单成功");
@@ -568,7 +562,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"仓库信息不存在");
 		}
 		String warehouseCode = basicdataWarehouseEntity.getWarehouseCode();
-		String name = basicdataWarehouseEntity.getName();
+		String warehouseName = basicdataWarehouseEntity.getName();
 
 		//如果运单号为空则自动生成运单号
 		if(StringUtil.isBlank(waybillNo)){
@@ -712,31 +706,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		advanceService.updateBatchById(advanceEntityList);
 
 
+		//异步存入日志
+		String nickName = AuthUtil.getNickName();
+		Long userId = AuthUtil.getUserId();
+		String createOperationRemark = "创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date());
+		openOrderAsyncService.saveLog(waybillId,waybillNo,"10","创建运单",createOperationRemark,nickName,userId,warehouseId,warehouseName);
 
-		try{
+		Integer totalCount = waybillEntity.getTotalCount();
-			TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
+		Integer stockCount = waybillEntity.getStockCount();
-			waybillTrackEntity.setWarehouseId(warehouseId);
+		if(totalCount.equals(stockCount)){
-			waybillTrackEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+			createOperationRemark = "运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime());
-			waybillTrackEntity.setWaybillId(waybillId);
+			openOrderAsyncService.saveLog(waybillId,waybillNo,"20","已入库",createOperationRemark,nickName,userId,warehouseId,warehouseName);
-			waybillTrackEntity.setWaybillNo(waybillNo);
-			waybillTrackEntity.setTrackType("10");
-			waybillTrackEntity.setRefer("创建运单");
-			waybillTrackEntity.setOperationRemark("创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date()));
-			waybillTrackEntity.setCreateUserName(AuthUtil.getNickName());
-			trunklineWaybillTrackService.save(waybillTrackEntity);
-
-
-			Integer totalCount = waybillEntity.getTotalCount();
-			Integer stockCount = waybillEntity.getStockCount();
-			if(totalCount.equals(stockCount)){
-				waybillTrackEntity.setId(null);
-				waybillTrackEntity.setTrackType("20");
-				waybillTrackEntity.setRefer("已入库");
-				waybillTrackEntity.setOperationRemark("运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime()));
-				trunklineWaybillTrackService.save(waybillTrackEntity);
-			}
-		}catch (Exception e){
-			log.warn("###############openZeroWaybill: 存入日志失败");
 		}
 
 		//创建零担订单
@@ -1415,6 +1395,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	@Override
 	public R updateWaybill(OpenOrderDTO openOrderDTO) {
 		Long waybillId = openOrderDTO.getWaybillId();
+		String waybillNo = openOrderDTO.getWaybillNo();
+		Long warehouseId = openOrderDTO.getWarehouseId();
+		String warehouseName = openOrderDTO.getWarehouseName();
 		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 		if(Objects.isNull(waybillEntity)){
 			log.warn("#############updateWaybill: 运单信息不存在 waybillId={}",waybillId);
@@ -1424,22 +1407,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		warehouseWaybillClient.updateEntity(waybillEntity);
 
-		try{
+		String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg;
-			String waybillNo = openOrderDTO.getWaybillNo();
+		//异步存入日志
-			TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
+		openOrderAsyncService.saveLog(waybillId,waybillNo,"888","修改运单",operationRemark,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
-			waybillTrackEntity.setWarehouseId(openOrderDTO.getWarehouseId());
-			waybillTrackEntity.setWarehouseName(openOrderDTO.getWarehouseName());
-			waybillTrackEntity.setWaybillId(waybillId);
-			waybillTrackEntity.setWaybillNo(waybillNo);
-			waybillTrackEntity.setTrackType("30");
-			waybillTrackEntity.setRefer("修改运单");
-			waybillTrackEntity.setOperationRemark("修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg);
-			waybillTrackEntity.setCreateUserName(AuthUtil.getNickName());
-			trunklineWaybillTrackService.save(waybillTrackEntity);
-
-		}catch (Exception e){
-			log.warn("###############openWaybill: 存入日志失败");
-		}
 
 		return R.success("改单成功");
 	}
@@ -1635,22 +1605,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
 
-		try{
+		//异步存入日志
-			String waybillNo = warehouseWaybillEntity.getWaybillNo();
+		String nickName = AuthUtil.getNickName();
-			TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
+		Long userId = AuthUtil.getUserId();
-			waybillTrackEntity.setWarehouseId(warehouseId);
+		String waybillNo = warehouseWaybillEntity.getWaybillNo();
-			waybillTrackEntity.setWarehouseName(warehouseName);
+		String createOperationRemark = "审核运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date())+", 审核人："+AuthUtil.getNickName();
-			waybillTrackEntity.setWaybillId(waybillId);
+		openOrderAsyncService.saveLog(waybillId,waybillNo,"999","审核运单",createOperationRemark,nickName,userId,warehouseId,warehouseName);
-			waybillTrackEntity.setWaybillNo(waybillNo);
+
-			waybillTrackEntity.setTrackType("40");
-			waybillTrackEntity.setRefer("审核运单");
-			waybillTrackEntity.setOperationRemark("审核运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date())+", 审核人："+AuthUtil.getNickName());
-			waybillTrackEntity.setCreateUserName(AuthUtil.getNickName());
-			trunklineWaybillTrackService.save(waybillTrackEntity);
-
-		}catch (Exception e){
-			log.warn("###############checkWaybill: 存入日志失败");
-		}
 		return R.success("审核成功");
 	}
 
@@ -1791,6 +1752,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"仓库信息不存在");
 		}
 		String warehouseCode = basicdataWarehouseEntity.getWarehouseCode();
+		String warehouseName = basicdataWarehouseEntity.getName();
+
 
 		//如果运单号为空则自动生成运单号
 		if(StringUtil.isBlank(waybillNo)){
@@ -1927,31 +1890,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"运单保存失败");
 		}
 
-		try{
-			TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
-			waybillTrackEntity.setWarehouseId(warehouseId);
-			waybillTrackEntity.setWarehouseName(basicdataWarehouseEntity.getName());
-			waybillTrackEntity.setWaybillId(waybillId);
-			waybillTrackEntity.setWaybillNo(waybillNo);
-			waybillTrackEntity.setTrackType("10");
-			waybillTrackEntity.setRefer("创建运单");
-			waybillTrackEntity.setOperationRemark("创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date()));
-			waybillTrackEntity.setCreateUserName(AuthUtil.getNickName());
-			trunklineWaybillTrackService.save(waybillTrackEntity);
-
-
-			Integer totalCount = waybillEntity.getTotalCount();
-			Integer stockCount = waybillEntity.getStockCount();
-			if(totalCount.equals(stockCount)){
-				waybillTrackEntity.setId(null);
-				waybillTrackEntity.setTrackType("20");
-				waybillTrackEntity.setRefer("已入库");
-				waybillTrackEntity.setOperationRemark("运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime()));
-				trunklineWaybillTrackService.save(waybillTrackEntity);
-			}
-		}catch (Exception e){
-			log.warn("###############openZeroWaybill: 存入日志失败");
-		}
 
 		List<Long> advanceIds = openOrderDTO.getAdvanceIds();
 		//绑定订单和运单的关系
@@ -2049,6 +1987,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			trunklineBillladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
 		}
 
+		String nickName = AuthUtil.getNickName();
+		Long userId = AuthUtil.getUserId();
+		String createOperationRemark = "创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(new Date());
+		openOrderAsyncService.saveLog(waybillId,waybillNo,"10","创建运单",createOperationRemark,nickName,userId,warehouseId,warehouseName);
+
+		Integer totalCount = waybillEntity.getTotalCount();
+		Integer stockCount = waybillEntity.getStockCount();
+		if(totalCount.equals(stockCount)){
+			createOperationRemark = "运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime());
+			openOrderAsyncService.saveLog(waybillId,waybillNo,"20","已入库",createOperationRemark,nickName,userId,warehouseId,warehouseName);
+		}
+
+
 		return R.success("开单成功");
 	}
 
@@ -2091,6 +2042,42 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.data(ls);
 	}
 
+	@Override
+	public R findWaybillLog(Long waybillId,Integer infoType) {
+		String trackType = null;
+		if(infoType.equals(2)){
+			trackType = "999";
+		}else if(infoType.equals(3)){
+			trackType = "888";
+		}
+
+		List<TrunklineWaybillTrackEntity> list = trunklineWaybillTrackService.findWaybillLog(waybillId,trackType);
+
+		return R.data(list);
+	}
+
+	@Override
+	public R saveWaybillReturn(Long waybillId, String url) {
+		TrunklineWaybillReturnEntity trunklineWaybillReturnEntity = new TrunklineWaybillReturnEntity();
+		trunklineWaybillReturnEntity.setWaybillId(waybillId);
+		trunklineWaybillReturnEntity.setUrl(url);
+		trunklineWaybillReturnEntity.setCreateUserName(AuthUtil.getNickName());
+		trunklineWaybillReturnService.save(trunklineWaybillReturnEntity);
+
+		return R.success("上床成功");
+	}
+
+	@Override
+	public R findWaybillReturnList(Long waybillId) {
+		QueryWrapper<TrunklineWaybillReturnEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("waybill_id",waybillId)
+			.eq("is_deleted",0)
+			.orderByAsc("create_time");
+		List<TrunklineWaybillReturnEntity> list = trunklineWaybillReturnService.list(queryWrapper);
+
+		return R.data(list);
+	}
+
 	private String verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 		StringBuilder stringBuilder = new StringBuilder();

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

@@ -202,4 +202,19 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		baseMapper.updateScanStatus(loadScanIds,scanStatus);
 	}
 
+	@Override
+	public List<LoadScanWaybillVO> findLoadScanWaybillList(Long loadId, Long nodeId) {
+		return baseMapper.findLoadScanWaybillList(loadId,nodeId);
+	}
+
+	@Override
+	public List<LoadScanWaybillVO> findArriveLoadScanWaybillList(Long loadId, Long nodeId) {
+		return baseMapper.findArriveLoadScanWaybillList(loadId,nodeId);
+	}
+
+	@Override
+	public List<LoadScanWaybillVO> findUnloadLoadScanWaybillList(Long loadId, Long nodeId) {
+		return baseMapper.findUnloadLoadScanWaybillList(loadId,nodeId);
+	}
+
 }

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

@@ -35,6 +35,7 @@ import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -79,6 +80,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	private final ITrunklineCarsLoadContractService carsLoadContractService;
 	private final ITrunklineCarsLoadFinanceService carsLoadFinanceService;
 
+	private final ICarsLoadAsyncService carsLoadAsyncService;
+	private final IOpenOrderAsyncService openOrderAsyncService;
+
 	@Override
 	public IPage<TrunklineCarsLoadVO> loadCarsPageList(LoadCarsDTO loadCarsDTO) {
 		IPage<Object> page = new Page<>();
@@ -189,11 +193,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			updateById(carsLoadEntity);
 
 			try{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.FIRST_START_CARS_LOAD.getValue());
+				//异步存入日志
+				carsLoadAsyncService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.FIRST_START_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+
+				openOrderAsyncService.saveStartCarLog(carsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 			}catch (Exception e){
-				log.warn("#############startCarByLoadId: 存入日志失败");
+				log.warn("############startCarByLoadId: 存入日志失败");
 			}
 
+
 		}else if(startCarType == 2){
 			//到车管理的发车
 			//最终节点
@@ -260,9 +268,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			updateById(carsLoadEntity);
 
 			try{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.NET_START_CARS_LOAD.getValue());
+				//异步存入日志
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.NET_START_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+
+				openOrderAsyncService.saveStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 			}catch (Exception e){
-				log.warn("#############startCarByLoadId: 存入日志失败");
+				log.warn("############startCarByLoadId: 存入日志失败");
 			}
 
 		}
@@ -381,10 +392,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 			if(!nodeId.equals(endNodeId)){
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.NET_ARRIVE_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.NET_ARRIVE_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
 			}else{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.END_ARRIVE_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,carsLoadLineEntity, CarsLoadLogTypeConstant.END_ARRIVE_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
 			}
+			openOrderAsyncService.saveArriveCarLog(carsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 		}catch (Exception e){
 			log.warn("#############arriveCarByLoadId: 存入日志失败");
 		}
@@ -457,7 +469,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadEntity.setStartTime(null);
 			updateById(carsLoadEntity);
 			try{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_FIRST_START_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_FIRST_START_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+				openOrderAsyncService.saveCancelStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 			}catch (Exception e){
 				log.warn("#############cancelStartCarByLoadId: 存入日志失败");
 			}
@@ -475,7 +488,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			updateById(carsLoadEntity);
 
 			try{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_NET_START_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_NET_START_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+				openOrderAsyncService.saveCancelStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 			}catch (Exception e){
 				log.warn("#############cancelStartCarByLoadId: 存入日志失败");
 			}
@@ -642,14 +656,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		try{
 			if(nowWarehouseId.equals(endNodeId)) {
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_END_ARRIVE_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_END_ARRIVE_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
 			}else{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_NET_ARRIVE_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_NET_ARRIVE_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
 			}
+			openOrderAsyncService.saveCancelArriveCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 		}catch (Exception e){
 			log.warn("#############cancelArriveCarByLoadId: 存入日志失败");
 		}
-
 	}
 
 	@Override
@@ -736,7 +750,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
 
 			try{
-				trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.NET_UNLOAD_CARS_LOAD.getValue());
+				carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.NET_UNLOAD_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+				openOrderAsyncService.saveUnloadStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 			}catch (Exception e){
 				log.warn("#############unloadByLoadId: 存入日志失败");
 			}
@@ -754,7 +769,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				currentCarsLoadLineEntity.setUnloadDate(new Date());
 				trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
 				try{
-					trunklineCarsLoadLogService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.END_UNLOAD_CARS_LOAD.getValue());
+					carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.END_UNLOAD_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
+					openOrderAsyncService.saveUnloadStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
 				}catch (Exception e){
 					log.warn("#############unloadByLoadId: 存入日志失败");
 				}
@@ -2150,7 +2166,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	@Override
 	public R updateLoadFeeByNodeId(TrunklineCarsLoadDTO carsLoadDTO,Long warehouseId,String warehouseName) {
 		Long loadId = carsLoadDTO.getId();
-		String str = "";
+		StringBuilder str = new StringBuilder();
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if(Objects.isNull(carsLoadEntity)){
 			log.warn("##########updateLoadFeeByNodeId: 配载计划信息不存在 loadId={}",loadId);
@@ -2184,13 +2200,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		updateById(carsLoadEntity);
 
 		if(oldCountTransportCost.compareTo(countTransportCost) != 0){
-			str = "运输费用: 由【"+oldCountTransportCost+"】改为"+countTransportCost+"。&";
+			str = new StringBuilder("运输费用: 由【" + oldCountTransportCost + "】改为" + countTransportCost + "。");
 		}
 
 		List<TrunklineCarsLoadLineDTO> carsLoadLineList = carsLoadDTO.getCarsLoadLineList();
 		for (TrunklineCarsLoadLineDTO carsLoadLineDTO : carsLoadLineList) {
 			Long loadCarsLineId = carsLoadLineDTO.getId();
 			TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(loadCarsLineId);
+			String s = compareLineFee(carsLoadLineDTO, loadLineEntity);
+			if(StringUtil.isNotBlank(s)){
+				str.append("&").append(loadLineEntity.getNodeName()).append(":").append(s);
+			}
 			loadLineEntity.setNowTransportCost(carsLoadLineDTO.getNowTransportCost());
 			loadLineEntity.setOilCost(carsLoadLineDTO.getOilCost());
 			loadLineEntity.setBackTransportCost(carsLoadLineDTO.getBackTransportCost());
@@ -2204,21 +2224,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			loadLineEntity.setUnloadOtherCost(carsLoadLineDTO.getUnloadOtherCost());
 			loadLineEntity.setFuel(carsLoadLineDTO.getFuel());
 			loadLineEntity.setTollFee(carsLoadLineDTO.getTollFee());
-			String s = compareLineFee(carsLoadLineDTO, loadLineEntity);
-			if(StringUtil.isNotBlank(s)){
-				str = str + loadLineEntity.getNodeName()+":"+s;
-			}
 			trunklineCarsLoadLineService.updateById(loadLineEntity);
 		}
 
 
-		if(StringUtil.isNotBlank(str)){
+		if(StringUtil.isNotBlank(str.toString())){
 			TrunklineCarsLoadFinanceEntity carsLoadFinanceEntity = new TrunklineCarsLoadFinanceEntity();
 			carsLoadFinanceEntity.setLoadId(loadId);
 			carsLoadFinanceEntity.setWarehouseId(warehouseId);
 			carsLoadFinanceEntity.setWarehouseName(warehouseName);
 			carsLoadFinanceEntity.setCreateUserName(AuthUtil.getNickName());
-			carsLoadFinanceEntity.setContent(str);
+			carsLoadFinanceEntity.setContent(str.toString());
 			try{
 				carsLoadFinanceService.save(carsLoadFinanceEntity);
 			}catch (Exception e){
@@ -2341,15 +2357,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 		}
 
-		BigDecimal oldFuel = loadLineEntity.getFuel();
+//		BigDecimal oldFuel = loadLineEntity.getFuel();
-		BigDecimal fuel = carsLoadLineDTO.getFuel();
+//		BigDecimal fuel = carsLoadLineDTO.getFuel();
-		if(oldFuel.compareTo(fuel) != 0){
+//		if(oldFuel.compareTo(fuel) != 0){
-			if(StringUtil.isBlank(result)){
+//			if(StringUtil.isBlank(result)){
-				result = "【油费】"+fuel;
+//				result = "【油费】"+fuel;
-			}else{
+//			}else{
-				result = result+",【油费】"+fuel;
+//				result = result+",【油费】"+fuel;
-			}
+//			}
-		}
+//		}
 
 		BigDecimal oldTollFee = loadLineEntity.getTollFee();
 		BigDecimal tollFee = carsLoadLineDTO.getTollFee();
@@ -3556,6 +3572,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("############findLoadingListData: 配载计划信息不存在 loadId={}",loadId);
 			return R.fail(405,"配载计划信息不存在");
 		}
+		String carsNo = carsLoadEntity.getCarsNo();
 
 		TrunklineCarsLoadLoadingListVO trunklineCarsLoadLoadingListVO = new TrunklineCarsLoadLoadingListVO();
 		BeanUtil.copy(carsLoadEntity,trunklineCarsLoadLoadingListVO);
@@ -3617,6 +3634,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			loadingMainList.addAll(unloadMainList);
 			trunklineCarsLoadLoadingListVO.setMainList(loadingMainList);
+			trunklineCarsLoadLoadingListVO.setCarsNoBase64(QRCodeUtil.getEmpAutograph(QRCodeUtil.createCodeToFileType(carsNo)));
 			return R.data(trunklineCarsLoadLoadingListVO);
 		}else{
 			log.warn("#############findLoadingListData: 仓库信息不正确");
@@ -4013,12 +4031,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				InComingDTO inComingDTO = new InComingDTO();
 				inComingDTO.setOrderPackageCode(orderPackageCode);
 				inComingDTO.setWarehouseId(warehouseId);
-				R r = inComingService.incomingPackage(inComingDTO);
+				inComingService.incomingPackage(inComingDTO);
-				int code = r.getCode();
+//				int code = r.getCode();
-				if(code != 200){
+//				if(code != 200){
-					log.warn("##############unloadPackage: 包件入库失败");
+//					log.warn("##############unloadPackage: 包件入库失败");
-					return R.fail(405,"包件入库失败");
+//				}
-				}
 
 				//需要补装车扫记录
 				TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();

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

@@ -123,4 +123,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 		return baseMapper.findEntityByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(loadId,warehouseId,orderCode,waybillNo);
 	}
 
+	@Override
+	public List<TrunklineCarsOrderEntity> findLoadingList(Long loadId, Long nodeId) {
+		return baseMapper.findLoadingList(loadId,nodeId);
+	}
+
 }

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineWaybillReturnEntity;
+import com.logpm.trunkline.mapper.TrunklineWaybillReturnMapper;
+import com.logpm.trunkline.service.ITrunklineWaybillReturnService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineWaybillReturnServiceImpl extends BaseServiceImpl<TrunklineWaybillReturnMapper, TrunklineWaybillReturnEntity> implements ITrunklineWaybillReturnService {
+
+}

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

@@ -8,8 +8,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 @AllArgsConstructor
 public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineWaybillTrackMapper, TrunklineWaybillTrackEntity> implements ITrunklineWaybillTrackService {
+	@Override
+	public List<TrunklineWaybillTrackEntity> findWaybillLog(Long waybillId, String trackType) {
+		return baseMapper.findWaybillLog(waybillId,trackType);
+	}
 }