Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -111,4 +111,11 @@ public class DictBizConstant {
 	//---------------2023-11-07---------------------
 	public static final String BILLLADING_CHARGE_TYPE = "billlading_charge_type"; //提货单计费方式
 
+	//---------------2023-11-18
+    public static final String OPEN_ORDER_PAY_TYPE = "open_order_pay_type";
+	public static final String OPEN_ORDER_PAY_WAY = "open_order_pay_way";
+	public static final String OPEN_ORDER_DELIVERY_WAY = "open_order_delivery_way";
+	public static final String OPEN_ORDER_URGENCY = "open_order_urgency";
+	public static final String OPEN_ORDER_RECEIPT = "open_order_receipt";
+	public static final String OPEN_ORDER_TRANSPORT_TYPE = "open_order_transport_type";
 }

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -36,6 +36,11 @@ public interface ModuleNameConstant {
 	 */
 	String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+DEVAUTH;
 
+	/**
+	 * 售后服务名称
+	 */
+	String APPLICATION_AFTERSALES_NAME = "logpm-aftersales"+DEVAUTH;
+
 
 	/**
 	 * 仓库服务名称

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java

@@ -0,0 +1,95 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常处理包件记录 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_abnormal_package")
+@ApiModel(value = "AftersalesAbnormalPackage对象", description = "异常处理包件记录")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesAbnormalPackageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常ID
+	 */
+	@ApiModelProperty(value = "异常ID")
+	private String workOrderId;
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private String number;
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String packageCode;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+	/**
+	 * 包件图片路径
+	 */
+	@ApiModelProperty(value = "包件图片路径")
+	private String packageImage;
+	/**
+	 * 类型;窜货，少货
+	 */
+	@ApiModelProperty(value = "类型;窜货，少货")
+	private String typesOf;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesArbitrationOrderEntity.java

@@ -0,0 +1,75 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单仲裁申请单 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_arbitration_order")
+@ApiModel(value = "AftersalesArbitrationOrder对象", description = "异常工单仲裁申请单")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesArbitrationOrderEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单Id
+	 */
+	@ApiModelProperty(value = "异常工单Id")
+	private String workOrderId;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCargoRecordsEntity.java

@@ -0,0 +1,85 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 货物催 — 查记录表 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_cargo_records")
+@ApiModel(value = "AftersalesCargoRecords对象", description = "货物催 — 查记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCargoRecordsEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
+	/**
+	 * 包件号
+	 */
+	@ApiModelProperty(value = "包件号")
+	private String packageCode;
+	/**
+	 * 客户交流记录
+	 */
+	@ApiModelProperty(value = "客户交流记录")
+	private String customerCommunication;
+	/**
+	 * 咨询人员
+	 */
+	@ApiModelProperty(value = "咨询人员")
+	private String consultant;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java

@@ -0,0 +1,39 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单完结处理结果受款方 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_completion_recipient")
+@ApiModel(value = "AftersalesCompletionRecipient对象", description = "异常工单完结处理结果受款方")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecipientEntity extends TenantEntity {
+
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java

@@ -0,0 +1,96 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单完结处理结果赔款方 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_completion_record")
+@ApiModel(value = "AftersalesCompletionRecord对象", description = "异常工单完结处理结果赔款方")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecordEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 赔款方
+	 */
+	@ApiModelProperty(value = "赔款方")
+	private String indemnitor;
+	/**
+	 * 原因
+	 */
+	@ApiModelProperty(value = "原因")
+	private String reason;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	private BigDecimal money;
+	/**
+	 * 仲裁原因
+	 */
+	@ApiModelProperty(value = "仲裁原因")
+	private String reasonArbitration;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java

@@ -0,0 +1,90 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常运损图片（最少两张） 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_decrease_image")
+@ApiModel(value = "AftersalesDecreaseImage对象", description = "异常运损图片（最少两张）")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesDecreaseImageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单Id
+	 */
+	@ApiModelProperty(value = "异常工单Id")
+	private String workOrderId;
+	/**
+	 * 图片类型
+	 */
+	@ApiModelProperty(value = "图片类型")
+	private String imageType;
+	/**
+	 * 图片名称
+	 */
+	@ApiModelProperty(value = "图片名称")
+	private String imageName;
+	/**
+	 * 图片路径
+	 */
+	@ApiModelProperty(value = "图片路径")
+	private String imagePath;
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesExchangeEntity.java

@@ -0,0 +1,95 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 工单交流处理数据记录 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_exchange")
+@ApiModel(value = "AftersalesExchange对象", description = "工单交流处理数据记录")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesExchangeEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 营业部名称
+	 */
+	@ApiModelProperty(value = "营业部名称")
+	private String businessName;
+	/**
+	 * 营业部ID
+	 */
+	@ApiModelProperty(value = "营业部ID")
+	private String businessId;
+	/**
+	 * 交流内容
+	 */
+	@ApiModelProperty(value = "交流内容")
+	private String content;
+	/**
+	 * 附件内容
+	 */
+	@ApiModelProperty(value = "附件内容")
+	private String annex;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java

@@ -0,0 +1,91 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单超时记录表 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_overtime_fine")
+@ApiModel(value = "AftersalesOvertimeFine对象", description = "异常工单超时记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesOvertimeFineEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	private BigDecimal money;
+	/**
+	 * 超时时间
+	 */
+	@ApiModelProperty(value = "超时时间")
+	private Date timeout;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java

@@ -0,0 +1,106 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单处理结果 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_processing_results")
+@ApiModel(value = "AftersalesProcessingResults对象", description = "异常工单处理结果")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessingResultsEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 处理结果类型
+	 */
+	@ApiModelProperty(value = "处理结果类型")
+	private String resultType;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	private BigDecimal money;
+	/**
+	 * 赔付方式
+	 */
+	@ApiModelProperty(value = "赔付方式")
+	private String compensationMethod;
+	/**
+	 * 赔付时间
+	 */
+	@ApiModelProperty(value = "赔付时间")
+	private Date compensationTime;
+	/**
+	 * 赔付凭证
+	 */
+	@ApiModelProperty(value = "赔付凭证")
+	private String compensationVoucher;
+	/**
+	 * 处理结果说明
+	 */
+	@ApiModelProperty(value = "处理结果说明")
+	private String resultDescription;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java

@@ -0,0 +1,95 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常责任方和处理方 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_processor")
+@ApiModel(value = "AftersalesProcessor对象", description = "异常责任方和处理方")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessorEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	private String businessName;
+	/**
+	 * ID
+	 */
+	@ApiModelProperty(value = "ID")
+	private String businessId;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private String conditions;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesReturnRecordEntity.java

@@ -0,0 +1,90 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常 工单打回记录 实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_return_record")
+@ApiModel(value = "AftersalesReturnRecord对象", description = "异常 工单打回记录")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReturnRecordEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 异常工单ID
+	 */
+	@ApiModelProperty(value = "异常工单ID")
+	private String workOrderId;
+	/**
+	 * 待处理营业部ID
+	 */
+	@ApiModelProperty(value = "待处理营业部ID")
+	private String businessId;
+	/**
+	 * 待处理营业部名称
+	 */
+	@ApiModelProperty(value = "待处理营业部名称")
+	private String businessName;
+	/**
+	 * 打回原因
+	 */
+	@ApiModelProperty(value = "打回原因")
+	private String reasonReturn;
+	/**
+	 * 仓库Id
+	 */
+	@ApiModelProperty(value = "仓库Id")
+	private String warehouseId;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java

@@ -0,0 +1,215 @@
+/*
+ *      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.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 客服异常工单 实体类
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@Data
+@TableName("logpm_aftersales_work_order")
+@ApiModel(value = "AftersalesWorkOrder对象", description = "客服异常工单")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesWorkOrderEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 工单异常类型;货损，少货，窜货，加急，其他
+	 */
+	@ApiModelProperty(value = "工单异常类型;货损，少货，窜货，加急，其他")
+	private String workOrderType;
+	/**
+	 * 发起工单标识;PDA，PC
+	 */
+	@ApiModelProperty(value = "发起工单标识;PDA，PC")
+	private String initiationIdentification;
+	/**
+	 * 发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）
+	 */
+	@ApiModelProperty(value = "发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）")
+	private String discoveryNode;
+	/**
+	 * 异常工单号
+	 */
+	@ApiModelProperty(value = "异常工单号")
+	private String workOrderNumber;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
+	/**
+	 * 车次号 (干线卸车环节)
+	 */
+	@ApiModelProperty(value = "车次号 (干线卸车环节)")
+	private String trainNumber;
+	/**
+	 * 一级品类
+	 */
+	@ApiModelProperty(value = "一级品类")
+	private String first;
+	/**
+	 * 二级品类
+	 */
+	@ApiModelProperty(value = "二级品类")
+	private String secondary;
+	/**
+	 * 车辆路线;车次号、通过车次号自动带出车辆线路
+	 */
+	@ApiModelProperty(value = "车辆路线;车次号、通过车次号自动带出车辆线路")
+	private String vehicleRoute;
+	/**
+	 * 送货时间
+	 */
+	@ApiModelProperty(value = "送货时间")
+	private Date deliverGoodsTime;
+	/**
+	 * 发现时间 （库内作业环节,配送装车环节）
+	 */
+	@ApiModelProperty(value = "发现时间 （库内作业环节,配送装车环节）")
+	private Date discoveryTime;
+	/**
+	 * 入库时间（库内作业环节）
+	 */
+	@ApiModelProperty(value = "入库时间（库内作业环节）")
+	private Date warehousingTime;
+	/**
+	 * 运单商场
+	 */
+	@ApiModelProperty(value = "运单商场")
+	private String waybillMall;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 配送时间(配送装车环节)
+	 */
+	@ApiModelProperty(value = "配送时间(配送装车环节)")
+	private Date deliveryTime;
+	/**
+	 * 配送司机(配送装车环节)
+	 */
+	@ApiModelProperty(value = "配送司机(配送装车环节)")
+	private String deliveryDriver;
+	/**
+	 * 工单状态
+	 */
+	@ApiModelProperty(value = "工单状态")
+	private String workOrderStatus;
+	/**
+	 * 归属客服ID
+	 */
+	@ApiModelProperty(value = "归属客服ID")
+	private String customerServiceId;
+	/**
+	 * 归属客服名称
+	 */
+	@ApiModelProperty(value = "归属客服名称")
+	private String customerServiceName;
+	/**
+	 * 商场ID
+	 */
+	@ApiModelProperty(value = "商场ID")
+	private String waybillMallId;
+	/**
+	 * 完结时间
+	 */
+	@ApiModelProperty(value = "完结时间")
+	private Date overTime;
+	/**
+	 * 异常问题描述
+	 */
+	@ApiModelProperty(value = "异常问题描述")
+	private String problemDescription;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private String warehouseId;
+	/**
+	 * 责任人 （库内作业环节）
+	 */
+	@ApiModelProperty(value = "责任人 （库内作业环节）")
+	private String personResponsible;
+	/**
+	 * 钉钉流程号
+	 */
+	@ApiModelProperty(value = "钉钉流程号")
+	private String processNumber;
+	/**
+	 * 审核人
+	 */
+	@ApiModelProperty(value = "审核人")
+	private String reviewedBy;
+	/**
+	 * 审核时间
+	 */
+	@ApiModelProperty(value = "审核时间")
+	private Date auditTime;
+	/**
+	 * 财务入账时间
+	 */
+	@ApiModelProperty(value = "财务入账时间")
+	private Date entryTime;
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	private String operator;
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常处理包件记录 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+    value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesAbnormalPackageClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/topPackage";
+
+    /**
+     * 获取异常处理包件记录列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesAbnormalPackageEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单仲裁申请单 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesArbitrationOrderClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/topOrder";
+
+    /**
+     * 获取异常工单仲裁申请单列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesArbitrationOrderEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 货物催 — 查记录表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesCargoRecordsClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/topRecords";
+
+    /**
+     * 获取货物催 — 查记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesCargoRecordsEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单完结处理结果受款方 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesCompletionRecipientClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/topRecipient";
+
+    /**
+     * 获取异常工单完结处理结果受款方列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesCompletionRecipientEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单完结处理结果赔款方 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesCompletionRecordClient {
+
+    String API_PREFIX = "/completionRecord/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单完结处理结果赔款方列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesCompletionRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常运损图片（最少两张） Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesDecreaseImageClient {
+
+    String API_PREFIX = "/image/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常运损图片（最少两张）列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesDecreaseImageEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 工单交流处理数据记录 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesExchangeClient {
+
+    String API_PREFIX = "/exchange/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取工单交流处理数据记录列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesExchangeEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单超时记录表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesOvertimeFineClient {
+
+    String API_PREFIX = "/overtime/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单超时记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesOvertimeFineEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单处理结果 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesProcessingResultsClient {
+
+    String API_PREFIX = "/processing/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单处理结果列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesProcessingResultsEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常责任方和处理方 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesProcessorClient {
+
+    String API_PREFIX = "/processor/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常责任方和处理方列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesProcessorEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常 工单打回记录 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesReturnRecordClient {
+
+    String API_PREFIX = "/return/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常 工单打回记录列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesReturnRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ *      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.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 客服异常工单 Feign接口类
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesWorkOrderClient {
+
+    String API_PREFIX = "/work/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取客服异常工单列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesWorkOrderEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常处理包件记录 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesArbitrationOrderVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单仲裁申请单 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesArbitrationOrderVO extends AftersalesArbitrationOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCargoRecordsVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 货物催 — 查记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCargoRecordsVO extends AftersalesCargoRecordsEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecipientVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单完结处理结果受款方 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecipientVO extends AftersalesCompletionRecipientEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecordVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单完结处理结果赔款方 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecordVO extends AftersalesCompletionRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDecreaseImageVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常运损图片（最少两张） 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesDecreaseImageVO extends AftersalesDecreaseImageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesExchangeVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单交流处理数据记录 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesExchangeVO extends AftersalesExchangeEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesOvertimeFineVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单超时记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesOvertimeFineVO extends AftersalesOvertimeFineEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessingResultsVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单处理结果 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessingResultsVO extends AftersalesProcessingResultsEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常责任方和处理方 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessorVO extends AftersalesProcessorEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesReturnRecordVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常 工单打回记录 视图实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReturnRecordVO extends AftersalesReturnRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客服异常工单 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -21,6 +21,8 @@ import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -47,4 +49,9 @@ public interface IBasicdataCategoryClient {
     @GetMapping(TOP)
     BladePage<BasicdataCategoryEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	@GetMapping(API_PREFIX+"/findByName")
+    BasicdataCategoryEntity findByName(@RequestParam String goodsName);
+
+	@PostMapping(API_PREFIX+"/addReturnId")
+	Long addReturnId(@RequestBody BasicdataCategoryEntity basicdataCategoryEntity);
 }

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

@@ -22,6 +22,8 @@ import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -37,7 +39,7 @@ import java.util.List;
 )
 public interface IBasicdataClientClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "/client12122";
     String TOP = API_PREFIX + "/top2";
     String GETCUSTOMER = API_PREFIX + "/customer";
     String BASICDATACLIENTUSERENTITYLISTBYUSERID = API_PREFIX + "/BasicdataClientUserEntityListByUserId";
@@ -70,4 +72,7 @@ public interface IBasicdataClientClient {
 
 	@GetMapping(API_PREFIX+"/findEntityById")
     BasicdataClientEntity findEntityById(@RequestParam Long id);
+
+	@PostMapping(API_PREFIX+"/addReturnId")
+    Long addReturnId(@RequestBody BasicdataClientEntity basicdataClientEntity);
 }

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

@@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 门店服务仓库表 Feign接口类
  *
@@ -47,4 +49,6 @@ public interface IBasicdataStorageServicesClient {
     @GetMapping(TOP)
     BladePage<BasicdataStorageServicesEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+    @GetMapping(API_PREFIX+"/findBySendWarehouseIdAndClientId")
+	List<BasicdataStorageServicesEntity> findBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId);
 }

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

@@ -34,8 +34,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface IBasicdataTripartiteMallClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "/tripartite/client";
     String TOP = API_PREFIX + "/1top";
+    String GETNAMEBRAND = API_PREFIX + "/getNameBrand";
 
     /**
      * 获取客户三方商城列表
@@ -47,4 +48,8 @@ public interface IBasicdataTripartiteMallClient {
     @GetMapping(TOP)
     BladePage<BasicdataTripartiteMallEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	@GetMapping(GETNAMEBRAND)
+	Long getClientIdByNameAndBrand(@RequestParam String name, @RequestParam String brand);
+
+
 }

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

@@ -112,4 +112,11 @@ public interface IDistributionStockArticleClient {
 	 */
 	@PostMapping(GETSTOCKARTICLEINFO)
     List<DistributionStockArticleEntity> getStockArticleInfo(@RequestBody DistributionStockArticleEntity distributionStockArticleEntity);
+
+	@GetMapping(API_PREFIX + "/updateCustomerInfoByOrderCode")
+    void updateCustomerInfoByOrderCode(@RequestParam String customerName, @RequestParam String customerPhone, @RequestParam String customerRoad, @RequestParam String orderCode);
+
+	@GetMapping(API_PREFIX + "/freezeByOrderCode")
+	void freezeByOrderCode(@RequestParam String orderCode,@RequestParam String freezeStatus);
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java

@@ -11,6 +11,7 @@ import lombok.Data;
 @Data
 public class DistributionBillOrderPackVO {
 	private String orderPackageCode;
+	private String orderPackageStatus;
 	private String warehouse;
 	private String firsts;
 	private String second;

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java

@@ -38,12 +38,13 @@ public class SignPushDataDTO {
 	/**
 	 * 出库人ID
 	 */
-	private int out_to_id;
+	private Long out_to_id;
 
 	/**
 	 * 出库人
 	 */
 	private String out_to_name;
+
 	/**
 	 * 出库时间
 	 */
@@ -114,6 +115,11 @@ public class SignPushDataDTO {
 	 */
 	private String administrators_name;
 
+	/**
+	 * 操作人
+	 */
+	private String kind;
+
 	/**
 	 * 签收客户集合
 	 */

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java

@@ -104,7 +104,7 @@ public class SignPushDataUnitDTO {
 	private long administrators_id;
 
 	/**
-	 * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收,5=pc签收
+	 * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收, 5=pc签收
 	 */
 	private int broke_state;
 

blade-service-api/logpm-trunkline-api/pom.xml

@@ -3,6 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-dict-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
     <parent>
         <groupId>org.springblade</groupId>

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

@@ -0,0 +1,27 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AdvanceDTO implements Serializable {
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+	private Long warehouseId;
+
+	private Long advanceId;
+
+	private List<Long> advanceIds = new ArrayList<>();
+
+	private String customerName;
+	private String customerPhone;
+	private String customerRoad;
+
+	private String freezeStatus;
+
+}

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

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.dto;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import lombok.Data;
+
+@Data
+public class AdvanceDetailDTO extends TrunklineAdvanceDetailEntity {
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+}

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

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DetailProductDTO implements Serializable {
+
+	private String orderPackageCode;
+
+}

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

@@ -15,4 +15,8 @@ public class InComingDTO implements Serializable {
 
 	private Integer incomingType;//入库类型
 
+	private String trayCode;//托盘码
+
+	private String trayType;//打托方式
+
 }

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

@@ -0,0 +1,73 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class OpenOrderDTO implements Serializable {
+
+	private String brand;//品牌
+	private String customerTrain;//客户车次号
+	private String waybillNo;//运单号
+	private Long departureWarehouseId;//发站仓id
+	private String departureWarehouseName;//发站仓名称
+	private String destination;//到站
+	private String destinationWarehouseName;//目的仓名称
+	private Long destinationWarehouseId;//目的仓Id
+	private String goodsCode;//货号
+	private List<Long> advanceIds;//暂存单ids
+	private String orderNo;//订单号
+
+	private Long shipperId;//发货单位id
+	private String shipper;//发货单位
+	private String shipperName;//发货人
+	private String shipperMobile;//发货人电话
+	private String shipperAddress;//发货地址
+
+	private Long consigneeId;//收货单位id
+	private String consignee;//收货单位
+	private String consigneeName;//收货人
+	private String consigneeMobile;//收货人电话
+	private String consigneeAddress;//收货地址
+	private String goodsName;//货物名称
+
+	private List<WaybillDetailDTO> waybillDetailList = new ArrayList<>();
+
+	private Integer totalCount;
+	private BigDecimal totalWeghit;
+	private BigDecimal totalVolume;
+	private BigDecimal totalFreight = BigDecimal.ZERO;//运费
+	private BigDecimal deliveryFee = BigDecimal.ZERO;//送货费
+	private BigDecimal pickupFee = BigDecimal.ZERO;//提货费
+	private BigDecimal warehouseManagementFee = BigDecimal.ZERO;//仓库管理费
+	private BigDecimal storageFee = BigDecimal.ZERO;//仓储费
+	private BigDecimal handlingFee = BigDecimal.ZERO;//装卸费
+	private BigDecimal otherFee = BigDecimal.ZERO;//其他费
+	private BigDecimal insuranceFee = BigDecimal.ZERO;//保价费
+	private BigDecimal claimingValue;//申明价值
+
+	private String payType;//支付方式
+	private String payWay;//付款方式
+	private BigDecimal xPay = BigDecimal.ZERO;//现付
+	private BigDecimal dPay = BigDecimal.ZERO;//到付
+	private BigDecimal yPay = BigDecimal.ZERO;//月结
+	private BigDecimal hPay = BigDecimal.ZERO;//回付
+
+	private BigDecimal thirdOperationFee = BigDecimal.ZERO;//三方操作费
+
+	private String deliveryWay;//送货方式
+	private String urgency;//紧急度
+	private String receipt;//回单方式（多选）
+	private String transportType;//运输方式
+
+	private String remark;//备注
+
+	private Integer waybillType;
+
+	private Long warehouseId;//仓库id
+
+}

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

@@ -0,0 +1,21 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class WaybillDetailDTO implements Serializable {
+
+	private Integer chargeType;//计价方式 1件 2方 3公斤
+
+	private Long goodsId;//品类id
+	private String goodsName;//货物名称
+	private Integer num;//件数
+	private BigDecimal weight;//重量
+	private BigDecimal volume;//体积
+	private BigDecimal price ;//单价
+	private BigDecimal subtotalFreight;//小计运费
+
+}

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

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WaybillOrderDTO implements Serializable {
+
+	private Long waybillId;
+
+}

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

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigDecimal;
+
 @Data
 @TableName("logpm_trunkline_advance_detail")
 @ApiModel(value = "TrunklineAdvanceDetail对象", description = "暂存单包件数据表")
@@ -98,6 +100,15 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity {
 	/** 物料名称 */
 	@ApiModelProperty(name = "物料名称",notes = "")
 	private String materialName ;
+	/** 重量 */
+	@ApiModelProperty(name = "重量",notes = "")
+	private BigDecimal weight ;
+	/** 体积 */
+	@ApiModelProperty(name = "体积",notes = "")
+	private BigDecimal volume ;
+	/** 计价方式 1件 2方 3公斤 */
+	@ApiModelProperty(name = "计价方式 1件 2方 3公斤",notes = "")
+	private Integer chargeType ;
 
 
 }

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

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 @Data
 @TableName("logpm_trunkline_advance")
 @ApiModel(value = "TrunklineAdvance对象", description = "暂存单数据表")
@@ -112,5 +114,11 @@ public class TrunklineAdvanceEntity extends TenantEntity {
 	/** 冻结状态 0未冻结 1已冻结 */
 	@ApiModelProperty(name = "冻结状态 0未冻结 1已冻结",notes = "")
 	private String freezeStatus ;
+	/** 遗留状态 0否 1是 */
+	@ApiModelProperty(name = "遗留状态 0否 1是",notes = "")
+	private String legacyStatus ;
+	/** 交期 */
+	@ApiModelProperty(name = "交期",notes = "")
+	private Date deliveryDate ;
 
 }

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

@@ -11,7 +11,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("logpm_trunkline_waybill_order")
 @ApiModel(value = "TrunklineWaybillOrder对象", description = "运单订单关联表")
 @EqualsAndHashCode(callSuper = true)
-	public class TrunklineWaybillOrderEntity extends TenantEntity {
+public class TrunklineWaybillOrderEntity extends TenantEntity {
 
 	/** 预留1 */
 	@ApiModelProperty(name = "预留1",notes = "")

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

@@ -0,0 +1,57 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_waybill_track")
+@ApiModel(value = "TrunklineWaybillTrack对象", description = "运单跟踪记录表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineWaybillTrackEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 运单id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 跟踪类型 10创建运单 */
+	@ApiModelProperty(name = "跟踪类型 10创建运单",notes = "")
+	private String trackType ;
+	/** 描述 */
+	@ApiModelProperty(name = "描述",notes = "")
+	private String describe ;
+	/** 操作备注 */
+	@ApiModelProperty(name = "操作备注",notes = "")
+	private String operationRemark ;
+	/** 操作人名称 */
+	@ApiModelProperty(name = "操作人名称",notes = "")
+	private String createUserName ;
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class AdvanceDetailGoodsVO implements Serializable {
+
+	private Integer chargeType;//计价方式 1件 2方 3公斤
+
+	private Long goodsId;//品类id
+	private String goodsName;//货物名称
+	private Integer num;//件数
+	private BigDecimal weight;//重量
+	private BigDecimal volume;//体积
+	private BigDecimal price = BigDecimal.ZERO;//单价
+
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class AdvanceDetailStockNumVO implements Serializable {
+
+	private Integer stockNum = 0;
+	private BigDecimal stockVolume = BigDecimal.ZERO;
+	private BigDecimal stockWeight = BigDecimal.ZERO;
+
+}

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

@@ -0,0 +1,14 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BillladingPackageVO implements Serializable {
+
+	private Long billladingId;
+	private Integer num;
+
+
+}

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

@@ -0,0 +1,42 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+import org.springblade.system.entity.DictBiz;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class OpenOrderVO implements Serializable {
+
+	private String brand;
+	private String trainNumber;
+	private String orderCode;
+
+	private List<Long> advanceIds = new ArrayList<>();
+
+	private String departureWarehouseName;//发展仓名称
+	private Long departureWarehouseId;//发展仓Id
+
+	private String destinationWarehouseName;//目的仓名称
+	private Long destinationWarehouseId;//目的仓Id
+
+	private Long consigneeClientId;//收货单位clientId
+	private String consignee;//收货单位
+	private String consigneeName;//收货人
+	private String consigneeMobile;//收货人电话
+	private String consigneeAddress;//收货单位地址
+
+	private List<AdvanceDetailGoodsVO> goodsList = new ArrayList<>();
+
+	private List<DictBiz> payTypeList;//支付方式
+	private List<DictBiz> payWayList;//付款方式
+	private List<DictBiz> deliveryWayList;//送货方式
+	private List<DictBiz> urgencyList;//紧急度
+	private List<DictBiz> receiptList;//回单方式
+	private List<DictBiz> transportTypeList;//运输方式
+
+	private String openOrderUserName;//开单人
+
+}

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

@@ -5,4 +5,10 @@ import lombok.Data;
 
 @Data
 public class TrunklineAdvanceDetailVO extends TrunklineAdvanceDetailEntity {
+
+	private String trainNumber;
+
+	private String trayCode;
+	private String trayName;
+
 }

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

@@ -5,4 +5,7 @@ import lombok.Data;
 
 @Data
 public class TrunklineAdvanceVO extends TrunklineAdvanceEntity {
+
+	private String htMallName;
+
 }

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

@@ -0,0 +1,9 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineWaybillTrackVO extends TrunklineWaybillTrackEntity {
+
+}

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

@@ -92,7 +92,7 @@ public class QuestDetailEntity extends TenantEntity {
 	 * 包条码;对应定制品
 	 */
 	@ApiModelProperty(value = "包条码;对应定制品")
-	private String ordePackageCode;
+	private String orderPackageCode;
 	/**
 	 * 零担   运单号
 	 */
@@ -164,7 +164,7 @@ public class QuestDetailEntity extends TenantEntity {
 	private String allocationId;
 
 	/**
-	 * 是否是新增数据
+	 * 是否是新增数据 0 正常 1 新增
 	 */
 	@ApiModelProperty(value = "是否是新增数据")
 	private Integer isNew;

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
+import java.math.BigDecimal;
+
 @Data
 @ApiModel(value = "运单明细",description = "")
 @TableName("logpm_warehouse_waybill_detail")
@@ -23,8 +25,32 @@ public class WarehouseWayBillDetail extends BaseEntity {
 	@ApiModelProperty(name = "品名",notes = "")
 	private String productName;
 
+	/** 品名id */
+	@ApiModelProperty(name = "品名id",notes = "")
+	private Long productId;
+
 	/** 数量 */
 	@ApiModelProperty(name = "数量",notes = "")
 	private Integer num;
 
+	/** 体积 */
+	@ApiModelProperty(name = "体积",notes = "")
+	private BigDecimal volume;
+
+	/** 重量 */
+	@ApiModelProperty(name = "重量",notes = "")
+	private BigDecimal weight;
+
+	/** 单价 */
+	@ApiModelProperty(name = "单价",notes = "")
+	private BigDecimal price;
+
+	/** 小计运费 */
+	@ApiModelProperty(name = "小计运费",notes = "")
+	private BigDecimal subtotalFreight;
+
+	/** 计价方式 1件 2方 3公斤 */
+	@ApiModelProperty(name = "计价方式 1件 2方 3公斤",notes = "")
+	private Integer chargeType;
+
 }

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

@@ -158,12 +158,6 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@TableField(exist = false)
 	private String deliveryMethodStr;
 
-	/**
-	 * 紧急度
-	 */
-	@ApiModelProperty(value = "紧急度")
-	private Integer urgency;
-
 	@TableField(exist = false)
 	private String urgencyStr;
 
@@ -300,4 +294,114 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "金额是否收齐")
 	private Integer receivedStatus;//收款状态 0未签收 1已签收
 
+	//--------------2023-11-18 干线新增字段
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal totalFreight;//运费
+	/**
+	 * 送货费
+	 */
+	@ApiModelProperty(value = "送货费")
+	private BigDecimal deliveryFee;//送货费
+	/**
+	 * 提货费
+	 */
+	@ApiModelProperty(value = "提货费")
+	private BigDecimal pickupFee;//提货费
+	/**
+	 * 仓库管理费
+	 */
+	@ApiModelProperty(value = "仓库管理费")
+	private BigDecimal warehouseManagementFee;//仓库管理费
+	/**
+	 * 仓储费
+	 */
+	@ApiModelProperty(value = "仓储费")
+	private BigDecimal storageFee;//仓储费
+	/**
+	 * 装卸费
+	 */
+	@ApiModelProperty(value = "装卸费")
+	private BigDecimal handlingFee;//装卸费
+	/**
+	 * 其他费
+	 */
+	@ApiModelProperty(value = "其他费")
+	private BigDecimal otherFee;//其他费
+	/**
+	 * 保价费
+	 */
+	@ApiModelProperty(value = "保价费")
+	private BigDecimal insuranceFee;//保价费
+	/**
+	 * 申明价值
+	 */
+	@ApiModelProperty(value = "申明价值")
+	private BigDecimal claimingValue;//申明价值
+
+	/**
+	 * 支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本
+	 */
+	@ApiModelProperty(value = "支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本")
+	private String payType;//支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本
+	/**
+	 * 付款方式  1现付 2到付 3月结 4回付 5内部结算 6多笔付
+	 */
+	@ApiModelProperty(value = "付款方式  1现付 2到付 3月结 4回付 5内部结算 6多笔付")
+	private String payWay;//付款方式
+	/**
+	 * 现付金额
+	 */
+	@ApiModelProperty(value = "现付金额")
+	private BigDecimal xPay;//现付金额
+	/**
+	 * 到付
+	 */
+	@ApiModelProperty(value = "到付")
+	private BigDecimal dPay;//到付
+	/**
+	 * 月结
+	 */
+	@ApiModelProperty(value = "月结")
+	private BigDecimal yPay;//月结
+	/**
+	 * 回付
+	 */
+	@ApiModelProperty(value = "回付")
+	private BigDecimal hPay;//回付
+	/**
+	 * 三方操作费
+	 */
+	@ApiModelProperty(value = "三方操作费")
+	private BigDecimal thirdOperationFee;//三方操作费
+
+	/**
+	 * 送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装
+	 */
+	@ApiModelProperty(value = "送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装")
+	private String deliveryWay;//送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装
+	/**
+	 * 紧急度  1正常 2急 3加急 4特急
+	 */
+	@ApiModelProperty(value = "紧急度  1正常 2急 3加急 4特急")
+	private String urgency;//紧急度  1正常 2急 3加急 4特急
+	/**
+	 * 回单方式  1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单
+	 */
+	@ApiModelProperty(value = "回单方式  1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单")
+	private String receipt;//回单方式（多选）
+	/**
+	 * 运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递
+	 */
+	@ApiModelProperty(value = "运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递")
+	private String transportType;//运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递
+
+	/**
+	 * 运单状态 0未入库 10部分入库 20已入库
+	 */
+	@ApiModelProperty(value = "运单状态")
+	private String waybillStatus;//运单状态 0未入库 10部分入库 20已入库
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskDataVO.java

@@ -47,4 +47,6 @@ public class TaskDataVO {
 
 
 
+
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java

@@ -1,8 +1,12 @@
 package com.logpm.warehouse.vo;
 
+import com.logpm.warehouse.entity.QuestDetailChildEntity;
+import com.logpm.warehouse.entity.QuestDetailEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TaskPackagelistVO {
 
@@ -84,4 +88,10 @@ public class TaskPackagelistVO {
 	@ApiModelProperty(value = "是否新增")
 	private String isNew;
 
+	/**
+	 * 盘点明细数据
+	 */
+	private List<QuestDetailChildEntity>  questChildVOList;
+
+
 }

blade-service/logpm-aftersales/pom.xml

@@ -29,6 +29,39 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-aftersales-api</artifactId>
+            <version>${bladex.project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <username>${docker.username}</username>
+                    <password>${docker.password}</password>
+                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

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

@@ -29,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
 public class AftersalesApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, AftersalesApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_AFTERSALES_NAME, AftersalesApplication.class, args);
 	}
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/AftersalesProperties.java

@@ -0,0 +1,38 @@
+/*
+ *      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.aftersales.config;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 配置feign、mybatis包名、properties
+ *
+ * @author chaos
+ */
+@Configuration(proxyBeanMethods = false)
+@ComponentScan({"org.springblade", "com.logpm"})
+@EnableFeignClients({"org.springblade", "com.logpm"})
+@MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"})
+@EnableConfigurationProperties(AftersalesProperties.class)
+public class AftersalesProperties {
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
+import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
+import com.logpm.aftersales.wrapper.AftersalesAbnormalPackageWrapper;
+import com.logpm.aftersales.service.IAftersalesAbnormalPackageService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常处理包件记录 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesAbnormalPackage")
+@Api(value = "异常处理包件记录", tags = "异常处理包件记录接口")
+public class AftersalesAbnormalPackageController extends BladeController {
+
+	private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService;
+
+	/**
+	 * 异常处理包件记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesAbnormalPackage")
+	public R<AftersalesAbnormalPackageVO> detail(AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) {
+		AftersalesAbnormalPackageEntity detail = aftersalesAbnormalPackageService.getOne(Condition.getQueryWrapper(aftersalesAbnormalPackage));
+		return R.data(AftersalesAbnormalPackageWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常处理包件记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesAbnormalPackage")
+	public R<IPage<AftersalesAbnormalPackageVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+		IPage<AftersalesAbnormalPackageEntity> pages = aftersalesAbnormalPackageService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesAbnormalPackage, AftersalesAbnormalPackageEntity.class));
+		return R.data(AftersalesAbnormalPackageWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常处理包件记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesAbnormalPackage")
+	public R<IPage<AftersalesAbnormalPackageVO>> page(AftersalesAbnormalPackageVO aftersalesAbnormalPackage, Query query) {
+		IPage<AftersalesAbnormalPackageVO> pages = aftersalesAbnormalPackageService.selectAftersalesAbnormalPackagePage(Condition.getPage(query), aftersalesAbnormalPackage);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常处理包件记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesAbnormalPackage")
+	public R save(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) {
+		return R.status(aftersalesAbnormalPackageService.save(aftersalesAbnormalPackage));
+	}
+
+	/**
+	 * 异常处理包件记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesAbnormalPackage")
+	public R update(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) {
+		return R.status(aftersalesAbnormalPackageService.updateById(aftersalesAbnormalPackage));
+	}
+
+	/**
+	 * 异常处理包件记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesAbnormalPackage")
+	public R submit(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) {
+		return R.status(aftersalesAbnormalPackageService.saveOrUpdate(aftersalesAbnormalPackage));
+	}
+
+	/**
+	 * 异常处理包件记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesAbnormalPackageService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesAbnormalPackage")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesAbnormalPackage")
+	public void exportAftersalesAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesAbnormalPackageEntity> queryWrapper = Condition.getQueryWrapper(aftersalesAbnormalPackage, AftersalesAbnormalPackageEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesAbnormalPackage::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesAbnormalPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesAbnormalPackageExcel> list = aftersalesAbnormalPackageService.exportAftersalesAbnormalPackage(queryWrapper);
+		ExcelUtil.export(response, "异常处理包件记录数据" + DateUtil.time(), "异常处理包件记录数据表", list, AftersalesAbnormalPackageExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesArbitrationOrderController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity;
+import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO;
+import com.logpm.aftersales.excel.AftersalesArbitrationOrderExcel;
+import com.logpm.aftersales.wrapper.AftersalesArbitrationOrderWrapper;
+import com.logpm.aftersales.service.IAftersalesArbitrationOrderService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单仲裁申请单 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesArbitrationOrder")
+@Api(value = "异常工单仲裁申请单", tags = "异常工单仲裁申请单接口")
+public class AftersalesArbitrationOrderController extends BladeController {
+
+	private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService;
+
+	/**
+	 * 异常工单仲裁申请单 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesArbitrationOrder")
+	public R<AftersalesArbitrationOrderVO> detail(AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) {
+		AftersalesArbitrationOrderEntity detail = aftersalesArbitrationOrderService.getOne(Condition.getQueryWrapper(aftersalesArbitrationOrder));
+		return R.data(AftersalesArbitrationOrderWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单仲裁申请单 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesArbitrationOrder")
+	public R<IPage<AftersalesArbitrationOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesArbitrationOrder, Query query) {
+		IPage<AftersalesArbitrationOrderEntity> pages = aftersalesArbitrationOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesArbitrationOrder, AftersalesArbitrationOrderEntity.class));
+		return R.data(AftersalesArbitrationOrderWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单仲裁申请单 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesArbitrationOrder")
+	public R<IPage<AftersalesArbitrationOrderVO>> page(AftersalesArbitrationOrderVO aftersalesArbitrationOrder, Query query) {
+		IPage<AftersalesArbitrationOrderVO> pages = aftersalesArbitrationOrderService.selectAftersalesArbitrationOrderPage(Condition.getPage(query), aftersalesArbitrationOrder);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单仲裁申请单 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesArbitrationOrder")
+	public R save(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) {
+		return R.status(aftersalesArbitrationOrderService.save(aftersalesArbitrationOrder));
+	}
+
+	/**
+	 * 异常工单仲裁申请单 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesArbitrationOrder")
+	public R update(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) {
+		return R.status(aftersalesArbitrationOrderService.updateById(aftersalesArbitrationOrder));
+	}
+
+	/**
+	 * 异常工单仲裁申请单 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesArbitrationOrder")
+	public R submit(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) {
+		return R.status(aftersalesArbitrationOrderService.saveOrUpdate(aftersalesArbitrationOrder));
+	}
+
+	/**
+	 * 异常工单仲裁申请单 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesArbitrationOrderService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesArbitrationOrder")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesArbitrationOrder")
+	public void exportAftersalesArbitrationOrder(@ApiIgnore @RequestParam Map<String, Object> aftersalesArbitrationOrder, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesArbitrationOrderEntity> queryWrapper = Condition.getQueryWrapper(aftersalesArbitrationOrder, AftersalesArbitrationOrderEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesArbitrationOrder::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesArbitrationOrderEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesArbitrationOrderExcel> list = aftersalesArbitrationOrderService.exportAftersalesArbitrationOrder(queryWrapper);
+		ExcelUtil.export(response, "异常工单仲裁申请单数据" + DateUtil.time(), "异常工单仲裁申请单数据表", list, AftersalesArbitrationOrderExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCargoRecordsController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity;
+import com.logpm.aftersales.vo.AftersalesCargoRecordsVO;
+import com.logpm.aftersales.excel.AftersalesCargoRecordsExcel;
+import com.logpm.aftersales.wrapper.AftersalesCargoRecordsWrapper;
+import com.logpm.aftersales.service.IAftersalesCargoRecordsService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 货物催 — 查记录表 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesCargoRecords")
+@Api(value = "货物催 — 查记录表", tags = "货物催 — 查记录表接口")
+public class AftersalesCargoRecordsController extends BladeController {
+
+	private final IAftersalesCargoRecordsService aftersalesCargoRecordsService;
+
+	/**
+	 * 货物催 — 查记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesCargoRecords")
+	public R<AftersalesCargoRecordsVO> detail(AftersalesCargoRecordsEntity aftersalesCargoRecords) {
+		AftersalesCargoRecordsEntity detail = aftersalesCargoRecordsService.getOne(Condition.getQueryWrapper(aftersalesCargoRecords));
+		return R.data(AftersalesCargoRecordsWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 货物催 — 查记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCargoRecords")
+	public R<IPage<AftersalesCargoRecordsVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesCargoRecords, Query query) {
+		IPage<AftersalesCargoRecordsEntity> pages = aftersalesCargoRecordsService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCargoRecords, AftersalesCargoRecordsEntity.class));
+		return R.data(AftersalesCargoRecordsWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 货物催 — 查记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCargoRecords")
+	public R<IPage<AftersalesCargoRecordsVO>> page(AftersalesCargoRecordsVO aftersalesCargoRecords, Query query) {
+		IPage<AftersalesCargoRecordsVO> pages = aftersalesCargoRecordsService.selectAftersalesCargoRecordsPage(Condition.getPage(query), aftersalesCargoRecords);
+		return R.data(pages);
+	}
+
+	/**
+	 * 货物催 — 查记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesCargoRecords")
+	public R save(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) {
+		return R.status(aftersalesCargoRecordsService.save(aftersalesCargoRecords));
+	}
+
+	/**
+	 * 货物催 — 查记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesCargoRecords")
+	public R update(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) {
+		return R.status(aftersalesCargoRecordsService.updateById(aftersalesCargoRecords));
+	}
+
+	/**
+	 * 货物催 — 查记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesCargoRecords")
+	public R submit(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) {
+		return R.status(aftersalesCargoRecordsService.saveOrUpdate(aftersalesCargoRecords));
+	}
+
+	/**
+	 * 货物催 — 查记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesCargoRecordsService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesCargoRecords")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesCargoRecords")
+	public void exportAftersalesCargoRecords(@ApiIgnore @RequestParam Map<String, Object> aftersalesCargoRecords, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesCargoRecordsEntity> queryWrapper = Condition.getQueryWrapper(aftersalesCargoRecords, AftersalesCargoRecordsEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesCargoRecords::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesCargoRecordsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesCargoRecordsExcel> list = aftersalesCargoRecordsService.exportAftersalesCargoRecords(queryWrapper);
+		ExcelUtil.export(response, "货物催 — 查记录表数据" + DateUtil.time(), "货物催 — 查记录表数据表", list, AftersalesCargoRecordsExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecipientController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity;
+import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO;
+import com.logpm.aftersales.excel.AftersalesCompletionRecipientExcel;
+import com.logpm.aftersales.wrapper.AftersalesCompletionRecipientWrapper;
+import com.logpm.aftersales.service.IAftersalesCompletionRecipientService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单完结处理结果受款方 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesCompletionRecipient")
+@Api(value = "异常工单完结处理结果受款方", tags = "异常工单完结处理结果受款方接口")
+public class AftersalesCompletionRecipientController extends BladeController {
+
+	private final IAftersalesCompletionRecipientService aftersalesCompletionRecipientService;
+
+	/**
+	 * 异常工单完结处理结果受款方 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesCompletionRecipient")
+	public R<AftersalesCompletionRecipientVO> detail(AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) {
+		AftersalesCompletionRecipientEntity detail = aftersalesCompletionRecipientService.getOne(Condition.getQueryWrapper(aftersalesCompletionRecipient));
+		return R.data(AftersalesCompletionRecipientWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单完结处理结果受款方 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecipient")
+	public R<IPage<AftersalesCompletionRecipientVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesCompletionRecipient, Query query) {
+		IPage<AftersalesCompletionRecipientEntity> pages = aftersalesCompletionRecipientService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCompletionRecipient, AftersalesCompletionRecipientEntity.class));
+		return R.data(AftersalesCompletionRecipientWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单完结处理结果受款方 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecipient")
+	public R<IPage<AftersalesCompletionRecipientVO>> page(AftersalesCompletionRecipientVO aftersalesCompletionRecipient, Query query) {
+		IPage<AftersalesCompletionRecipientVO> pages = aftersalesCompletionRecipientService.selectAftersalesCompletionRecipientPage(Condition.getPage(query), aftersalesCompletionRecipient);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单完结处理结果受款方 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesCompletionRecipient")
+	public R save(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) {
+		return R.status(aftersalesCompletionRecipientService.save(aftersalesCompletionRecipient));
+	}
+
+	/**
+	 * 异常工单完结处理结果受款方 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecipient")
+	public R update(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) {
+		return R.status(aftersalesCompletionRecipientService.updateById(aftersalesCompletionRecipient));
+	}
+
+	/**
+	 * 异常工单完结处理结果受款方 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesCompletionRecipient")
+	public R submit(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) {
+		return R.status(aftersalesCompletionRecipientService.saveOrUpdate(aftersalesCompletionRecipient));
+	}
+
+	/**
+	 * 异常工单完结处理结果受款方 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesCompletionRecipientService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesCompletionRecipient")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesCompletionRecipient")
+	public void exportAftersalesCompletionRecipient(@ApiIgnore @RequestParam Map<String, Object> aftersalesCompletionRecipient, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesCompletionRecipientEntity> queryWrapper = Condition.getQueryWrapper(aftersalesCompletionRecipient, AftersalesCompletionRecipientEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesCompletionRecipient::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesCompletionRecipientEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesCompletionRecipientExcel> list = aftersalesCompletionRecipientService.exportAftersalesCompletionRecipient(queryWrapper);
+		ExcelUtil.export(response, "异常工单完结处理结果受款方数据" + DateUtil.time(), "异常工单完结处理结果受款方数据表", list, AftersalesCompletionRecipientExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity;
+import com.logpm.aftersales.vo.AftersalesCompletionRecordVO;
+import com.logpm.aftersales.excel.AftersalesCompletionRecordExcel;
+import com.logpm.aftersales.wrapper.AftersalesCompletionRecordWrapper;
+import com.logpm.aftersales.service.IAftersalesCompletionRecordService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单完结处理结果赔款方 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesCompletionRecord")
+@Api(value = "异常工单完结处理结果赔款方", tags = "异常工单完结处理结果赔款方接口")
+public class AftersalesCompletionRecordController extends BladeController {
+
+	private final IAftersalesCompletionRecordService aftersalesCompletionRecordService;
+
+	/**
+	 * 异常工单完结处理结果赔款方 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesCompletionRecord")
+	public R<AftersalesCompletionRecordVO> detail(AftersalesCompletionRecordEntity aftersalesCompletionRecord) {
+		AftersalesCompletionRecordEntity detail = aftersalesCompletionRecordService.getOne(Condition.getQueryWrapper(aftersalesCompletionRecord));
+		return R.data(AftersalesCompletionRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单完结处理结果赔款方 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecord")
+	public R<IPage<AftersalesCompletionRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesCompletionRecord, Query query) {
+		IPage<AftersalesCompletionRecordEntity> pages = aftersalesCompletionRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCompletionRecord, AftersalesCompletionRecordEntity.class));
+		return R.data(AftersalesCompletionRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单完结处理结果赔款方 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecord")
+	public R<IPage<AftersalesCompletionRecordVO>> page(AftersalesCompletionRecordVO aftersalesCompletionRecord, Query query) {
+		IPage<AftersalesCompletionRecordVO> pages = aftersalesCompletionRecordService.selectAftersalesCompletionRecordPage(Condition.getPage(query), aftersalesCompletionRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单完结处理结果赔款方 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesCompletionRecord")
+	public R save(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) {
+		return R.status(aftersalesCompletionRecordService.save(aftersalesCompletionRecord));
+	}
+
+	/**
+	 * 异常工单完结处理结果赔款方 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecord")
+	public R update(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) {
+		return R.status(aftersalesCompletionRecordService.updateById(aftersalesCompletionRecord));
+	}
+
+	/**
+	 * 异常工单完结处理结果赔款方 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesCompletionRecord")
+	public R submit(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) {
+		return R.status(aftersalesCompletionRecordService.saveOrUpdate(aftersalesCompletionRecord));
+	}
+
+	/**
+	 * 异常工单完结处理结果赔款方 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesCompletionRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesCompletionRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesCompletionRecord")
+	public void exportAftersalesCompletionRecord(@ApiIgnore @RequestParam Map<String, Object> aftersalesCompletionRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesCompletionRecordEntity> queryWrapper = Condition.getQueryWrapper(aftersalesCompletionRecord, AftersalesCompletionRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesCompletionRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesCompletionRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesCompletionRecordExcel> list = aftersalesCompletionRecordService.exportAftersalesCompletionRecord(queryWrapper);
+		ExcelUtil.export(response, "异常工单完结处理结果赔款方数据" + DateUtil.time(), "异常工单完结处理结果赔款方数据表", list, AftersalesCompletionRecordExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesDecreaseImageController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity;
+import com.logpm.aftersales.vo.AftersalesDecreaseImageVO;
+import com.logpm.aftersales.excel.AftersalesDecreaseImageExcel;
+import com.logpm.aftersales.wrapper.AftersalesDecreaseImageWrapper;
+import com.logpm.aftersales.service.IAftersalesDecreaseImageService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常运损图片（最少两张） 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesDecreaseImage")
+@Api(value = "异常运损图片（最少两张）", tags = "异常运损图片（最少两张）接口")
+public class AftersalesDecreaseImageController extends BladeController {
+
+	private final IAftersalesDecreaseImageService aftersalesDecreaseImageService;
+
+	/**
+	 * 异常运损图片（最少两张） 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesDecreaseImage")
+	public R<AftersalesDecreaseImageVO> detail(AftersalesDecreaseImageEntity aftersalesDecreaseImage) {
+		AftersalesDecreaseImageEntity detail = aftersalesDecreaseImageService.getOne(Condition.getQueryWrapper(aftersalesDecreaseImage));
+		return R.data(AftersalesDecreaseImageWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常运损图片（最少两张） 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesDecreaseImage")
+	public R<IPage<AftersalesDecreaseImageVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesDecreaseImage, Query query) {
+		IPage<AftersalesDecreaseImageEntity> pages = aftersalesDecreaseImageService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesDecreaseImage, AftersalesDecreaseImageEntity.class));
+		return R.data(AftersalesDecreaseImageWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常运损图片（最少两张） 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesDecreaseImage")
+	public R<IPage<AftersalesDecreaseImageVO>> page(AftersalesDecreaseImageVO aftersalesDecreaseImage, Query query) {
+		IPage<AftersalesDecreaseImageVO> pages = aftersalesDecreaseImageService.selectAftersalesDecreaseImagePage(Condition.getPage(query), aftersalesDecreaseImage);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常运损图片（最少两张） 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesDecreaseImage")
+	public R save(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) {
+		return R.status(aftersalesDecreaseImageService.save(aftersalesDecreaseImage));
+	}
+
+	/**
+	 * 异常运损图片（最少两张） 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesDecreaseImage")
+	public R update(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) {
+		return R.status(aftersalesDecreaseImageService.updateById(aftersalesDecreaseImage));
+	}
+
+	/**
+	 * 异常运损图片（最少两张） 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesDecreaseImage")
+	public R submit(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) {
+		return R.status(aftersalesDecreaseImageService.saveOrUpdate(aftersalesDecreaseImage));
+	}
+
+	/**
+	 * 异常运损图片（最少两张） 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesDecreaseImageService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesDecreaseImage")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesDecreaseImage")
+	public void exportAftersalesDecreaseImage(@ApiIgnore @RequestParam Map<String, Object> aftersalesDecreaseImage, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesDecreaseImageEntity> queryWrapper = Condition.getQueryWrapper(aftersalesDecreaseImage, AftersalesDecreaseImageEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesDecreaseImage::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesDecreaseImageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesDecreaseImageExcel> list = aftersalesDecreaseImageService.exportAftersalesDecreaseImage(queryWrapper);
+		ExcelUtil.export(response, "异常运损图片（最少两张）数据" + DateUtil.time(), "异常运损图片（最少两张）数据表", list, AftersalesDecreaseImageExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesExchangeController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import com.logpm.aftersales.vo.AftersalesExchangeVO;
+import com.logpm.aftersales.excel.AftersalesExchangeExcel;
+import com.logpm.aftersales.wrapper.AftersalesExchangeWrapper;
+import com.logpm.aftersales.service.IAftersalesExchangeService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 工单交流处理数据记录 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesExchange")
+@Api(value = "工单交流处理数据记录", tags = "工单交流处理数据记录接口")
+public class AftersalesExchangeController extends BladeController {
+
+	private final IAftersalesExchangeService aftersalesExchangeService;
+
+	/**
+	 * 工单交流处理数据记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesExchange")
+	public R<AftersalesExchangeVO> detail(AftersalesExchangeEntity aftersalesExchange) {
+		AftersalesExchangeEntity detail = aftersalesExchangeService.getOne(Condition.getQueryWrapper(aftersalesExchange));
+		return R.data(AftersalesExchangeWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 工单交流处理数据记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesExchange")
+	public R<IPage<AftersalesExchangeVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesExchange, Query query) {
+		IPage<AftersalesExchangeEntity> pages = aftersalesExchangeService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesExchange, AftersalesExchangeEntity.class));
+		return R.data(AftersalesExchangeWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 工单交流处理数据记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesExchange")
+	public R<IPage<AftersalesExchangeVO>> page(AftersalesExchangeVO aftersalesExchange, Query query) {
+		IPage<AftersalesExchangeVO> pages = aftersalesExchangeService.selectAftersalesExchangePage(Condition.getPage(query), aftersalesExchange);
+		return R.data(pages);
+	}
+
+	/**
+	 * 工单交流处理数据记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesExchange")
+	public R save(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) {
+		return R.status(aftersalesExchangeService.save(aftersalesExchange));
+	}
+
+	/**
+	 * 工单交流处理数据记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesExchange")
+	public R update(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) {
+		return R.status(aftersalesExchangeService.updateById(aftersalesExchange));
+	}
+
+	/**
+	 * 工单交流处理数据记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesExchange")
+	public R submit(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) {
+		return R.status(aftersalesExchangeService.saveOrUpdate(aftersalesExchange));
+	}
+
+	/**
+	 * 工单交流处理数据记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesExchangeService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesExchange")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesExchange")
+	public void exportAftersalesExchange(@ApiIgnore @RequestParam Map<String, Object> aftersalesExchange, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesExchangeEntity> queryWrapper = Condition.getQueryWrapper(aftersalesExchange, AftersalesExchangeEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesExchange::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesExchangeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesExchangeExcel> list = aftersalesExchangeService.exportAftersalesExchange(queryWrapper);
+		ExcelUtil.export(response, "工单交流处理数据记录数据" + DateUtil.time(), "工单交流处理数据记录数据表", list, AftersalesExchangeExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
+import com.logpm.aftersales.vo.AftersalesOvertimeFineVO;
+import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel;
+import com.logpm.aftersales.wrapper.AftersalesOvertimeFineWrapper;
+import com.logpm.aftersales.service.IAftersalesOvertimeFineService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单超时记录表 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesOvertimeFine")
+@Api(value = "异常工单超时记录表", tags = "异常工单超时记录表接口")
+public class AftersalesOvertimeFineController extends BladeController {
+
+	private final IAftersalesOvertimeFineService aftersalesOvertimeFineService;
+
+	/**
+	 * 异常工单超时记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesOvertimeFine")
+	public R<AftersalesOvertimeFineVO> detail(AftersalesOvertimeFineEntity aftersalesOvertimeFine) {
+		AftersalesOvertimeFineEntity detail = aftersalesOvertimeFineService.getOne(Condition.getQueryWrapper(aftersalesOvertimeFine));
+		return R.data(AftersalesOvertimeFineWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单超时记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine")
+	public R<IPage<AftersalesOvertimeFineVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesOvertimeFine, Query query) {
+		IPage<AftersalesOvertimeFineEntity> pages = aftersalesOvertimeFineService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesOvertimeFine, AftersalesOvertimeFineEntity.class));
+		return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单超时记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine")
+	public R<IPage<AftersalesOvertimeFineVO>> page(AftersalesOvertimeFineVO aftersalesOvertimeFine, Query query) {
+		IPage<AftersalesOvertimeFineVO> pages = aftersalesOvertimeFineService.selectAftersalesOvertimeFinePage(Condition.getPage(query), aftersalesOvertimeFine);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单超时记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesOvertimeFine")
+	public R save(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) {
+		return R.status(aftersalesOvertimeFineService.save(aftersalesOvertimeFine));
+	}
+
+	/**
+	 * 异常工单超时记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesOvertimeFine")
+	public R update(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) {
+		return R.status(aftersalesOvertimeFineService.updateById(aftersalesOvertimeFine));
+	}
+
+	/**
+	 * 异常工单超时记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesOvertimeFine")
+	public R submit(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) {
+		return R.status(aftersalesOvertimeFineService.saveOrUpdate(aftersalesOvertimeFine));
+	}
+
+	/**
+	 * 异常工单超时记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesOvertimeFineService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesOvertimeFine")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesOvertimeFine")
+	public void exportAftersalesOvertimeFine(@ApiIgnore @RequestParam Map<String, Object> aftersalesOvertimeFine, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesOvertimeFineEntity> queryWrapper = Condition.getQueryWrapper(aftersalesOvertimeFine, AftersalesOvertimeFineEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesOvertimeFine::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesOvertimeFineEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesOvertimeFineExcel> list = aftersalesOvertimeFineService.exportAftersalesOvertimeFine(queryWrapper);
+		ExcelUtil.export(response, "异常工单超时记录表数据" + DateUtil.time(), "异常工单超时记录表数据表", list, AftersalesOvertimeFineExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessingResultsController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity;
+import com.logpm.aftersales.vo.AftersalesProcessingResultsVO;
+import com.logpm.aftersales.excel.AftersalesProcessingResultsExcel;
+import com.logpm.aftersales.wrapper.AftersalesProcessingResultsWrapper;
+import com.logpm.aftersales.service.IAftersalesProcessingResultsService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单处理结果 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesProcessingResults")
+@Api(value = "异常工单处理结果", tags = "异常工单处理结果接口")
+public class AftersalesProcessingResultsController extends BladeController {
+
+	private final IAftersalesProcessingResultsService aftersalesProcessingResultsService;
+
+	/**
+	 * 异常工单处理结果 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesProcessingResults")
+	public R<AftersalesProcessingResultsVO> detail(AftersalesProcessingResultsEntity aftersalesProcessingResults) {
+		AftersalesProcessingResultsEntity detail = aftersalesProcessingResultsService.getOne(Condition.getQueryWrapper(aftersalesProcessingResults));
+		return R.data(AftersalesProcessingResultsWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单处理结果 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesProcessingResults")
+	public R<IPage<AftersalesProcessingResultsVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesProcessingResults, Query query) {
+		IPage<AftersalesProcessingResultsEntity> pages = aftersalesProcessingResultsService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesProcessingResults, AftersalesProcessingResultsEntity.class));
+		return R.data(AftersalesProcessingResultsWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单处理结果 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesProcessingResults")
+	public R<IPage<AftersalesProcessingResultsVO>> page(AftersalesProcessingResultsVO aftersalesProcessingResults, Query query) {
+		IPage<AftersalesProcessingResultsVO> pages = aftersalesProcessingResultsService.selectAftersalesProcessingResultsPage(Condition.getPage(query), aftersalesProcessingResults);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单处理结果 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesProcessingResults")
+	public R save(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) {
+		return R.status(aftersalesProcessingResultsService.save(aftersalesProcessingResults));
+	}
+
+	/**
+	 * 异常工单处理结果 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesProcessingResults")
+	public R update(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) {
+		return R.status(aftersalesProcessingResultsService.updateById(aftersalesProcessingResults));
+	}
+
+	/**
+	 * 异常工单处理结果 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesProcessingResults")
+	public R submit(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) {
+		return R.status(aftersalesProcessingResultsService.saveOrUpdate(aftersalesProcessingResults));
+	}
+
+	/**
+	 * 异常工单处理结果 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesProcessingResultsService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesProcessingResults")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesProcessingResults")
+	public void exportAftersalesProcessingResults(@ApiIgnore @RequestParam Map<String, Object> aftersalesProcessingResults, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesProcessingResultsEntity> queryWrapper = Condition.getQueryWrapper(aftersalesProcessingResults, AftersalesProcessingResultsEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesProcessingResults::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesProcessingResultsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesProcessingResultsExcel> list = aftersalesProcessingResultsService.exportAftersalesProcessingResults(queryWrapper);
+		ExcelUtil.export(response, "异常工单处理结果数据" + DateUtil.time(), "异常工单处理结果数据表", list, AftersalesProcessingResultsExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessorController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
+import com.logpm.aftersales.vo.AftersalesProcessorVO;
+import com.logpm.aftersales.excel.AftersalesProcessorExcel;
+import com.logpm.aftersales.wrapper.AftersalesProcessorWrapper;
+import com.logpm.aftersales.service.IAftersalesProcessorService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常责任方和处理方 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesProcessor")
+@Api(value = "异常责任方和处理方", tags = "异常责任方和处理方接口")
+public class AftersalesProcessorController extends BladeController {
+
+	private final IAftersalesProcessorService aftersalesProcessorService;
+
+	/**
+	 * 异常责任方和处理方 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesProcessor")
+	public R<AftersalesProcessorVO> detail(AftersalesProcessorEntity aftersalesProcessor) {
+		AftersalesProcessorEntity detail = aftersalesProcessorService.getOne(Condition.getQueryWrapper(aftersalesProcessor));
+		return R.data(AftersalesProcessorWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常责任方和处理方 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesProcessor")
+	public R<IPage<AftersalesProcessorVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesProcessor, Query query) {
+		IPage<AftersalesProcessorEntity> pages = aftersalesProcessorService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesProcessor, AftersalesProcessorEntity.class));
+		return R.data(AftersalesProcessorWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常责任方和处理方 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesProcessor")
+	public R<IPage<AftersalesProcessorVO>> page(AftersalesProcessorVO aftersalesProcessor, Query query) {
+		IPage<AftersalesProcessorVO> pages = aftersalesProcessorService.selectAftersalesProcessorPage(Condition.getPage(query), aftersalesProcessor);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常责任方和处理方 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesProcessor")
+	public R save(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) {
+		return R.status(aftersalesProcessorService.save(aftersalesProcessor));
+	}
+
+	/**
+	 * 异常责任方和处理方 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesProcessor")
+	public R update(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) {
+		return R.status(aftersalesProcessorService.updateById(aftersalesProcessor));
+	}
+
+	/**
+	 * 异常责任方和处理方 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesProcessor")
+	public R submit(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) {
+		return R.status(aftersalesProcessorService.saveOrUpdate(aftersalesProcessor));
+	}
+
+	/**
+	 * 异常责任方和处理方 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesProcessorService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesProcessor")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesProcessor")
+	public void exportAftersalesProcessor(@ApiIgnore @RequestParam Map<String, Object> aftersalesProcessor, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesProcessorEntity> queryWrapper = Condition.getQueryWrapper(aftersalesProcessor, AftersalesProcessorEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesProcessor::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesProcessorEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesProcessorExcel> list = aftersalesProcessorService.exportAftersalesProcessor(queryWrapper);
+		ExcelUtil.export(response, "异常责任方和处理方数据" + DateUtil.time(), "异常责任方和处理方数据表", list, AftersalesProcessorExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
+import com.logpm.aftersales.vo.AftersalesReturnRecordVO;
+import com.logpm.aftersales.excel.AftersalesReturnRecordExcel;
+import com.logpm.aftersales.wrapper.AftersalesReturnRecordWrapper;
+import com.logpm.aftersales.service.IAftersalesReturnRecordService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常 工单打回记录 控制器
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesReturnRecord")
+@Api(value = "异常 工单打回记录", tags = "异常 工单打回记录接口")
+public class AftersalesReturnRecordController extends BladeController {
+
+	private final IAftersalesReturnRecordService aftersalesReturnRecordService;
+
+	/**
+	 * 异常 工单打回记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesReturnRecord")
+	public R<AftersalesReturnRecordVO> detail(AftersalesReturnRecordEntity aftersalesReturnRecord) {
+		AftersalesReturnRecordEntity detail = aftersalesReturnRecordService.getOne(Condition.getQueryWrapper(aftersalesReturnRecord));
+		return R.data(AftersalesReturnRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常 工单打回记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesReturnRecord")
+	public R<IPage<AftersalesReturnRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesReturnRecord, Query query) {
+		IPage<AftersalesReturnRecordEntity> pages = aftersalesReturnRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesReturnRecord, AftersalesReturnRecordEntity.class));
+		return R.data(AftersalesReturnRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常 工单打回记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesReturnRecord")
+	public R<IPage<AftersalesReturnRecordVO>> page(AftersalesReturnRecordVO aftersalesReturnRecord, Query query) {
+		IPage<AftersalesReturnRecordVO> pages = aftersalesReturnRecordService.selectAftersalesReturnRecordPage(Condition.getPage(query), aftersalesReturnRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常 工单打回记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesReturnRecord")
+	public R save(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) {
+		return R.status(aftersalesReturnRecordService.save(aftersalesReturnRecord));
+	}
+
+	/**
+	 * 异常 工单打回记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesReturnRecord")
+	public R update(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) {
+		return R.status(aftersalesReturnRecordService.updateById(aftersalesReturnRecord));
+	}
+
+	/**
+	 * 异常 工单打回记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesReturnRecord")
+	public R submit(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) {
+		return R.status(aftersalesReturnRecordService.saveOrUpdate(aftersalesReturnRecord));
+	}
+
+	/**
+	 * 异常 工单打回记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesReturnRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesReturnRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesReturnRecord")
+	public void exportAftersalesReturnRecord(@ApiIgnore @RequestParam Map<String, Object> aftersalesReturnRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesReturnRecordEntity> queryWrapper = Condition.getQueryWrapper(aftersalesReturnRecord, AftersalesReturnRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesReturnRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesReturnRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesReturnRecordExcel> list = aftersalesReturnRecordService.exportAftersalesReturnRecord(queryWrapper);
+		ExcelUtil.export(response, "异常 工单打回记录数据" + DateUtil.time(), "异常 工单打回记录数据表", list, AftersalesReturnRecordExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -0,0 +1,151 @@
+/*
+ *      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.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
+import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
+import com.logpm.aftersales.wrapper.AftersalesWorkOrderWrapper;
+import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客服异常工单 控制器
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/aftersalesWorkOrder")
+@Api(value = "客服异常工单", tags = "客服异常工单接口")
+public class AftersalesWorkOrderController extends BladeController {
+
+	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+
+	/**
+	 * 客服异常工单 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesWorkOrder")
+	public R<AftersalesWorkOrderVO> detail(AftersalesWorkOrderEntity aftersalesWorkOrder) {
+		AftersalesWorkOrderEntity detail = aftersalesWorkOrderService.getOne(Condition.getQueryWrapper(aftersalesWorkOrder));
+		return R.data(AftersalesWorkOrderWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 客服异常工单 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder")
+	public R<IPage<AftersalesWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesWorkOrder, Query query) {
+		IPage<AftersalesWorkOrderEntity> pages = aftersalesWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesWorkOrder, AftersalesWorkOrderEntity.class));
+		return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 客服异常工单 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder")
+	public R<IPage<AftersalesWorkOrderVO>> page(AftersalesWorkOrderVO aftersalesWorkOrder, Query query) {
+		IPage<AftersalesWorkOrderVO> pages = aftersalesWorkOrderService.selectAftersalesWorkOrderPage(Condition.getPage(query), aftersalesWorkOrder);
+		return R.data(pages);
+	}
+
+	/**
+	 * 客服异常工单 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesWorkOrder")
+	public R save(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) {
+		return R.status(aftersalesWorkOrderService.save(aftersalesWorkOrder));
+	}
+
+	/**
+	 * 客服异常工单 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesWorkOrder")
+	public R update(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) {
+		return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder));
+	}
+
+	/**
+	 * 客服异常工单 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesWorkOrder")
+	public R submit(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) {
+		return R.status(aftersalesWorkOrderService.saveOrUpdate(aftersalesWorkOrder));
+	}
+
+	/**
+	 * 客服异常工单 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesWorkOrderService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesWorkOrder")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder")
+	public void exportAftersalesWorkOrder(@ApiIgnore @RequestParam Map<String, Object> aftersalesWorkOrder, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesWorkOrderEntity> queryWrapper = Condition.getQueryWrapper(aftersalesWorkOrder, AftersalesWorkOrderEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesWorkOrder::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesWorkOrderEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesWorkOrderExcel> list = aftersalesWorkOrderService.exportAftersalesWorkOrder(queryWrapper);
+		ExcelUtil.export(response, "客服异常工单数据" + DateUtil.time(), "客服异常工单数据表", list, AftersalesWorkOrderExcel.class);
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAbnormalPackageDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常处理包件记录 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesAbnormalPackageDTO extends AftersalesAbnormalPackageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesArbitrationOrderDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单仲裁申请单 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesArbitrationOrderDTO extends AftersalesArbitrationOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCargoRecordsDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 货物催 — 查记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCargoRecordsDTO extends AftersalesCargoRecordsEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecipientDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单完结处理结果受款方 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecipientDTO extends AftersalesCompletionRecipientEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecordDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单完结处理结果赔款方 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesCompletionRecordDTO extends AftersalesCompletionRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesDecreaseImageDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常运损图片（最少两张） 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesDecreaseImageDTO extends AftersalesDecreaseImageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesExchangeDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单交流处理数据记录 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesExchangeDTO extends AftersalesExchangeEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesOvertimeFineDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单超时记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesOvertimeFineDTO extends AftersalesOvertimeFineEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单处理结果 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessorDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常责任方和处理方 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesProcessorDTO extends AftersalesProcessorEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesReturnRecordDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常 工单打回记录 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesReturnRecordDTO extends AftersalesReturnRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客服异常工单 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesAbnormalPackageExcel.java

@@ -0,0 +1,123 @@
+/*
+ *      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.aftersales.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 异常处理包件记录 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesAbnormalPackageExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 异常ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常ID")
+	private String workOrderId;
+	/**
+	 * 数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String number;
+	/**
+	 * 包件码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包件码")
+	private String packageCode;
+	/**
+	 * 仓库ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓库ID")
+	private String warehouseId;
+	/**
+	 * 包件图片路径
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包件图片路径")
+	private String packageImage;
+	/**
+	 * 类型;窜货，少货
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型;窜货，少货")
+	private String typesOf;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesArbitrationOrderExcel.java

@@ -0,0 +1,99 @@
+/*
+ *      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.aftersales.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 异常工单仲裁申请单 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesArbitrationOrderExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 异常工单Id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("异常工单Id")
+	private String workOrderId;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCargoRecordsExcel.java

@@ -0,0 +1,111 @@
+/*
+ *      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.aftersales.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 货物催 — 查记录表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-11-17
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesCargoRecordsExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 订单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单号")
+	private String orderNumber;
+	/**
+	 * 包件号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包件号")
+	private String packageCode;
+	/**
+	 * 客户交流记录
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户交流记录")
+	private String customerCommunication;
+	/**
+	 * 咨询人员
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("咨询人员")
+	private String consultant;
+
+}