1.干线-装车卸车逻辑优化

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

@@ -136,7 +136,7 @@ public interface IDistributionParcelListClient {
     void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer);
 
 	@GetMapping(API_PREFIX+"/updateEntityByOpenOrder")
-	void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId);
+	void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long waybillId);
 
 	@GetMapping(API_PREFIX+"/findByWaybillNumber")
 	List<DistributionParcelListEntity> findByWaybillNumber(@RequestParam String waybillNumber);
@@ -146,4 +146,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/getListByOrderPackageCode")
 	List<DistributionParcelListEntity> getListByOrderPackageCode(@RequestParam String orderPackageCode);
+
+	@GetMapping(API_PREFIX+"/findAllStockListByOrderPackageCode")
+	List<DistributionParcelListEntity> findAllStockListByOrderPackageCode(String orderPackageCode);
 }

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

@@ -145,4 +145,7 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/maintenanceOrderStatus")
     Boolean maintenanceOrderStatus(String warehouseId);
+
+	@PostMapping(API_PREFIX + "/updateByBatchId")
+	void updateByBatchId(@RequestBody List<DistributionStockArticleEntity> stockArticleEntities);
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseAbnormalRecordEntity.java

@@ -0,0 +1,90 @@
+package com.logpm.warehouse.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;
+
+import java.util.Date;
+
+@Data
+@TableName("logpm_warehouse_abnormal_record")
+@ApiModel(value = "WarehouseAbnormalRecord对象", description = "异常记录表")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseAbnormalRecordEntity 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 ;
+
+	@ApiModelProperty(name = "类型 1入库 2出库",notes = "")
+	private String type;
+
+
+	@ApiModelProperty(name = "异常类型 1无系统编码  2无装车计划 3无装车记录 4无卸车记录",notes = "")
+	private String abnormalType;
+
+	@ApiModelProperty(name = "车类型 1干线",notes = "")
+	private String carType;
+
+	@ApiModelProperty(name = "上报仓库id",notes = "")
+	private Long upWarehouseId;
+
+	@ApiModelProperty(name = "上报仓库名称",notes = "")
+	private String upWarehouseName;
+
+	@ApiModelProperty(name = "车次号",notes = "")
+	private String carsNo;
+
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo;
+
+	@ApiModelProperty(name = "订单号",notes = "")
+	private String orderCode;
+
+	@ApiModelProperty(name = "包件码",notes = "")
+	private String orderPackageCode;
+
+
+	@ApiModelProperty(name = "上报用户id",notes = "")
+	private Long upUserId;
+
+	@ApiModelProperty(name = "上报用户名称",notes = "")
+	private String upUserName;
+
+
+	@ApiModelProperty(name = "异常状态  0待处理  1完结",notes = "")
+	private Integer abnormalStatus;
+
+	@ApiModelProperty(name = "上报时间",notes = "")
+	private Date upTime;
+
+	@ApiModelProperty(name = "处理时间",notes = "")
+	private Date dealTime;
+
+
+	@ApiModelProperty(name = "处理用户id",notes = "")
+	private Long dealUserId;
+
+	@ApiModelProperty(name = "处理用户名称",notes = "")
+	private String dealUserName;
+
+
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark;
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseAbnormalRecordClient.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 货位 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-08-14
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseAbnormalRecordClient {
+
+    String API_PREFIX = "abormal/client";
+    String TOP = API_PREFIX + "/top";
+
+    @PostMapping(API_PREFIX+"/addAbnormalRecord")
+    void addAbnormalRecord(@RequestBody WarehouseAbnormalRecordEntity warehouseAbnormalRecordEntity);
+
+
+
+}

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

@@ -280,13 +280,13 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
-	public void updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) {
+	public void updateEntityByOpenOrder(Long advanceId, Long waybillId) {
 
-		Set<String> set = distributionParcelListService.updateEntityByOpenOrder(advanceId, warehouseId, waybillId);
+		Set<String> set = distributionParcelListService.updateEntityByOpenOrder(advanceId, waybillId);
 
-		for (String orderCode : set) {
-			distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
-		}
+//		for (String orderCode : set) {
+//			distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
+//		}
 
 	}
 
@@ -307,4 +307,13 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 
 		return distributionParcelListService.list(queryWrapper);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findAllStockListByOrderPackageCode(String orderPackageCode) {
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_package_code",orderPackageCode)
+			.eq("order_package_status","20");
+
+		return distributionParcelListService.list(queryWrapper);
+	}
 }

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

@@ -301,4 +301,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionStockArticleService.maintenanceOrderInfoByWarehouseId(warehouseId);
 	}
 
+	@Override
+	public void updateByBatchId(List<DistributionStockArticleEntity> stockArticleEntities) {
+		distributionStockArticleService.updateBatchById(stockArticleEntities);
+	}
+
 }

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

@@ -227,4 +227,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 * @return
 	 */
 	DistributionParcelListNodeVO selectPackageExamineAbnormal(@Param("orderPackageCode") String orderPackageCode,@Param("warehouseId") Long warehouseId);
+
+    String findOrderWaybillNo(@Param("orderId") Long orderId);
 }

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

@@ -948,6 +948,7 @@
         from logpm_distribution_parcel_list
         where order_package_code = #{orderPackageCode}
         and order_package_status = '20'
+        order by create_time desc
         limit 1
     </select>
     <select id="selectByOrderPackageCode"
@@ -1337,4 +1338,14 @@
         WHERE
         ldla.package_code = #{orderPackageCode} AND ldpl.warehouse_id = #{warehouseId} AND ldla.auditing_status = 2
     </select>
+
+    <select id="findOrderWaybillNo" resultType="String">
+        select GROUP_CONCAT(DISTINCT ldpl.waybill_number)
+        from logpm_distribution_parcel_list ldpl
+        where ldpl.stock_article_id = #{orderId}
+        and ldpl.waybill_number is not null
+        and ldpl.waybill_number != ''
+    </select>
+
+
 </mapper>

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

@@ -173,7 +173,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	void updateTransferStatus(String orderCode, Long warehouseId,Integer isTransfer);
 
-	Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId);
+	Set<String> updateEntityByOpenOrder(Long advanceId, Long waybillId);
 
 	/**
 	 * 根据运单号找

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

@@ -674,7 +674,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	}
 
 	@Override
-	public Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) {
+	public Set<String> updateEntityByOpenOrder(Long advanceId, Long waybillId) {
 		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 		if (Objects.isNull(waybillEntity)) {
 			log.warn("############updateEntityByOpenOrder: 运单信息不存在 waybillId={}", waybillId);
@@ -688,11 +688,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("advance_id", advanceId)
-			.eq("warehouse_id", warehouseId)
 			.eq("is_deleted", 0);
 		List<DistributionParcelListEntity> listEntityList = baseMapper.selectList(queryWrapper);
 		Set<String> orderCodes = new TreeSet<>();
 		for (DistributionParcelListEntity parcelListEntity : listEntityList) {
+			Long packageWarehouseId = parcelListEntity.getWarehouseId();
 			parcelListEntity.setWaybillId(waybillId + "");
 			parcelListEntity.setWaybillNumber(waybillNo);
 			parcelListEntity.setSendWarehouseId(departureWarehouseId);
@@ -702,33 +702,37 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			if (departureWarehouseId.equals(destinationWarehouseId)) {
 				parcelListEntity.setIsTransfer(0);
 			} else {
-				parcelListEntity.setIsTransfer(1);
+				if(destinationWarehouseId.equals(packageWarehouseId)){
+					parcelListEntity.setIsTransfer(0);
+				}else{
+					parcelListEntity.setIsTransfer(1);
+				}
 			}
 			orderCodes.add(parcelListEntity.getOrderCode());
 		}
 		updateBatchById(listEntityList);
 
+		Long consigneeId = waybillEntity.getConsigneeId();
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
 
 		for (String orderCode : orderCodes) {
 			QueryWrapper<DistributionStockArticleEntity> stockArticleEntityQueryWrapper = new QueryWrapper<>();
 			stockArticleEntityQueryWrapper.eq("order_code", orderCode)
-				.eq("warehouse_id", warehouseId)
 				.eq("is_deleted", 0);
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectOne(stockArticleEntityQueryWrapper);
-			if (Objects.isNull(stockArticleEntity)) {
-				log.error("############updateEntityByOpenOrder: 未找到订单信息 orderCode={}", orderCode);
-				continue;
+			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleMapper.selectList(stockArticleEntityQueryWrapper);
+			for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) {
+				Long orderId = stockArticleEntity.getId();
+				String waybillNumber = baseMapper.findOrderWaybillNo(orderId);
+				stockArticleEntity.setWaybillNumber(waybillNumber);
+				stockArticleEntity.setMallId(consigneeId);
+				stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+				stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+				stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName());
+				stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile());
+				stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress());
+				stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName());
+				distributionStockArticleMapper.updateById(stockArticleEntity);
 			}
-			Long consigneeId = waybillEntity.getConsigneeId();
-			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
-			stockArticleEntity.setMallId(consigneeId);
-			stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
-			stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-			stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName());
-			stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile());
-			stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress());
-			stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName());
-			distributionStockArticleMapper.updateById(stockArticleEntity);
 		}
 		return orderCodes;
 	}

blade-service/logpm-patch/src/main/java/com/logpm/patch/receiver/SyncUpdownDataHandler.java

@@ -54,7 +54,4 @@ public class SyncUpdownDataHandler {
 		}
 	}
 
-
-
-
 }

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

@@ -2174,4 +2174,36 @@ public class CarsLoadController {
 			return R.fail(500,"系统异常");
 		}
 	}
+
+
+	@ResponseBody
+	@PostMapping("/abnormalList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "成本分摊", notes = "传入loadCarsDTO")
+	public R abnormalList(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############abnormalList: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			return carsLoadService.abnormalList(loadCarsDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
+
 }

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

@@ -99,4 +99,5 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 
     List<TrunklineCarsLoadScanEntity> findListByLoadIdOrderByCreateTimeAsc(@Param("loadId") Long loadId);
 
+    IPage<TrunklineCarsLoadScanVO> abnormalList(IPage<Object> page, @Param("loadCarsDTO") LoadCarsDTO loadCarsDTO);
 }

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

@@ -462,4 +462,11 @@
         order by create_time asc
     </select>
 
+    <select id="abnormalList" resultType="com.logpm.trunkline.vo.TrunklineCarsLoadScanVO">
+        select ltcls.*
+        from logpm_trunkline_cars_load_scan ltcls
+        where ltcls.scan_status != '1'
+        and (ltcls.is_data = 0 or ltcls.loading_abnormal = 1 or ltcls.unload_abnormal = 1)
+    </select>
+
 </mapper>

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

@@ -94,4 +94,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
     List<TrunklineCarsLoadScanEntity> findListByLoadIdOrderByCreateTimeAsc(Long loadId);
 
+    IPage<TrunklineCarsLoadScanVO> abnormalList(IPage<Object> page, LoadCarsDTO loadCarsDTO);
 }

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

@@ -186,4 +186,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findCostShareBefore(Long loadId);
 
 	R costShareByLoadId(Long loadId);
+
+	R abnormalList(LoadCarsDTO loadCarsDTO);
 }

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

@@ -289,10 +289,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//如果运单号为空则自动生成运单号
 		if(StringUtil.isBlank(waybillNo)){
 			waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, "");
-			WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			while(!Objects.isNull(warehouseWaybillEntity)){
-				waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, "");
-			}
+//			WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+//			while(!Objects.isNull(warehouseWaybillEntity)){
+//				waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, "");
+//			}
 		}
 		Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId();
 		Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId();
@@ -451,8 +451,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findList(advanceEntity.getId());
 			trunklineWaybillPackageService.saveList(list,waybillEntity);
-			distributionParcelListClient.updateEntityByOpenOrder(advanceId,warehouseId,waybillId);
-			orderCodes.add(advanceEntity.getOrderCode());
+			distributionParcelListClient.updateEntityByOpenOrder(advanceId,waybillId);
+//			orderCodes.add(advanceEntity.getOrderCode());
 			advanceEntity.setWaybillStatus("1");
 			advanceEntity.setWaybillNo(waybillEntity.getWaybillNo());
 		}
@@ -465,22 +465,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 //			isTransfer = 0;
 //		}
 
-		for (String orderCode : orderCodes) {
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
-			if(!Objects.isNull(stockArticleEntity)){
-				stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee());
-				stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName());
-				stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile());
-				stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress());
-				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
-				if(Objects.isNull(basicdataClientEntity)){
-					stockArticleEntity.setMallId(consigneeId);
-					stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
-					stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-				}
-				distributionStockArticleClient.saveOrUpdate(stockArticleEntity);
-			}
-		}
+//		for (String orderCode : orderCodes) {
+//			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleClient.findListByOrderCode(orderCode);
+//			for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) {
+//				Long orderWarehouseId = stockArticleEntity.getWarehouseId();
+//				stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee());
+//				stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName());
+//				stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile());
+//				stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress());
+//				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
+//				if(!Objects.isNull(basicdataClientEntity)){
+//					stockArticleEntity.setMallId(consigneeId);
+//					stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+//					stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+//				}
+//			}
+//			distributionStockArticleClient.updateByBatchId(stockArticleEntities);
+//		}
 
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);

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

@@ -227,4 +227,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findListByLoadIdOrderByCreateTimeAsc(loadId);
 	}
 
+	@Override
+	public IPage<TrunklineCarsLoadScanVO> abnormalList(IPage<Object> page, LoadCarsDTO loadCarsDTO) {
+		return baseMapper.abnormalList(page,loadCarsDTO);
+	}
+
 }

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

@@ -24,10 +24,7 @@ import com.logpm.trunkline.service.*;
 import com.logpm.trunkline.vo.*;
 import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
-import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
-import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
-import com.logpm.warehouse.feign.IWarehouseWaybillClient;
-import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient;
+import com.logpm.warehouse.feign.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringEscapeUtils;
@@ -86,6 +83,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	private final IOpenOrderAsyncService openOrderAsyncService;
 	private final IDistributionParcelNumberClient distributionParcelNumberClient;
 	private final ITrunklineCostShareRecordService trunklineCostShareRecordService;
+	private final ITrunklineAdvanceService advanceService;
+	private final IWarehouseAbnormalRecordClient abnormalRecordClient;
 
 	@Override
 	public IPage<TrunklineCarsLoadVO> loadCarsPageList(LoadCarsDTO loadCarsDTO) {
@@ -756,6 +755,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			try{
 				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: 存入日志失败");
 			}
@@ -1803,11 +1806,48 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			isAbnormal = 1;
 			DistributionParcelListEntity otherParcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);
 			if(Objects.isNull(otherParcelListEntity)){
-				carsLoadScanEntity.setOrderCode("--");
-				carsLoadScanEntity.setIsData(0);
-				isData = 0;
-				remark = "无数据,异常装车";
+				TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
+				if(Objects.isNull(trunklineAdvanceDetailEntity)){
+					carsLoadScanEntity.setOrderCode("--");
+					carsLoadScanEntity.setIsData(0);
+					isData = 0;
+					remark = "无系统数据,异常装车";
+				}else{
+					carsLoadScanEntity.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
+					carsLoadScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
+					carsLoadScanEntity.setIsData(1);
+					String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus();
+					if("0".equals(packageStatus)){
+						//未入库
+						log.warn("##################loadingScan: 包件暂未入库 orderPackageCode={}",orderPackageCode);
+						return R.fail(405,"包件暂未入库");
+					}else{
+						//已入库
+						String waybillNo1 = trunklineAdvanceDetailEntity.getWaybillNo();
+						if(StringUtil.isBlank(waybillNo1)){
+							log.warn("##################loadingScan: 暂存单未开单 orderPackageCode={}",orderPackageCode);
+							return R.fail(405,"订单未开单");
+						}else{
+							log.warn("##################loadingScan: 包件暂未入到本仓 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
+							return R.fail(405,"包件暂未入到本仓");
+						}
+					}
+				}
 			}else{
+				//先把其他仓在库的包件出库并下架
+//				try{
+//					List<DistributionParcelListEntity> parcelListEntities = distributionParcelListClient.findAllStockListByOrderPackageCode(orderPackageCode);
+//					for (DistributionParcelListEntity listEntity : parcelListEntities) {
+//						listEntity.setOrderPackageStatus("60");
+//						distributionParcelListClient.update(listEntity);
+//						Long warehouseId1 = listEntity.getWarehouseId();
+//						updownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId1);
+//					}
+//				}catch (Exception e){
+//					log.warn("################loadingScan: 下架及解托包件失败");
+//				}
+
+
 				carsLoadScanEntity.setIsData(1);
 				isData = 1;
 				Long otherPackageId = otherParcelListEntity.getId();
@@ -3773,6 +3813,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("成本计算开始，几分钟后请刷新页面查看");
 	}
 
+	@Override
+	public R abnormalList(LoadCarsDTO loadCarsDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(loadCarsDTO.getPageNum());
+		page.setSize(loadCarsDTO.getPageSize());
+
+		IPage<TrunklineCarsLoadScanVO> ls = trunklineCarsLoadScanService.abnormalList(page,loadCarsDTO);
+
+		return R.data(ls);
+	}
+
 	@Override
 	public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) {
 		log.info("##############loadingTrayInfo: 查询托盘的货物信息");
@@ -4354,11 +4405,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					distributionParcelListEntity = new DistributionParcelListEntity();
 					BeanUtil.copy(parcelListEntity,distributionParcelListEntity);
 					distributionParcelListEntity.setId(null);
-					distributionParcelListEntity.setOrderPackageStatus("30");
+					distributionParcelListEntity.setOrderPackageStatus("20");
 					if(!Objects.isNull(warehouseWaybillEntity)){
 						Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 						if(destinationWarehouseId.equals(warehouseId)){
-							distributionParcelListEntity.setOrderPackageStatus("20");
+							distributionParcelListEntity.setIsTransfer(0);
+						}else{
+							distributionParcelListEntity.setIsTransfer(1);
 						}
 					}
 					distributionParcelListEntity.setWarehouseId(warehouseId);
@@ -4376,15 +4429,61 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						distributionStockArticleClient.addIncomingNum(currentOrderId,1);
 					}
 				}else{
-					Long packageId = distributionParcelListEntity.getId();
-					String packageStatus = "30";
 					if(!Objects.isNull(warehouseWaybillEntity)){
 						Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 						if(destinationWarehouseId.equals(warehouseId)){
-							packageStatus = "20";
+							distributionParcelListEntity.setIsTransfer(0);
+						}else{
+							distributionParcelListEntity.setIsTransfer(1);
+						}
+					}
+					distributionParcelListClient.update(distributionParcelListEntity);
+				}
+			}else{
+				//无数据
+				TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
+				if(!Objects.isNull(advanceDetailEntity)){
+					String packageStatus = advanceDetailEntity.getPackageStatus();
+					String orderCode1 = advanceDetailEntity.getOrderCode();
+					String waybillNo1 = advanceDetailEntity.getWaybillNo();
+					if("0".equals(packageStatus)){
+						//未入库
+						InComingDTO inComingDTO = new InComingDTO();
+						inComingDTO.setOrderPackageCode(orderPackageCode);
+						inComingDTO.setWarehouseId(warehouseId);
+						inComingService.incomingPackage(inComingDTO);
+
+						carsLoadScanEntity.setOrderCode(orderCode1);
+						carsLoadScanEntity.setWaybillNo(waybillNo1);
+						carsLoadScanEntity.setIsData(1);
+						trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
+					}else{
+						DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);
+						if(!Objects.isNull(parcelListEntity)){
+							String orderCode2 = parcelListEntity.getOrderCode();
+							DistributionStockArticleEntity newStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode2, warehouseId);
+							Long orderId = null;
+							if(Objects.isNull(newStockArticle)){
+								newStockArticle = new DistributionStockArticleEntity();
+								Long stockArticleId = parcelListEntity.getStockArticleId();
+								DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
+								BeanUtil.copy(stockArticleEntity,newStockArticle);
+								newStockArticle.setId(null);
+								newStockArticle.setWarehouseId(warehouseId);
+								newStockArticle.setWarehouse(basicdataWarehouseEntity.getName());
+								orderId = distributionStockArticleClient.addData(newStockArticle);
+							}else{
+								orderId = newStockArticle.getId();
+							}
+							DistributionParcelListEntity newParcelListEntity = new DistributionParcelListEntity();
+							BeanUtil.copy(parcelListEntity,newParcelListEntity);
+							newParcelListEntity.setId(null);
+							newParcelListEntity.setWarehouseId(warehouseId);
+							newParcelListEntity.setWarehouse(basicdataWarehouseEntity.getName());
+							newParcelListEntity.setStockArticleId(orderId);
+							distributionParcelListClient.add(newParcelListEntity);
 						}
 					}
-					distributionParcelListClient.updateOrderPackageCodeById(packageId,packageStatus);
 				}
 			}
 		}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseAbnormalRecordController.java

@@ -0,0 +1,77 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.warehouse.dto.AbnormalRecordDTO;
+import com.logpm.warehouse.service.IWarehouseAbnormalRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 运单表 控制器
+ *
+ * @author zhy
+ * @since 2023-07-10
+ */
+@Log4j2
+@RestController
+@AllArgsConstructor
+@RequestMapping("/abnormal")
+@Api(value = "异常列表", tags = "异常列表接口")
+public class WarehouseAbnormalRecordController extends BladeController {
+
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final IWarehouseAbnormalRecordService warehouseAbnormalRecordService;
+
+	@ResponseBody
+	@PostMapping("/findPageList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询异常列表", notes = "传入waybillDTO")
+	public R findPageList(@RequestBody AbnormalRecordDTO abnormalRecordDTO) {
+		String method = "############findPageList: ";
+		log.info(method + "请求参数{}", abnormalRecordDTO);
+
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+			abnormalRecordDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			return warehouseAbnormalRecordService.findPageList(abnormalRecordDTO);
+		}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-warehouse/src/main/java/com/logpm/warehouse/dto/AbnormalRecordDTO.java

@@ -0,0 +1,14 @@
+package com.logpm.warehouse.dto;
+
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import lombok.Data;
+
+@Data
+public class AbnormalRecordDTO extends WarehouseAbnormalRecordEntity {
+
+	private Long warehouseId;
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseAbnormalRecordClient.java

@@ -0,0 +1,20 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import com.logpm.warehouse.service.IWarehouseAbnormalRecordService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseAbnormalRecordClient implements IWarehouseAbnormalRecordClient {
+
+	private final IWarehouseAbnormalRecordService warehouseAbnormalRecordService;
+
+	@Override
+	public void addAbnormalRecord(WarehouseAbnormalRecordEntity warehouseAbnormalRecordEntity) {
+		warehouseAbnormalRecordService.save(warehouseAbnormalRecordEntity);
+	}
+}

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

@@ -0,0 +1,16 @@
+package com.logpm.warehouse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.dto.AbnormalRecordDTO;
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface WarehouseAbnormalRecordMapper extends BaseMapper<WarehouseAbnormalRecordEntity> {
+
+
+	IPage<WarehouseAbnormalRecordEntity> findPageList(IPage<Object> page, @Param("param") AbnormalRecordDTO abnormalRecordDTO);
+
+}

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

@@ -0,0 +1,11 @@
+<?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.warehouse.mapper.WarehouseAbnormalRecordMapper">
+
+    <select id="findPageList" resultType="com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity">
+        select *
+        from logpm_warehouse_abnormal_record
+        where 1=1
+    </select>
+
+</mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseAbnormalRecordService.java

@@ -0,0 +1,12 @@
+package com.logpm.warehouse.service;
+
+import com.logpm.warehouse.dto.AbnormalRecordDTO;
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IWarehouseAbnormalRecordService extends BaseService<WarehouseAbnormalRecordEntity> {
+	R findPageList(AbnormalRecordDTO abnormalRecordDTO);
+
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseAbnormalRecordServiceImpl.java

@@ -0,0 +1,31 @@
+package com.logpm.warehouse.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.warehouse.dto.AbnormalRecordDTO;
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
+import com.logpm.warehouse.mapper.WarehouseAbnormalRecordMapper;
+import com.logpm.warehouse.service.IWarehouseAbnormalRecordService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class WarehouseAbnormalRecordServiceImpl extends BaseServiceImpl<WarehouseAbnormalRecordMapper,WarehouseAbnormalRecordEntity> implements IWarehouseAbnormalRecordService {
+
+
+	@Override
+	public R findPageList(AbnormalRecordDTO abnormalRecordDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(abnormalRecordDTO.getPageNum());
+		page.setSize(abnormalRecordDTO.getPageSize());
+
+		IPage<WarehouseAbnormalRecordEntity> pageList = baseMapper.findPageList(page,abnormalRecordDTO);
+
+		return R.data(pageList);
+	}
+}