Merge branch 'pre-production'

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

@@ -87,4 +87,11 @@ public class WarehouseAbnormalRecordEntity extends TenantEntity {
 	@ApiModelProperty(name = "备注",notes = "")
 	private String remark;
 
+	@ApiModelProperty(name = "关联id",notes = "")
+	private Long associationId;
+
+	@ApiModelProperty(name = "关联类型",notes = "")
+	private Integer associationType;
+
+
 }

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

@@ -39,6 +39,4 @@ public interface IWarehouseAbnormalRecordClient {
     @PostMapping(API_PREFIX+"/addAbnormalRecord")
     void addAbnormalRecord(@RequestBody WarehouseAbnormalRecordEntity warehouseAbnormalRecordEntity);
 
-
-
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -45,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 基础客户表 服务实现类
@@ -326,6 +327,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				|| ii.getClientName().equals(basicdataClient.getClientName()));
 
 			if(b){
+				List<BasicdataClientEntity> basicdataClientEntities = basicdataClients.stream().filter(ii -> ii.getClientCode().equals(basicdataClient.getClientCode())
+					|| ii.getClientName().equals(basicdataClient.getClientName())).collect(Collectors.toList());
+				log.info("###############basicdataClientEntities重复客户:{}",basicdataClientEntities);
 				throw new ServiceException("客户编码或客户名称已存在");
 			}
 //			Optional<DictBiz> first = dictBizs.stream().filter(ii -> ii.getDictValue().equals(i.getTypeService())).findFirst();
@@ -355,6 +359,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 						storeBusinessEntities.add(storeBusinessEntity);
 					}
 					//添加服务仓
+
 					if(ObjectUtils.isNotNull(i.getServeWarehouseName())){
 						BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity();
 						servicesEntity.setClientId(basicdataClient.getId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -278,11 +278,14 @@ public class DistributionStockupAppController extends BladeController {
 				//根据list列表统计计划件数
 				Integer planNum = 0;
 				Integer scanNum = 0;
+				Integer trayNum = 0;
 
 				if (!list.isEmpty()) {
 					for (DistributionStockupOrderListVO vo : list) {
 						planNum = planNum + vo.getPlanNum();
 						scanNum = scanNum + vo.getScanNum();
+						trayNum = trayNum + vo.getAllocationNumber();
+
 //					Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
 //					Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId());
 //					vo.setTrayLean(aBoolean);
@@ -315,6 +318,7 @@ public class DistributionStockupAppController extends BladeController {
 				}
 				map.put("planNum", planNum);
 				map.put("scanNum", scanNum);
+				map.put("trayNum", trayNum);
 				list.stream().forEach(f->f.setCompleteStact(false));
 				map.put("orderList", list);
 			} else if (orderStatus==2) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@@ -48,18 +48,49 @@ public class DistributionSignforExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("配送车次")
 	private String trainNumber;
+
+
 	/**
-	 * 订单自编号;订单关联id
+	 * 预约单号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号")
-	private String orderCode;
+	@ExcelProperty("预约单号")
+	private String reservationCode;
+
 	/**
-	 * 预约关联Id;预约关联id
+	 * 司机名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("服务类型")
-	private String deliveryTypeName;
+	@ExcelProperty("司机名称")
+	private String driverName;
+
+	/**
+	 * 司机名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("司机电话")
+	private String driverPhone;
+	/**
+	 * 司机名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("车牌号")
+	private String vehicleName;
+
+	/**
+	 * 司机名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送时间")
+	private String taskTime;
+
+	/**
+	 * 订单自编号;订单关联id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
 	/**
 	 * 收货人
 	 */
@@ -76,7 +107,7 @@ public class DistributionSignforExcel implements Serializable {
 	 * 收货地址
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("收货地址")
+	@ExcelProperty("客户地址")
 	private String deliveryAddress;
 	/**
 	 * 配送仓库
@@ -96,12 +127,19 @@ public class DistributionSignforExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("门店名称")
 	private String storeName;
+
 	/**
-	 * 服务类型
+	 * 预约关联Id;预约关联id
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("增值服务类型")
-	private String deliveryWayName;
+	@ExcelProperty("业务类型")
+	private String deliveryTypeName;
+//	/**
+//	 * 服务类型
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("增值服务类型")
+//	private String deliveryWayName;
 	/**
 	 * 服务类型
 	 */
@@ -114,8 +152,8 @@ public class DistributionSignforExcel implements Serializable {
 	 * 订单总数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送件数")
-	private Integer reservationNum;
+	@ExcelProperty("计划配送件数")
+	private Integer deliveryNumber;
 //	/**
 //	 * 总件数
 //	 */
@@ -126,14 +164,52 @@ public class DistributionSignforExcel implements Serializable {
 	 * 装车件数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("装车件数")
+	@ExcelProperty("计划装车件数")
 	private Integer loadedNumber;
+	/**
+	 * 装车件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("计划未装车件数")
+	private Integer unLoadedNumber;
+	/**
+	 * 装车件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常装车件数")
+	private Integer abnormalLoadedNumber;
 	/**
 	 * 签收数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("签收数")
+	@ExcelProperty("计划签收件数")
 	private Integer receivedQuantity;
+	/**
+	 * 签收数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("计划未签收件数")
+	private Integer unReceivedQuantity;
+	/**
+	 * 签收数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常签收件数")
+	private Integer abnormalReceivedQuantity;
+
+	/**
+	 * 签收数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送状态")
+	private String reservationSignStatusName;
+
+	/**
+	 * 签收数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("文员审核状态")
+	private String examineStatusName;
 //	/**
 //	 * 送货司机
 //	 */
@@ -146,30 +222,30 @@ public class DistributionSignforExcel implements Serializable {
 //	@ColumnWidth(20)
 //	@ExcelProperty("送货司机手机号")
 //	private String deliveryDriverPhone;
-	/**
-	 * 签收时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("签收时间")
-	private Date sjsigningTime;
+//	/**
+//	 * 签收时间
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("签收时间")
+//	private Date sjsigningTime;
 //	/**
 //	 * 签收人
 //	 */
 //	@ColumnWidth(20)
 //	@ExcelProperty("签收人")
 //	private String signee;
-	/**
-	 * 签收状态;1-未签收,2-司机签收,3-文员签收
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("司机签收状态")
-	private String driverSigningName;
-	/**
-	 * 签收类型;1-签收,2-代签收
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("文员审核状态")
-	private String signingStatusName;
+//	/**
+//	 * 签收状态;1-未签收,2-司机签收,3-文员签收
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机签收状态")
+//	private String driverSigningName;
+//	/**
+//	 * 签收类型;1-签收,2-代签收
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("文员审核状态")
+//	private String signingStatusName;
 //	/**
 //	 * 文员复核图片
 //	 */

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

@@ -716,7 +716,7 @@
             ldpn.delivery_quantity AS deliveryQuantity,
             ldpn.outbound_quantity AS outboundQuantity,
             ldpn.signin_quantity AS signinQuantity,
-            0 AS reservationNum,
+           (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum,
             ldpn.quantity AS `number`
         FROM
         logpm_distribution_stock_article AS ldsa

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

@@ -542,11 +542,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			throw new CustomerException(403, "仓库信息不能为空");
 		}
 
-		DistributionReservationEntity distributionReservation = distributionReservationService.getById(distrilbutionloadingscanDTO.getReservationId());
-		if (ReservationStatusConstant.yiquexiao.getValue().equals(distributionReservation.getReservationStatus())){
-			throw new CustomerException(403, "预约单已取消");
+		if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())){
+			DistributionReservationEntity distributionReservation = distributionReservationService.getById(distrilbutionloadingscanDTO.getReservationId());
+			if (ReservationStatusConstant.yiquexiao.getValue().equals(distributionReservation.getReservationStatus())){
+				throw new CustomerException(403, "预约单已取消");
+			}
 		}
 
+
 //		-----------------------------------2023-09-25  签收调整----------------------------------------------------------------
 //		首先这里需要查看该包件是否属于该配送任务
 //					属于该配送任务需要进行是否属于该客户进行判断

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

@@ -1747,11 +1747,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	public List<DistributionSignforExcel> exportDistributionSignfor(Map<String, Object> distributionSignfor) {
 
 		Object o = distributionSignfor.get("ids");
+		DistributionSignforVO distributionSignforVO = JSON.parseObject(JSON.toJSONString(distributionSignfor), DistributionSignforVO.class);
 		if (ObjectUtils.isNotNull(o)) {
 			distributionSignfor.remove("ids");
 		}
 
-		DistributionSignforVO distributionSignforVO = JSON.parseObject(JSON.toJSONString(distributionSignfor), DistributionSignforVO.class);
 
 
 //获取当前登录人仓库
@@ -1828,17 +1828,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			DistributionSignforExcel signforExcel = new DistributionSignforExcel();
 			BeanUtils.copyProperties(d, signforExcel);
 			signforExcel.setOrderCode(d.getStockArticleId());
+			signforExcel.setDeliveryNumber(d.getReservationNum());
+			signforExcel.setLoadedNumber(d.getLoadedNumber());
+			signforExcel.setUnLoadedNumber(d.getUnloadedNumber());
+			signforExcel.setReceivedQuantity(d.getReceivedQuantity());
+			signforExcel.setUnReceivedQuantity(d.getUnreceivedQuantity());
+			signforExcel.setAbnormalLoadedNumber(d.getAbnormalLoadedNumber());
+			signforExcel.setAbnormalReceivedQuantity(d.getAbnormalReceivedQuantity());
+			signforExcel.setReservationSignStatusName(d.getSijiSigningStatus());
+			signforExcel.setExamineStatusName(d.getWenyuanSigningStatus());
 			signforExcel.setDeliveryTime(d.getSignLoadingDate());
 
+
+//			signforExcel.setDeliveryTime(d.getSignLoadingDate());
+
 //			signforExcel.setConsignee();
-			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());
-			signforExcel.setDeliveryTypeName(value);
-			String value1 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getSigningStatus());
-			signforExcel.setSigningStatusName(value1);
-			String value2 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getDriverSigning());
-			signforExcel.setDriverSigningName(value2);
-			String value3 = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, d.getServeType());
-			signforExcel.setDeliveryWayName(value3);
+//			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());
+//			signforExcel.setDeliveryTypeName(value);
+//			String value1 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getSigningStatus());
+//			signforExcel.setSigningStatusName(value1);
+//			String value2 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getDriverSigning());
+//			signforExcel.setDriverSigningName(value2);
+//			String value3 = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, d.getServeType());
+//			signforExcel.setDeliveryWayName(value3);
 			list.add(signforExcel);
 		});
 		return list;

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

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

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

@@ -469,4 +469,13 @@
         and (ltcls.is_data = 0 or ltcls.loading_abnormal = 1 or ltcls.unload_abnormal = 1)
     </select>
 
+    <select id="abnormalListStartCarByLoadIdAndWarehouseId" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+        and warehouse_id = #{warehouseId}
+        and loading_abnormal = 1
+        and scan_status = '1'
+    </select>
+
 </mapper>

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

@@ -11,4 +11,10 @@ public interface ICarsLoadAsyncService {
 
 	void costShareByLoadId(Long loadId,TrunklineCarsLoadEntity carsLoadEntity);
 
+    void abnormalListStartCarByLoadIdAndWarehouseId(Long loadId, Long warehouseId,Long userId,Long deptId,String nickName,String tenantId,String warehouseName);
+
+	void abnormalListUnloadByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, Long loadScanId, String tenantId, Long userId, String nickName, Long firstLong);
+
+	void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong);
+
 }

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

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

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

@@ -6,7 +6,9 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.trunkline.entity.*;
 import com.logpm.trunkline.service.*;
+import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseAbnormalRecordClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
@@ -41,6 +43,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	private IDistributionStockArticleClient distributionStockArticleClient;
 	@Autowired
 	private IBasicdataWarehouseClient warehouseClient;
+	@Autowired
+	private IWarehouseAbnormalRecordClient abnormalRecordClient;
 
 	@Async
 	@Override
@@ -318,4 +322,86 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	}
 
+	@Async
+	@Override
+	public void abnormalListStartCarByLoadIdAndWarehouseId(Long loadId, Long warehouseId,Long userId,Long deptId,String nickName,String tenantId,String warehouseName) {
+
+		//先查询
+		List<TrunklineCarsLoadScanEntity> ls = trunklineCarsLoadScanService.abnormalListStartCarByLoadIdAndWarehouseId(loadId,warehouseId);
+		for (TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity : ls) {
+			Integer isData = trunklineCarsLoadScanEntity.getIsData();
+			if(isData == 1){
+				String loadCode = trunklineCarsLoadScanEntity.getLoadCode();
+				String waybillNo = trunklineCarsLoadScanEntity.getWaybillNo();
+				String orderCode = trunklineCarsLoadScanEntity.getOrderCode();
+				String scanCode = trunklineCarsLoadScanEntity.getScanCode();
+				Long scanId = trunklineCarsLoadScanEntity.getId();
+				//无装车计划
+				WarehouseAbnormalRecordEntity abnormalRecordEntity = new WarehouseAbnormalRecordEntity();
+				abnormalRecordEntity.setTenantId(tenantId);
+				abnormalRecordEntity.setCreateUser(userId);
+				abnormalRecordEntity.setUpdateUser(userId);
+				abnormalRecordEntity.setCreateDept(deptId);
+				abnormalRecordEntity.setType("2");
+				abnormalRecordEntity.setAbnormalType("2");
+				abnormalRecordEntity.setCarType("1");
+				abnormalRecordEntity.setUpWarehouseId(warehouseId);
+				abnormalRecordEntity.setUpWarehouseName(warehouseName);
+				abnormalRecordEntity.setCarsNo(loadCode);
+				abnormalRecordEntity.setWaybillNo(waybillNo);
+				abnormalRecordEntity.setOrderCode(orderCode);
+				abnormalRecordEntity.setOrderPackageCode(scanCode);
+				abnormalRecordEntity.setUpUserId(userId);
+				abnormalRecordEntity.setUpUserName(nickName);
+				abnormalRecordEntity.setAbnormalStatus(0);
+				abnormalRecordEntity.setUpTime(new Date());
+				abnormalRecordEntity.setAssociationId(scanId);
+				abnormalRecordEntity.setAssociationType(1);
+				abnormalRecordEntity.setRemark("无计划装车");
+				abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
+			}
+		}
+	}
+
+	@Async
+	@Override
+	public void abnormalListUnloadByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, Long loadScanId, String tenantId, Long userId, String nickName, Long deptId) {
+		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getById(loadScanId);
+		if(!Objects.isNull(carsLoadScanEntity)){
+			String loadCode = carsLoadScanEntity.getLoadCode();
+			String waybillNo = carsLoadScanEntity.getWaybillNo();
+			String orderCode = carsLoadScanEntity.getOrderCode();
+			String scanCode = carsLoadScanEntity.getScanCode();
+			//无装车记录
+			WarehouseAbnormalRecordEntity abnormalRecordEntity = new WarehouseAbnormalRecordEntity();
+			abnormalRecordEntity.setTenantId(tenantId);
+			abnormalRecordEntity.setCreateUser(userId);
+			abnormalRecordEntity.setUpdateUser(userId);
+			abnormalRecordEntity.setCreateDept(deptId);
+			abnormalRecordEntity.setType("1");
+			abnormalRecordEntity.setAbnormalType("3");
+			abnormalRecordEntity.setCarType("1");
+			abnormalRecordEntity.setUpWarehouseId(warehouseId);
+			abnormalRecordEntity.setUpWarehouseName(warehouseName);
+			abnormalRecordEntity.setCarsNo(loadCode);
+			abnormalRecordEntity.setWaybillNo(waybillNo);
+			abnormalRecordEntity.setOrderCode(orderCode);
+			abnormalRecordEntity.setOrderPackageCode(scanCode);
+			abnormalRecordEntity.setUpUserId(userId);
+			abnormalRecordEntity.setUpUserName(nickName);
+			abnormalRecordEntity.setAbnormalStatus(0);
+			abnormalRecordEntity.setUpTime(new Date());
+			abnormalRecordEntity.setAssociationId(loadScanId);
+			abnormalRecordEntity.setAssociationType(1);
+			abnormalRecordEntity.setRemark("无装车记录");
+			abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
+		}
+	}
+
+	@Async
+	@Override
+	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String nodeName, String tenantId, Long userId, String nickName, Long firstLong) {
+
+	}
+
 }

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

@@ -7,6 +7,7 @@ import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
 import com.logpm.trunkline.mapper.TrunklineCarsLoadScanMapper;
 import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
 import com.logpm.trunkline.vo.*;
+import com.logpm.warehouse.feign.IWarehouseAbnormalRecordClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -19,6 +20,9 @@ import java.util.Map;
 @Service
 @AllArgsConstructor
 public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineCarsLoadScanMapper, TrunklineCarsLoadScanEntity> implements ITrunklineCarsLoadScanService {
+
+	private final IWarehouseAbnormalRecordClient warehouseAbnormalRecordClient;
+
 	@Override
 	public Integer findNumByLoadId(Long loadId) {
 		return baseMapper.findNumByLoadId(loadId);
@@ -232,4 +236,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.abnormalList(page,loadCarsDTO);
 	}
 
+	@Override
+	public List<TrunklineCarsLoadScanEntity> abnormalListStartCarByLoadIdAndWarehouseId(Long loadId, Long warehouseId) {
+		return baseMapper.abnormalListStartCarByLoadIdAndWarehouseId(loadId,warehouseId);
+	}
+
 }

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

@@ -39,6 +39,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
@@ -84,7 +85,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	private final IDistributionParcelNumberClient distributionParcelNumberClient;
 	private final ITrunklineCostShareRecordService trunklineCostShareRecordService;
 	private final ITrunklineAdvanceService advanceService;
-	private final IWarehouseAbnormalRecordClient abnormalRecordClient;
 
 	@Override
 	public IPage<TrunklineCarsLoadVO> loadCarsPageList(LoadCarsDTO loadCarsDTO) {
@@ -286,6 +286,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId,warehouseId);
 			//生成直发商家签收单
 			createCustomerSignOrder(loadId,warehouseId);
+			//生成异常列表
+			carsLoadAsyncService.abnormalListStartCarByLoadIdAndWarehouseId(loadId,warehouseId,AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()),AuthUtil.getNickName(),AuthUtil.getTenantId(), loadCarsDTO.getWarehouseName());
 		}catch (Exception e){
 			log.error("#############startCarByLoadId: 签收单或者更新数量失败",e);
 		}
@@ -755,10 +757,6 @@ 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: 存入日志失败");
 			}
@@ -794,6 +792,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400,"未知的卸车确认类型");
 		}
 
+		//无装车记录异常日志记录
+		try{
+			carsLoadAsyncService.abnormalListUnloadCheckByLoadIdAndWarehouseId(loadId,warehouseId,currentCarsLoadLineEntity.getNodeName(),AuthUtil.getTenantId(),AuthUtil.getUserId(),AuthUtil.getNickName(),Func.firstLong(AuthUtil.getDeptId()));
+		}catch (Exception e){
+			log.warn("###############unloadPackage: 存入异常列表记录失败");
+		}
+
 
 		//MQ卸车确认推送工厂
 		JSONObject jsonObject = new JSONObject();
@@ -809,6 +814,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		rabbitTemplate.convertAndSend(RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_EXCHANGE, RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_ROUTING, map);
 
 
+
 	}
 
 	@Transactional(rollbackFor = Exception.class)
@@ -4158,6 +4164,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			//没有装车扫码记录
 			//不在计划中，则查询在哪个仓库中
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);
+			Long loadScanId = null;
 			if(Objects.isNull(parcelListEntity)){
 				//没有包件数据
 
@@ -4189,7 +4196,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 				trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 				trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
-				Long loadScanId = trunklineCarsLoadScanEntity.getId();
+				loadScanId = trunklineCarsLoadScanEntity.getId();
 
 				trunklineCarsLoadingLogService.savaLoadingLog(warehouseId,warehouseName,loadId,loadCode,null,null,null,orderPackageCode,1,
 					1,0,1,trayId,trayCode,trayName,null,loadScanId,"无数据,补装车计划,异常装车");
@@ -4240,7 +4247,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 				trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 
-				Long loadScanId = trunklineCarsLoadScanEntity.getId();
+				loadScanId = trunklineCarsLoadScanEntity.getId();
 
 				//
 				trunklineCarsLoadingLogService.savaLoadingLog(warehouseId,warehouseName,loadId,loadCode,waybillId,waybillNumber,orderCode,orderPackageCode,1,
@@ -4313,18 +4320,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						distributionStockArticleClient.addIncomingNum(currentOrderId,1);
 					}
 				}else{
-					Long packageId = distributionParcelListEntity.getId();
-					String packageStatus = "30";
+					distributionParcelListEntity.setOrderPackageStatus("20");
 					if(!Objects.isNull(warehouseWaybillEntity)){
 						Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 						if(destinationWarehouseId.equals(warehouseId)){
-							packageStatus = "20";
+							distributionParcelListEntity.setIsTransfer(0);
+						}else{
+							distributionParcelListEntity.setIsTransfer(1);
 						}
 					}
-					distributionParcelListClient.updateOrderPackageCodeById(packageId,packageStatus);
+					distributionParcelListClient.update(distributionParcelListEntity);
 				}
 				updownTypeClient.downPackageOrDelTray(orderPackageCode,wid);
 			}
+
+			//无装车记录异常日志记录
+			try{
+				carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId,warehouseId,warehouseName,loadScanId,AuthUtil.getTenantId(),AuthUtil.getUserId(),AuthUtil.getNickName(),Func.firstLong(AuthUtil.getDeptId()));
+			}catch (Exception e){
+				log.warn("###############unloadPackage: 存入异常列表记录失败");
+			}
+
 		}else{
 //			carsLoadScanEntity.getS
 

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.warehouse.dto.TrayInfoDTO;
 import com.logpm.warehouse.dto.WaybillDTO;
-import com.logpm.warehouse.entity.SyncOldTrayTypeLogEntity;
 import com.logpm.warehouse.entity.WarehouseLog;
 import com.logpm.warehouse.entity.WarehouseTrayTypeEntity;
 import com.logpm.warehouse.service.*;
@@ -179,7 +178,7 @@ public class OldSystemPushController {
 			WarehouseLog warehouseLog = new WarehouseLog();
 			warehouseLog.setArgs(JSONObject.toJSONString(trayInfoDTO));
 			warehouseLog.setStatus(0);
-			warehouseLog.setType(2);
+			warehouseLog.setType(3);
 			warehouseLogService.save(warehouseLog);
 
 			asyncDataService.sendTrayInfoByOrderPackageCode(trayInfoDTO);
@@ -188,21 +187,9 @@ public class OldSystemPushController {
 			warehouseLogService.updateById(warehouseLog);
 			return R.success("操作成功");
 		}catch (CustomerException e){
-			//存入打托信息
-			SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
-			syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
-			syncOldTrayTypeLogEntity.setSyncStatus(0);
-			syncOldTrayTypeLogEntity.setSyncNum(0);
-			syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
 		}catch (Exception e){
-			//存入打托信息
-			SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
-			syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
-			syncOldTrayTypeLogEntity.setSyncStatus(0);
-			syncOldTrayTypeLogEntity.setSyncNum(0);
-			syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 			log.error("############sendOrders: 系统异常",e);
 			return R.fail(500,"############sendOrders: 系统异常");
 		}

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

@@ -15,6 +15,7 @@ public class WarehouseAbnormalRecordClient implements IWarehouseAbnormalRecordCl
 
 	@Override
 	public void addAbnormalRecord(WarehouseAbnormalRecordEntity warehouseAbnormalRecordEntity) {
+		warehouseAbnormalRecordEntity.setAbnormalStatus(0);
 		warehouseAbnormalRecordService.save(warehouseAbnormalRecordEntity);
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.logpm.warehouse.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
@@ -17,14 +18,12 @@ import com.logpm.oldproject.feign.ITrayClient;
 import com.logpm.oldproject.feign.ITrayScanClient;
 import com.logpm.oldproject.feign.ITrayScanDesClient;
 import com.logpm.warehouse.dto.*;
-import com.logpm.warehouse.entity.TaskQuestEntity;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
-import com.logpm.warehouse.entity.WarehouseTrayTypeEntity;
-import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
+import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.service.*;
 import com.logpm.warehouse.vo.AllocationWithTrayVO;
 import com.logpm.warehouse.vo.QuestDetailVO;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
@@ -34,6 +33,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -75,6 +75,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private ITrayScanClient trayScanClient;
 	@Autowired
 	private ITrayScanDesClient trayScanDesClient;
+	@Autowired
+	private ISyncOldTrayTypeLogService syncOldTrayTypeLogService;
 
 	@Override
 	@Async
@@ -419,6 +421,18 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
+					//存入打托信息
+					SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
+					syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L);
+					syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE);
+					syncOldTrayTypeLogEntity.setCreateTime(new Date());
+					syncOldTrayTypeLogEntity.setUpdateTime(new Date());
+					syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
+					syncOldTrayTypeLogEntity.setSyncStatus(0);
+					syncOldTrayTypeLogEntity.setSyncNum(0);
+					syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
 				}else{
 					log.info("####################orderStatusHandler: 二次打托成功 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
@@ -442,6 +456,18 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
+					//存入打托信息
+					SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
+					syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L);
+					syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE);
+					syncOldTrayTypeLogEntity.setCreateTime(new Date());
+					syncOldTrayTypeLogEntity.setUpdateTime(new Date());
+					syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
+					syncOldTrayTypeLogEntity.setSyncStatus(0);
+					syncOldTrayTypeLogEntity.setSyncNum(0);
+					syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
 				}else{
 					log.info("####################orderStatusHandler: 二次打托成功 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
@@ -454,9 +480,33 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
+					//存入打托信息
+					SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
+					syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L);
+					syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L);
+					syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE);
+					syncOldTrayTypeLogEntity.setCreateTime(new Date());
+					syncOldTrayTypeLogEntity.setUpdateTime(new Date());
+					syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
+					syncOldTrayTypeLogEntity.setSyncStatus(0);
+					syncOldTrayTypeLogEntity.setSyncNum(0);
+					syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
 				}
 			}else{
+				//存入打托信息
+				SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity();
+				syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L);
+				syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L);
+				syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L);
+				syncOldTrayTypeLogEntity.setCreateTime(new Date());
+				syncOldTrayTypeLogEntity.setUpdateTime(new Date());
+				syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE);
+				syncOldTrayTypeLogEntity.setArgs(JSONObject.toJSONString(trayInfoDTO));
+				syncOldTrayTypeLogEntity.setSyncStatus(0);
+				syncOldTrayTypeLogEntity.setSyncNum(0);
+				syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity);
 				log.warn("######################orderStatusHandler: 打托失败 msg={} code={}",msg,code);
 				log.warn("######################orderStatusHandler: 打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
 			}

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

@@ -495,7 +495,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 					DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
 					parcelNumberEntity.setStockArticleId(aLong);
 					parcelNumberEntity.setParcelListId(orderPackageId);
-					parcelNumberEntity.setHandQuantity(0);
+					parcelNumberEntity.setHandQuantity(splitNum);
 					parcelNumberEntity.setQuantity(distributionParcelListEntity.getQuantity());
 					parcelNumberEntity.setDeliveryQuantity(0);
 					parcelNumberEntity.setSigninQuantity(0);