1.干线bug修复

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@@ -127,4 +127,6 @@ public interface IBasicdataClientClient {
 	@PostMapping(API_PREFIX+"/saveEntity")
 	Long saveEntity(@RequestBody BasicdataClientEntity clientEntity) ;
 
+	@GetMapping(API_PREFIX+"/getFinallyClientCode")
+	String getFinallyClientCode();
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -306,5 +306,8 @@ public interface IDistributionParcelListClient {
 
 	@PostMapping(API_PREFIX + "/deleteListByOrderPackageCodes")
 	R deleteListByOrderPackageCodes(@RequestBody FindParamterDTO findParamterDTO);
+
+	@GetMapping(API_PREFIX + "/findOrderPackageCodeAndStatus")
+    DistributionParcelListEntity findOrderPackageCodeAndStatus(@RequestParam String orderPackageCode, @RequestParam String orderPackageStatus);
 }
 

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CarsLoadPackagePlanVO implements Serializable {
+
+	private String orderCode;
+	private String waybillNo;
+	private String orderPackageCode;
+	private String thirds;
+	private String materialName;
+
+}

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

@@ -12,5 +12,6 @@ public class LoadScanOrderVO implements Serializable {
 	private Integer totalNum;
 	private Integer planNum;
 	private Integer realNum;
+	private Integer isAbnormal;
 
 }

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

@@ -14,6 +14,12 @@ public class OrderScanDetailVO implements Serializable {
 	private Integer num;
 	private String trayName;
 	private String trayCode;
+	private String firsts;
+	private String senconds;
+	private String thirds;
+	private String materialCode;
+	private String materialName;
+	private Integer isAbnormal;
 
 	private List<TrunklineScanZeroDetailVO> zeroDetailList = new ArrayList<>();
 

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

@@ -21,6 +21,12 @@ public class UnloadPackageVO implements Serializable {
 	private String unloadNodeName;
 	private String orderCode;
 	private String waybillNo;
+	private String firsts;
+	private String senconds;
+	private String thirds;
+	private String materialCode;
+	private String materialName;
+	private Integer isAbnormal;
 
 	private List<TrunklineScanZeroDetailVO> scanZeroDetailList = new ArrayList<>();
 

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

@@ -13,7 +13,7 @@ public class UnloadScanOrderVO implements Serializable {
 	private String orderCode;
 	private Integer loadingNum;
 	private Integer unloadNum;
-	private Integer unloadAbnormal;
+	private Integer isAbnormal;
 	private Integer totalNumber;
 
 	private List<UnloadPackageVO> unloadPackageList = new ArrayList<>();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java

@@ -28,7 +28,6 @@ import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.service.IBasicdataClientService;
 import com.logpm.basicdata.service.IBasicdataClientUserService;
 import com.logpm.basicdata.vo.BasicdataClientVO;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
 import lombok.AllArgsConstructor;
 import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.core.mp.support.BladePage;
@@ -164,4 +163,9 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 			throw new RuntimeException(e);
 		}
 	}
+
+	@Override
+	public String getFinallyClientCode() {
+		return basicdataClientService.getFinallyClientCode();
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -654,4 +654,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		return R.success("删除成功");
 	}
 
+	@Override
+	public DistributionParcelListEntity findOrderPackageCodeAndStatus(String orderPackageCode, String orderPackageStatus) {
+		return distributionParcelListService.findOrderPackageCodeAndStatus(orderPackageCode,orderPackageStatus);
+	}
+
 }

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

@@ -313,4 +313,5 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	void deleteListByOrderPackageCodes(List<String> orderPackageCodeList,Long warehouseId);
 
+    DistributionParcelListEntity findOrderPackageCodeAndStatus(String orderPackageCode, String orderPackageStatus);
 }

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

@@ -1583,4 +1583,16 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public void deleteListByOrderPackageCodes(List<String> orderPackageCodeList, Long warehouseId) {
 		baseMapper.deleteListByOrderPackageCodes(orderPackageCodeList,warehouseId);
 	}
+
+	@Override
+	public DistributionParcelListEntity findOrderPackageCodeAndStatus(String orderPackageCode, String orderPackageStatus) {
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_package_code",orderPackageCode).eq("order_package_status",orderPackageStatus);
+		List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(queryWrapper);
+		if(CollUtil.isNotEmpty(distributionParcelListEntities)){
+			return distributionParcelListEntities.get(0);
+		}else{
+			return null;
+		}
+	}
 }

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

@@ -167,6 +167,41 @@ public class CarsLoadApiController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findCarsLoadingOrderPlan")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询装车订单假话", notes = "传入loadCarsDTO")
+	public R findCarsLoadingOrderPlan(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############findCarsLoadingOrderDetail: ";
+		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(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+
+			return carsLoadService.findCarsLoadingOrderPlan(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("/findCarsLoadingOrderDetail")
 	@ApiOperationSupport(order = 1)
@@ -176,7 +211,7 @@ public class CarsLoadApiController {
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
 		String orderCode = loadCarsDTO.getOrderCode();
-
+		String waybillNo = loadCarsDTO.getWaybillNo();
 		try{
 
 			//当前登录人选择的仓库
@@ -196,7 +231,7 @@ public class CarsLoadApiController {
 				return R.fail(405,"订单号为空");
 			}
 
-			return carsLoadService.findCarsLoadingOrderDetail(loadId,orderCode,myCurrentWarehouse.getId());
+			return carsLoadService.findCarsLoadingOrderDetail(loadId,orderCode,myCurrentWarehouse.getId(),waybillNo);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -573,6 +608,50 @@ public class CarsLoadApiController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/unloadPackageNoXz")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "包件卸车", notes = "传入loadCarsDTO")
+	public R unloadPackageNoXz(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############unloadPackageNoXz: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+		String orderPackageCode = loadCarsDTO.getOrderPackageCode();
+		Integer incomingType = loadCarsDTO.getIncomingType();
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载计划id为空 loadId={}",loadId);
+				return R.fail(405,"配载计划id为空");
+			}
+			if(StringUtil.isBlank(orderPackageCode)){
+				log.warn(method+"包件码为空 orderPackageCode={}",orderPackageCode);
+				return R.fail(405,"包件码为空");
+			}
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库类型为空 orderPackageCode={}",orderPackageCode);
+				return R.fail(405,"入库类型为空");
+			}
+
+			return carsLoadService.unloadPackageNoXz(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"补录卸车",incomingType,null,null);
+		}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("/unloadZero")
 	@ApiOperationSupport(order = 1)

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

@@ -42,7 +42,7 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     IPage<TrunklineCarsLoadScanVO> loadingDetail(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
 
 
-	List<OrderScanDetailVO> findCarsLoadingOrderDetail(@Param("loadId") Long loadId, @Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId);
+	List<OrderScanDetailVO> findCarsLoadingOrderDetail(@Param("loadId") Long loadId, @Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("waybillNo") String waybillNo);
 
 	boolean deleteEntityByCarsLoadScanId(@Param("carsLoadScanId") Long carsLoadScanId);
 

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

@@ -180,7 +180,13 @@
                scan_code scanCode,
                num num,
                tray_name trayName,
-               tray_code trayCode
+               tray_code trayCode,
+               firsts firsts,
+               senconds senconds,
+               thirds thirds,
+               material_code materialCode,
+               material_name materialName,
+               IFNULL(loading_abnormal,0)+IFNULL(unload_abnormal,0) isAbnormal
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
         and order_code = #{orderCode}
@@ -220,17 +226,23 @@
 
 
     <select id="findPackageWithOrderList" resultType="com.logpm.trunkline.vo.UnloadScanOrderVO">
-        select ltcls.waybill_no waybillNo,
-               ltcls.order_code orderCode,
-               sum(ltcls.num) loadingNum,
-               sum(IF(ltcls.scan_status = 1,0,1)) unloadNum
-        from logpm_trunkline_cars_load_scan ltcls
-        where ltcls.load_id = #{loadId}
-          and ltcls.final_node_id = #{warehouseId}
-          and ltcls.type = 1
-        group by ltcls.waybill_no,
-                 ltcls.order_code
-
+        select t.order_code orderCode,
+               t.waybill_no waybillNo,
+               t.real_num loadingNum,
+               t.unload_num unloadNum,
+               if(t.abnormal_num > 0,1,0) isAbnormal,
+               IFNULL(ltwo.total_number,0) totalNumber
+        from (select ltcls.waybill_no waybill_no,
+                     ltcls.order_code order_code,
+                     sum(IFNULL(ltcls.num,0)) real_num,
+                     sum(IFNULL(ltcls.unload_num,0)) unload_num,
+                     sum(IFNULL(ltcls.unload_abnormal,0)) abnormal_num
+              from logpm_trunkline_cars_load_scan ltcls
+              where ltcls.load_id = #{loadId}
+                and (ltcls.unload_node_id = #{warehouseId} or ltcls.final_node_id = #{warehouseId})
+                and ltcls.`type` = 1 group by ltcls.waybill_no,
+                ltcls.order_code order by ltcls.update_time desc) t
+                 left join logpm_trunkline_waybill_order ltwo on ltwo.order_code = t.order_code and ltwo.waybill_no = t.waybill_no
     </select>
 
     <select id="findNotUnloadZeroList" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
@@ -1064,10 +1076,16 @@
                scan_status scanStatus,
                unload_node_name unloadNodeName,
                order_code orderCode,
-               waybill_no waybillNo
+               waybill_no waybillNo,
+                firsts firsts,
+                senconds senconds,
+               thirds thirds,
+               material_code materialCode,
+               material_name materialName,
+               IFNULL(loading_abnormal,0)+IFNULL(unload_abnormal,0) isAbnormal
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
-          and final_node_id = #{warehouseId}
+          and (final_node_id = #{warehouseId} or unload_node_id = #{warehouseId})
     </select>
 
     <select id="findUnloadZeroListByLoadIdAndFinalNodeId" resultType="com.logpm.trunkline.vo.UnloadPackageVO">

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

@@ -72,4 +72,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
 	List<SignScanOrderVO> findSignZeroOrderListBySignOrderId(@Param("signOrderId") Long signOrderId);
 
     List<TrunklineCarsOrderEntity> findListByLoadId(@Param("loadId") Long loadId);
+
+	List<CarsLoadPackagePlanVO> findLoadingOrderPlan(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 }

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

@@ -80,17 +80,25 @@
     </select>
 
     <select id="findLoadScanPackageWithOrder" resultType="com.logpm.trunkline.vo.LoadScanOrderVO">
-        select ltco.waybill_no waybillNo,
-               ltco.order_code orderCode,
-               ldsa.total_number totalNum,
-               ltco.plan_num planNum,
-               ltco.real_num realNum
-        from logpm_trunkline_cars_order ltco
-        left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code and ldsa.warehouse_id = #{warehouseId}
-        where load_id = #{loadId}
-          and node_id = #{warehouseId}
-        and real_num > 0
-          and `type` = 1
+        select t.order_code orderCode,
+               t.waybill_no waybillNo,
+               t.real_num realNum,
+               if(t.abnormal_num > 0,1,0) isAbnormal,
+               IFNULL(ltco.plan_num,0) planNum,
+               IFNULL(ltwo.total_number,0) totalNum
+        from (select ltcls.waybill_no waybill_no,
+                     ltcls.order_code order_code,
+                     sum(IFNULL(ltcls.num,0)) real_num,
+                     sum(IFNULL(ltcls.loading_abnormal,0)) abnormal_num
+              from logpm_trunkline_cars_load_scan ltcls
+              where load_id = #{loadId}
+                and warehouse_id = #{warehouseId}
+                and is_data = 1
+                and `type` = 1 group by ltcls.waybill_no,
+                                        ltcls.order_code order by ltcls.update_time desc) t
+                 left join logpm_trunkline_cars_order ltco on ltco.load_id = #{loadId}
+            and ltco.order_code = t.order_code and ltco.waybill_no = t.waybill_no
+                 left join logpm_trunkline_waybill_order ltwo on ltwo.order_code = t.order_code and ltwo.waybill_no = t.waybill_no
     </select>
 
     <delete id="deleteByCarsOrderId" >
@@ -392,4 +400,22 @@
         where ltco.load_id = #{loadId}
     </select>
 
+
+    <select id="findLoadingOrderPlan" resultType="com.logpm.trunkline.vo.CarsLoadPackagePlanVO">
+        select ltad.order_code orderCode,
+               ltad.waybill_no waybillNo,
+               ltad.order_package_code orderPackageCode,
+               ltad.third_pack_name thirds,
+               ltad.material_name materialName
+        from logpm_trunkline_cars_order ltco
+        left join logpm_trunkline_advance_detail ltad on ltad.order_code = ltco.order_code and ltad.waybill_no = ltco.waybill_no
+        left join logpm_trunkline_cars_load_scan ltcls on ltcls.order_code = ltad.order_code and ltcls.waybill_no = ltad.waybill_no and ltcls.order_package_code = ltad.order_package_code
+        where ltco.load_id = #{loadId}
+        and ltco.node_id = #{warehouseId}
+        and ltco.type = 1
+        and ltcls.load_id = #{loadId}
+        and ltcls.warehouse_id = #{warehouseId}
+        and ltcls.type = 1
+    </select>
+
 </mapper>

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

@@ -37,7 +37,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
     IPage<TrunklineCarsLoadScanVO> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO);
 
-	List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId);
+	List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId,String waybillNo);
 
 	boolean deleteEntityByCarsLoadScanId(Long carsLoadScanId);
 

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

@@ -115,7 +115,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R updateLoadFeeByNodeId(TrunklineCarsLoadDTO carsLoadDTO,Long warehouseId,String warehouseName);
 
-	R findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId);
+	R findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId,String waybillNo);
 
 	R carsLoadDetailInfo(LoadCarsDTO loadCarsDTO);
 
@@ -248,4 +248,10 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findLinePhoto(LoadCarsDTO loadCarsDTO);
 
 	void updateCardLoadNum(Long loadId);
+
+	R findCarsLoadingOrderPlan(Long loadId, Long warehouseId);
+
+	R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark,Integer incomingType,String unloadTrayName,String unloadTrayCode);
+
+
 }

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

@@ -70,4 +70,6 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
 
 	List<TrunklineCarsOrderEntity> findListByLoadId(Long loadId);
 
+	List<CarsLoadPackagePlanVO> findLoadingOrderPlan(Long loadId, Long warehouseId);
+
 }

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

@@ -556,6 +556,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		if (Objects.isNull(consigneeId)) {
 			//如果收货单位没有id值，则把收货单位信息自动添加到client中
 			consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+
 		}
 		waybillEntity.setConsigneeId(consigneeId);
 		waybillEntity.setConsignee(openOrderDTO.getConsignee());
@@ -563,6 +564,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile());
 		waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress());
 
+		BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId);
+		if(!Objects.isNull(basicdataClient)){
+			waybillEntity.setServiceType(basicdataClient.getTypeService());
+		}else{
+			waybillEntity.setServiceType(1);
+		}
+
+
 		waybillEntity.setDestination(openOrderDTO.getDestination());
 		waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode());
 		waybillEntity.setDeparture(openOrderDTO.getDeparture());
@@ -894,6 +903,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile());
 		waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress());
 
+		BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(consigneeId);
+		if(!Objects.isNull(basicdataClient)){
+			waybillEntity.setServiceType(basicdataClient.getTypeService());
+		}else{
+			waybillEntity.setServiceType(1);
+		}
+
+
 		waybillEntity.setDestination(openOrderDTO.getDestination());
 		waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode());
 		waybillEntity.setGoodsName(openOrderDTO.getGoodsName());
@@ -2673,15 +2690,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 
 
-		//验证运单是否有配送任务
-		//查询运单下所有订单号
-		List<String> orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId);
-		//判断运单下所有订单是否在预约关联订单表上是否有数据
-		List<Long> reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes);
-		if(CollUtil.isNotEmpty(reservationIds)){
-			log.warn("#############updateWaybill: 已创建配送任务无法改单 waybillId={}", waybillId);
-			return R.fail(405, "已创建配送任务无法改单");
-		}
+//		//验证运单是否有配送任务
+//		//查询运单下所有订单号
+//		List<String> orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId);
+//		//判断运单下所有订单是否在预约关联订单表上是否有数据
+//		List<Long> reservationIds = reservationStockarticleClient.findReservationIdsByOrderCodes(orderCodes);
+//		if(CollUtil.isNotEmpty(reservationIds)){
+//			log.warn("#############updateWaybill: 已创建配送任务无法改单 waybillId={}", waybillId);
+//			return R.fail(405, "已创建配送任务无法改单");
+//		}
 
 
 		// 得到改单之前的收货单位
@@ -5569,7 +5586,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit);
 		if(Objects.isNull(basicdataClientEntity)){
 			basicdataClientEntity = new BasicdataClientEntity();
+			String finallyClientCode = basicdataClientClient.getFinallyClientCode();
 			basicdataClientEntity.setClientName(unit);
+			basicdataClientEntity.setClientCode(finallyClientCode);
 			basicdataClientEntity.setTypeService(2);
 			basicdataClientEntity.setCargoControl(false);
 			basicdataClientEntity.setClientType(type);//1 工厂  2 商场 3装饰 4个人 5门店 6发货单位

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

@@ -81,8 +81,8 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 	}
 
 	@Override
-	public List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId) {
-		return baseMapper.findCarsLoadingOrderDetail(loadId,orderCode,warehouseId);
+	public List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId,String waybillNo) {
+		return baseMapper.findCarsLoadingOrderDetail(loadId,orderCode,warehouseId,waybillNo);
 	}
 
 	@Override

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

@@ -264,6 +264,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		if (startCarType == 1) {
 			//车辆配载发车
+			Integer realLoadingNumber = carsLoadEntity.getRealLoadingNumber();
+			if(NumberUtil.equals(realLoadingNumber,0)){
+				log.warn("#############startCarByLoadId: 车辆还未装车 loadId={} realLoadingNumber={}", loadId, realLoadingNumber);
+				throw new CustomerException(405, "车辆还未装车");
+			}
+
+
 			//查询发站仓节点信息
 			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findStartNodeByLoadId(loadId);
 			String nodeStatus = carsLoadLineEntity.getNodeStatus();//节点状态 0未到达 1到车 2发车
@@ -2442,6 +2449,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		updateNumByLoadId(loadId);
 	}
 
+	@Override
+	public R findCarsLoadingOrderPlan(Long loadId, Long warehouseId) {
+
+		List<CarsLoadPackagePlanVO> list = trunklineCarsOrderService.findLoadingOrderPlan(loadId, warehouseId);
+
+		return R.data(list);
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
@@ -4488,9 +4503,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId) {
+	public R findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId,String waybillNo) {
 
-		List<OrderScanDetailVO> orderScanDetailList = trunklineCarsLoadScanService.findCarsLoadingOrderDetail(loadId, orderCode, warehouseId);
+		List<OrderScanDetailVO> orderScanDetailList = trunklineCarsLoadScanService.findCarsLoadingOrderDetail(loadId, orderCode, warehouseId,waybillNo);
 		if(CollUtil.isNotEmpty(orderScanDetailList)){
 			//把orderScanDetailList中所有元素的loadScanId放入一个List
 			List<Long> loadScanIdList = orderScanDetailList.stream().map(OrderScanDetailVO::getLoadScanId).collect(Collectors.toList());
@@ -8293,7 +8308,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("load_id", loadId)
 			.eq("warehouse_id", warehouseId)
-			.eq("loading_abnormal", 1);
+			.eq("loading_abnormal", 1)
+			.eq("is_data", 0)
+			.orderByDesc("update_time");
 		List<TrunklineCarsLoadScanEntity> exceptionList = trunklineCarsLoadScanService.list(queryWrapper);
 
 		TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO();
@@ -8861,6 +8878,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 		}
 
+		//查询包件是否签收
+		DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
+		if (!Objects.isNull(distributionParcelListEntity)) {
+			log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return R.fail(405, "包件已签收");
+		}
+
+
 		QueryWrapper<TrunklineCarsLoadScanEntity> neloadScanQueryWrapper = new QueryWrapper<>();
 		neloadScanQueryWrapper.eq("load_id", loadId)
 			.eq("scan_code", orderPackageCode)
@@ -8869,6 +8894,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		TrunklineCarsLoadScanEntity scanEntity = trunklineCarsLoadScanService.getOne(neloadScanQueryWrapper);
 
 		if (!Objects.isNull(scanEntity)) {
+			Integer isData1 = scanEntity.getIsData();
+			if (isData1.equals(0)) {
+				log.warn("##############unloadPackage: 系统无编码 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				return R.fail(405, "系统无编码");
+			}
 			log.warn("##############unloadPackage: 包件已卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 			return R.fail(405, "包件已卸车");
 		}
@@ -9541,9 +9571,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum");
 		StringBuilder audio = new StringBuilder();
 		audio.append("卸车").append(totalUnloadNum).append("件");
-		if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){
-			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
-		}
+//		if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){
+//			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
+//		}
 
 		List<String> orderPackageCodeList = new ArrayList<>();
 		orderPackageCodeList.add(orderPackageCode);
@@ -9557,26 +9587,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 
+	@Transactional(rollbackFor = Exception.class)
+	@Override
 	public R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
-		log.info("#############unloadPackage: 卸车包件");
+		log.info("#############unloadPackageNoXz: 卸车包件");
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(basicdataWarehouseEntity)) {
-			log.warn("##############unloadPackage: 仓库信息不存在");
+			log.warn("##############unloadPackageNoXz: 仓库信息不存在");
 			return R.fail(405, "仓库信息不存在");
 		}
 		String warehouseName = basicdataWarehouseEntity.getName();
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if (Objects.isNull(carsLoadEntity)) {
-			log.warn("##############unloadPackage: 配载计划信息不存在 loadId={}", loadId);
+			log.warn("##############unloadPackageNoXz: 配载计划信息不存在 loadId={}", loadId);
 			return R.fail(405, "配载计划信息不存在");
 		}
 
 		String loadCode = carsLoadEntity.getCarsNo();
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(carsLoadLineEntity)) {
-			log.warn("############unloadPackage: 配载计划节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId);
+			log.warn("############unloadPackageNoXz: 配载计划节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId);
 			return R.fail(405, "配载计划节点信息不存在");
 		}
 //		String unloadStatus = carsLoadLineEntity.getUnloadStatus();
@@ -9598,7 +9630,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		if (!Objects.isNull(distributionParcelListEntity)) {
 			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
 			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
-				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				log.warn("##############unloadPackageNoXz: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 				return R.fail(405, "包件已入库");
 			}
 		}
@@ -9606,7 +9638,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//先判断包件是否在配载计划的装车扫描中
 		QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper = new QueryWrapper<>();
 		loadScanQueryWrapper.eq("load_id", loadId)
-			.eq("scan_code", orderPackageCode);
+			.eq("scan_code", orderPackageCode)
+			.eq("scan_status","1");
 		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
 		//判断是否有装车扫描记录
 		if (Objects.isNull(carsLoadScanEntity)) {
@@ -9646,10 +9679,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanEntity.setUnloadNodeName(warehouseName);
 						trunklineCarsLoadScanEntity.setUnloadNodeId(warehouseId);
 						trunklineCarsLoadScanEntity.setUnloadNum(1);
-						trunklineCarsLoadScanEntity.setIsSupple(0);
+						trunklineCarsLoadScanEntity.setIsSupple(1);
 						trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 						trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 						trunklineCarsLoadScanEntity.setUnloadTime(new Date());
+						trunklineCarsLoadScanEntity.setRemark("异常补录卸车");
 						trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 						loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -9683,12 +9717,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanEntity.setUnloadNodeName(warehouseName);
 						trunklineCarsLoadScanEntity.setUnloadNodeId(warehouseId);
 						trunklineCarsLoadScanEntity.setUnloadNum(1);
-						trunklineCarsLoadScanEntity.setIsSupple(0);
+						trunklineCarsLoadScanEntity.setIsSupple(1);
 						trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 						trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 						trunklineCarsLoadScanEntity.setUnloadTime(new Date());
 						trunklineCarsLoadScanEntity.setFromWarehouseId(nowWarehouseId);
-						trunklineCarsLoadScanEntity.setRemark("无装车记录卸车");
+						trunklineCarsLoadScanEntity.setRemark("无装车记录 异常补录卸车");
 						trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 						loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -9702,13 +9736,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						try {
 							carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseName, loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
 						} catch (Exception e) {
-							log.warn("###############unloadPackage: 存入异常列表记录失败");
+							log.warn("###############unloadPackageNoXz: 存入异常列表记录失败");
 						}
 
 
 						DistributionParcelListEntity nowParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, nowWarehouseId);
 						if(Objects.isNull(nowParcelListEntity)){
-							log.warn("###############unloadPackage: 包件信息不存在 orderPackageCode={},nowWarehouseId={}",orderPackageCode,nowWarehouseId);
+							log.warn("###############unloadPackageNoXz: 包件信息不存在 orderPackageCode={},nowWarehouseId={}",orderPackageCode,nowWarehouseId);
 							return R.fail(405,"包件信息不存在");
 						}
 						orderCode = nowParcelListEntity.getOrderCode();
@@ -9718,7 +9752,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 						DistributionStockArticleEntity nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, nowWarehouseId);
 						if(Objects.isNull(nowDistributionStockArticle)){
-							log.warn("###############unloadPackage: 订单信息不存在 orderCode={},nowWarehouseId={}",orderCode,nowWarehouseId);
+							log.warn("###############unloadPackageNoXz: 订单信息不存在 orderCode={},nowWarehouseId={}",orderCode,nowWarehouseId);
 							return R.fail(405,"订单信息不存在");
 						}
 						Long articleId = nowDistributionStockArticle.getId();
@@ -9805,36 +9839,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						}
 					}
 				}else{
-					//需要补装车扫记录
-					TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
-					trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);
-					trunklineCarsLoadScanEntity.setWarehouseName(warehouseName);
-					trunklineCarsLoadScanEntity.setLoadId(loadId);
-					trunklineCarsLoadScanEntity.setLoadCode(loadCode);
-					trunklineCarsLoadScanEntity.setOrderCode("--");
-					trunklineCarsLoadScanEntity.setScanCode(orderPackageCode);
-					trunklineCarsLoadScanEntity.setScanStatus("2");
-					trunklineCarsLoadScanEntity.setNum(1);
-					trunklineCarsLoadScanEntity.setType(1);
-					trunklineCarsLoadScanEntity.setIsData(0);
-					isData=0;
-					trunklineCarsLoadScanEntity.setLoadingAbnormal(1);
-					trunklineCarsLoadScanEntity.setUnloadAbnormal(1);
-					trunklineCarsLoadScanEntity.setUnloadNodeName(warehouseName);
-					trunklineCarsLoadScanEntity.setUnloadNodeId(warehouseId);
-					trunklineCarsLoadScanEntity.setUnloadNum(1);
-					trunklineCarsLoadScanEntity.setIsSupple(0);
-					trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
-					trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
-					trunklineCarsLoadScanEntity.setUnloadTime(new Date());
-					trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
-					loadScanId = trunklineCarsLoadScanEntity.getId();
 
-					trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
-						1, 0, 1, trayId, trayCode, trayName, null, loadScanId, "无数据,补装车计划,异常装车");
+					log.info("################unloadPackageNoXz: 无系统编码 orderPackageCode={}",orderPackageCode);
+					return R.fail(405,"无系统编码");
 
-					trunklineCarsUnloadLogService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
-						1, 0, 1, trayId, trayCode, trayName, null, loadScanId, "无数据,异常卸车");
+					//需要补装车扫记录
+//					TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
+//					trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);
+//					trunklineCarsLoadScanEntity.setWarehouseName(warehouseName);
+//					trunklineCarsLoadScanEntity.setLoadId(loadId);
+//					trunklineCarsLoadScanEntity.setLoadCode(loadCode);
+//					trunklineCarsLoadScanEntity.setOrderCode("--");
+//					trunklineCarsLoadScanEntity.setScanCode(orderPackageCode);
+//					trunklineCarsLoadScanEntity.setScanStatus("2");
+//					trunklineCarsLoadScanEntity.setNum(1);
+//					trunklineCarsLoadScanEntity.setType(1);
+//					trunklineCarsLoadScanEntity.setIsData(0);
+//					isData=0;
+//					trunklineCarsLoadScanEntity.setLoadingAbnormal(1);
+//					trunklineCarsLoadScanEntity.setUnloadAbnormal(1);
+//					trunklineCarsLoadScanEntity.setUnloadNodeName(warehouseName);
+//					trunklineCarsLoadScanEntity.setUnloadNodeId(warehouseId);
+//					trunklineCarsLoadScanEntity.setUnloadNum(1);
+//					trunklineCarsLoadScanEntity.setIsSupple(1);
+//					trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
+//					trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
+//					trunklineCarsLoadScanEntity.setUnloadTime(new Date());
+//					trunklineCarsLoadScanEntity.setRemark("异常补录卸车");
+//					trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
+//					loadScanId = trunklineCarsLoadScanEntity.getId();
+//
+//					trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
+//						1, 0, 1, trayId, trayCode, trayName, null, loadScanId, "无数据,补装车计划,异常装车");
+//
+//					trunklineCarsUnloadLogService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, null, null, null, orderPackageCode, 1,
+//						1, 0, 1, trayId, trayCode, trayName, null, loadScanId, "无数据,异常卸车");
 
 				}
 			} else {
@@ -9847,7 +9886,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, wid);
 				if (Objects.isNull(stockArticleEntity)) {
-					log.warn("##############unloadPackage: 订单信息不存在 orderCode={} wid={}", orderCode, wid);
+					log.warn("##############unloadPackageNoXz: 订单信息不存在 orderCode={} wid={}", orderCode, wid);
 					return R.fail(405, "订单信息不存在");
 				}
 				Long articleId = stockArticleEntity.getId();
@@ -9879,6 +9918,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 				trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 				trunklineCarsLoadScanEntity.setUnloadTime(new Date());
+				trunklineCarsLoadScanEntity.setIsSupple(1);
+				trunklineCarsLoadScanEntity.setRemark("无计划异常补录卸车");
 				trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 
 				isData = 1;
@@ -10012,6 +10053,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setScanStatus("2");
 			carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 			carsLoadScanEntity.setUnloadTime(new Date());
+			carsLoadScanEntity.setUnloadAbnormal(1);
+			carsLoadScanEntity.setIsSupple(1);
 			trayCode = carsLoadScanEntity.getTrayCode();
 			if (!StringUtil.isBlank(trayCode)) {
 				BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
@@ -10209,12 +10252,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						.content(Collections.singletonList(PushData.builder()
 							.packageCode(orderPackageCode)
 							.warehouseName(warehouseName)
+							.waybillNumber(parcelListEntity.getWaybillNumber())
 							.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
 							.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
 							.orderCode(orderCode)
 							.build()))
 						.build();
 					factoryDataMessageSender.sendNodeDataByBrand(nodePushMsg);
+
+					//卸车确认
+					Long warehouseId1 = parcelListEntity.getWarehouseId();
+					Long acceptWarehouseId = parcelListEntity.getAcceptWarehouseId();
+					WorkNodeEnums node = WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING;
+					if(NumberUtil.equals(warehouseId1,acceptWarehouseId)){
+						node = WorkNodeEnums.END_WAREHOUSE_UNLOADING;
+					}
+					List<LoadScanBrandDTO> brands = this.baseMapper.fingPackageCodeByLoadId(loadId, warehouseId);
+					sendFactoryData(brands, node, warehouseId, 2);
+
 				}
 			} catch (Exception e) {
 				log.error("入库推送失败：{}", e);
@@ -10222,15 +10277,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		} catch (Exception e) {
 			log.warn("#########卸车存入日志失败");
 		}
-
 		JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId,warehouseId);
 		Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum");
 		Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum");
 		StringBuilder audio = new StringBuilder();
 		audio.append("卸车").append(totalUnloadNum).append("件");
-		if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){
-			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
-		}
+//		if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){
+//			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
+//		}
 
 
 		List<String> orderPackageCodeList = new ArrayList<>();
@@ -10760,27 +10814,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		//查询已扫描卸车的包件
 		List<UnloadScanOrderVO> unloadScanOrderList = trunklineCarsLoadScanService.findPackageWithOrderList(loadId, warehouseId);
+
+		List<UnloadPackageVO> unloadList = trunklineCarsLoadScanService.findUnloadPackageListByLoadIdAndFinalNodeId(loadId,warehouseId);
+
 		if(CollUtil.isNotEmpty(unloadScanOrderList)){
 			//把unloadScanOrderList中所有元素转化成以orderCode为key的map
 //			Map<String, List<UnloadScanOrderVO>> unloadScanOrderMap = unloadScanOrderList.stream().collect(Collectors.toMap(UnloadScanOrderVO::getOrderCode, Function.identity()));
-			Set<String> orderCodeSet = unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toSet());
+//			Set<String> orderCodeSet = unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toSet());
 //			Map<String, List<UnloadScanOrderVO>> unloadScanOrderMap =unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toList())
 //			Set<String> orderCodeSet = unloadScanOrderMap.keySet();
-			List<OrderCodeNumVO> orderCodeNumList = trunklineAdvanceDetailService.findTotalNumByOrderCodes(orderCodeSet);
+//			List<OrderCodeNumVO> orderCodeNumList = trunklineAdvanceDetailService.findTotalNumByOrderCodes(orderCodeSet);
 			//把orderCodeNumList中所有元素转化成以orderCode为key的map
-			Map<String, OrderCodeNumVO> orderCodeNumMap = orderCodeNumList.stream().collect(Collectors.toMap(OrderCodeNumVO::getOrderCode, Function.identity()));
-
-			List<UnloadPackageVO> unloadList = trunklineCarsLoadScanService.findUnloadPackageListByLoadIdAndFinalNodeId(loadId,warehouseId);
+//			Map<String, OrderCodeNumVO> orderCodeNumMap = orderCodeNumList.stream().collect(Collectors.toMap(OrderCodeNumVO::getOrderCode, Function.identity()));
 
 			for (UnloadScanOrderVO unloadScanOrderVO : unloadScanOrderList) {
 				String waybillNo = StringUtil.isBlank(unloadScanOrderVO.getWaybillNo())?"null":unloadScanOrderVO.getWaybillNo();
 				String orderCode = StringUtil.isBlank(unloadScanOrderVO.getOrderCode())?"null":unloadScanOrderVO.getOrderCode();
-				OrderCodeNumVO orderCodeNumVO = orderCodeNumMap.get(orderCode);
-				if(!Objects.isNull(orderCodeNumVO)){
-					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
-				}else{
-					unloadScanOrderVO.setTotalNumber(0);
-				}
+//				OrderCodeNumVO orderCodeNumVO = orderCodeNumMap.get(orderCode);
+//				if(!Objects.isNull(orderCodeNumVO)){
+//					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
+//				}else{
+//					unloadScanOrderVO.setTotalNumber(0);
+//				}
 
 				List<UnloadPackageVO> unloadPackageList = new ArrayList<>();
 				unloadList.forEach(unloadPackageVO -> {
@@ -10833,7 +10888,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("load_id", loadId)
 			.eq("unload_node_id", warehouseId)
-			.eq("unload_abnormal", 1);
+			.eq("unload_abnormal", 1)
+			.eq("is_data", 0)
+			.orderByDesc("update_time");
 		List<TrunklineCarsLoadScanEntity> exceptionList = trunklineCarsLoadScanService.list(queryWrapper);
 
 		TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO();

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

@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 @Slf4j
@@ -169,4 +168,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 		return baseMapper.findListByLoadId(loadId);
 	}
 
+	@Override
+	public List<CarsLoadPackagePlanVO> findLoadingOrderPlan(Long loadId, Long warehouseId) {
+		return baseMapper.findLoadingOrderPlan(loadId,warehouseId);
+	}
+
 }