Merge branch 'pre-production'

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

@@ -13,5 +13,7 @@ public class CodeNumConstant {
 	public final static int PSKH = 9;//配送客户号
 	public final static int ABNORMAL_ORDER = 10;//异常工单号
 	public final static int TRUNKLINEBILLLADING = 11;//干线提货单号
+	public final static int TRUNKLINE_CARS_LOAD = 12;//干线配载批次号
+	public final static int TRUNKLINE_TRIPARTITE_LOAD = 13;//干线三方中转批次号
 
 }

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

@@ -130,6 +130,7 @@ public class DictBizConstant {
 
 
 	//---------------------2023-12-04---------------
+	public static final String CARS_LOAD_STATUS = "cars_load_status";//配载计划状态
 	public static final String CARS_LOADING_TYPE = "cars_loading_type";//配载装车方式
 	public static final String CARS_LOAD_TYPE = "cars_load_type";//配载类型
 	public static final String CARS_DELIVERY_TYPE = "cars_delivery_type";//送货方式

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

@@ -0,0 +1,31 @@
+package org.springblade.common.constant.aftersales;
+
+public enum ProcessorConditionsStatusConstant {
+	zhengchang("正常","1"),
+	quciao("取消","3"),
+	xinzeng("新增","2");
+
+	private String name;
+	private String value;
+
+	ProcessorConditionsStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -0,0 +1,32 @@
+package org.springblade.common.constant.aftersales;
+
+public enum ProcessorProcessingStatusStatusConstant {
+	daichuli("待处理","1"),
+	yichuli("已处理","2"),
+	yichaoshi("已超时","3");
+
+	ProcessorProcessingStatusStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+	private String name;
+	private String value;
+
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -0,0 +1,42 @@
+package org.springblade.common.constant.aftersales;
+
+public enum ProcessorTypesOfStatusConstant {
+	zerenfang("责任方","1"),
+	chulifang("处理方","2");
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private ProcessorTypesOfStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+
+
+
+}

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

@@ -0,0 +1,30 @@
+package org.springblade.common.constant.aftersales;
+
+public enum ReturnRecordTypesOfStatusConstant {
+	yibandahui("一般打回","1"),
+	wanjeidahui("已完结打回","2")
+	;
+	private String name;
+	private String value;
+
+	ReturnRecordTypesOfStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -7,7 +7,11 @@ public enum WorkOrderStatusConstant {
 	chulizhong("处理中","20"),
 	daishenhe("待审核","40"),
 	yishenhe("已审核","50"),
-	chaoshiweichuli("超时未处理","60");
+	chaoshiweichuli("超时未处理","60"),
+	zhongchaizhong("仲裁中","70"),
+	yiwanjei("完结","80"),
+	lipeijineweichu("理赔金额未出","90")
+	;
 
 
 	/**

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

@@ -0,0 +1,30 @@
+package org.springblade.common.constant.aftersales;
+
+public enum WorkOrderTypesOfStatusConstant {
+	kaiqi("开启","1"),
+	jeishu("结束","2")
+	;
+	private String name;
+	private String value;
+
+	WorkOrderTypesOfStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -164,6 +164,14 @@ public class CommonUtil {
 		return null;
 	}
 
+	public static String dateToStringDiv(Date date,String pattern){
+		if (!Objects.isNull(date)) {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+			return simpleDateFormat.format(date);
+		}
+		return null;
+	}
+
 	public static Date getDayEnd(){
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
@@ -221,4 +229,23 @@ public class CommonUtil {
 			return null;
 		}
 	}
+
+
+	public static Date getEndByDateStr(String endDate) {
+		try {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+			Date parse = format.parse(endDate);
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(parse);
+			// 将时分秒,毫秒域清零
+			calendar.set(Calendar.HOUR_OF_DAY, 23);
+			calendar.set(Calendar.MINUTE, 59);
+			calendar.set(Calendar.SECOND, 59);
+			calendar.set(Calendar.MILLISECOND, 999);
+			return calendar.getTime();
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
 }

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

@@ -0,0 +1,128 @@
+/*
+ *      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-12-09
+ */
+@Data
+@TableName("logpm_aftersale_survey_record")
+@ApiModel(value = "AftersaleSurveyRecord对象", description = "工单调查记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordEntity 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 addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ApiModelProperty(value = "添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别 1 调查记录  2 指定记录 3 操作记录
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ApiModelProperty(value = "工单ID")
+	private Long workOrderId;
+
+	/**
+	 * 处理结果
+	 */
+	@ApiModelProperty(value = "处理结果")
+	private String processingResults;
+
+	/**
+	 * 跟进仓库名称
+	 */
+	@ApiModelProperty(value = "跟进仓库名称")
+	private String followWarehouseName;
+
+
+	/**
+	 * 跟进仓库ID
+	 */
+	@ApiModelProperty(value = "跟进仓库ID")
+	private Long followWarehouseId;
+
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	 * 图片路径
+	 */
+	@ApiModelProperty(value = "图片路径")
+	private String pictureUrl;
+
+
+
+}

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

@@ -92,4 +92,45 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "类型;窜货，少货")
 	private String typesOf;
 
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+
+	/**
+	 * 运单ID
+	 */
+	@ApiModelProperty(value = "运单ID")
+	private Long waybillId;
+
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private String orderCode;
+
+	/**
+	 * 订单ID
+	 */
+	@ApiModelProperty(value = "订单ID")
+	private Long orderId;
+
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private Integer conditions;
+
+	/**
+	 * 物料编码（库存品)
+	 */
+	@ApiModelProperty(value = "物料编码（库存品）")
+	private String cargoNumber;
+	/**
+	 * 入库批次号（库存品)
+	 */
+	@ApiModelProperty(value = "入库批次号（库存品）")
+	private String incomingBatch;
+
 }

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

@@ -65,11 +65,16 @@ public class AftersalesArbitrationOrderEntity extends TenantEntity {
 	 * 异常工单Id
 	 */
 	@ApiModelProperty(value = "异常工单Id")
-	private String workOrderId;
+	private Long workOrderId;
 	/**
 	 * 类型
 	 */
 	@ApiModelProperty(value = "类型")
 	private String typesOf;
+	/**
+	 * 操作 正常完结  客服完结
+	 */
+	@ApiModelProperty(value = "操作 正常完结  客服完结 ")
+	private String operateType;
 
 }

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

@@ -23,6 +23,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 异常工单完结处理结果受款方 实体类
  *
@@ -34,6 +36,65 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @ApiModel(value = "AftersalesCompletionRecipient对象", description = "异常工单完结处理结果受款方")
 @EqualsAndHashCode(callSuper = true)
 public class AftersalesCompletionRecipientEntity 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 recipient;
+	/**
+	 * 原因
+	 */
+	@ApiModelProperty(value = "受款原因")
+	private String reasonReceivingPayment;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	private BigDecimal money;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "责任方")
+	private String  responsibleParty;
+	/**
+	 * 工单号
+	 */
+	@ApiModelProperty(value = "工单号")
+	private String  workOrderNumber;
+	/**
+	 * 异常工单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/AftersalesCompletionRecordEntity.java

@@ -72,6 +72,16 @@ public class AftersalesCompletionRecordEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "原因")
 	private String reason;
+	/**
+	 * 说明
+	 */
+	@ApiModelProperty(value = "说明")
+	private String explain;
+	/**
+	 * 财务是否处理
+	 */
+	@ApiModelProperty(value = "财务是否处理")
+	private String accounting;
 	/**
 	 * 金额
 	 */

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

@@ -81,7 +81,22 @@ public class AftersalesOvertimeFineEntity extends TenantEntity {
 	 * 仓库ID
 	 */
 	@ApiModelProperty(value = "仓库ID")
-	private String warehouseId;
+	private Long warehouseId;
+	/**
+	 * 超时时间
+	 */
+	@ApiModelProperty(value = "处理方名称")
+	private String  businessName;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "处理方ID")
+	private Long businessId;
+	/**
+	 * 处理方ID
+	 */
+	@ApiModelProperty(value = "处理方ID")
+	private Long processorId;
 	/**
 	 * 备注
 	 */

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

@@ -0,0 +1,105 @@
+/*
+ *      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-12-09
+ */
+@Data
+@TableName("logpm_aftersales_person_responsible")
+@ApiModel(value = "AftersalesPersonResponsible对象", description = "异常工单预计责任人")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleEntity 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 Long wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ApiModelProperty(value = "责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ApiModelProperty(value = "责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ApiModelProperty(value = "责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 责任方名称
+	 */
+	@ApiModelProperty(value = "责任方名称")
+	private String businessName;
+	/**
+	 * 责任方ID
+	 */
+	@ApiModelProperty(value = "责任方ID")
+	private Long businessId;
+
+}

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

@@ -82,5 +82,26 @@ public class AftersalesProcessingMoneyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "类型")
 	private String typesOf;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付方式")
+	private String compensationMethod;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付方式名称")
+	private String compensationMethodName;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "处理结果名称")
+	private String resultName;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "赔付时间")
+	private String compensationTime;
+
 
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.aftersales.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,6 +84,7 @@ public class AftersalesProcessingResultsEntity extends TenantEntity {
 	 * 赔付时间
 	 */
 	@ApiModelProperty(value = "赔付时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
 	private Date compensationTime;
 	/**
 	 * 赔付凭证
@@ -98,12 +100,12 @@ public class AftersalesProcessingResultsEntity extends TenantEntity {
 	 * 异常工单ID
 	 */
 	@ApiModelProperty(value = "异常工单ID")
-	private String workOrderId;
+	private Long workOrderId;
 	/**
 	 * 仓库ID
 	 */
 	@ApiModelProperty(value = "仓库ID")
-	private String warehouseId;
+	private Long warehouseId;
 
 
 

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

@@ -70,7 +70,7 @@ public class AftersalesProcessorEntity extends TenantEntity {
 	 * ID
 	 */
 	@ApiModelProperty(value = "ID")
-	private String businessId;
+	private Long businessId;
 	/**
 	 * 异常工单ID
 	 */
@@ -86,6 +86,11 @@ public class AftersalesProcessorEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "类型")
 	private String typesOf;
+	/**
+	 * 处理状态 类型 1 待处理 2 已处理
+	 */
+	@ApiModelProperty(value = "处理状态")
+	private String processingStatus;
 	/**
 	 * 仓库ID
 	 */

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

@@ -70,7 +70,7 @@ public class AftersalesReturnRecordEntity extends TenantEntity {
 	 * 待处理营业部ID
 	 */
 	@ApiModelProperty(value = "待处理营业部ID")
-	private Long businessId;
+	private String businessId;
 	/**
 	 * 待处理营业部名称
 	 */
@@ -81,6 +81,11 @@ public class AftersalesReturnRecordEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "打回原因")
 	private String reasonReturn;
+	/**
+	 * 打回类型
+	 */
+	@ApiModelProperty(value = "打回类型")
+	private String typesOf;
 	/**
 	 * 仓库Id
 	 */

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -175,7 +176,7 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 * 归属客服ID
 	 */
 	@ApiModelProperty(value = "归属客服ID")
-	private String customerServiceId;
+	private Long customerServiceId;
 	/**
 	 * 归属客服名称
 	 */
@@ -234,5 +235,34 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "操作人")
 	private String operator;
+	/**
+	 * 公司比例
+	 */
+	@ApiModelProperty(value = "公司比例")
+	private String companyProportion;
+	/**
+	 * 关联工单ID
+	 */
+	@ApiModelProperty(value = "关联工单ID")
+	private Long relatedWorkOrdersId;
+	/**
+	 * 客服经理标识
+	 */
+	@ApiModelProperty(value = "客服经理标识")
+	@TableField(exist = false)
+	private String  customerIdentification;
+	/**
+	 * 仲裁原因
+	 */
+	@ApiModelProperty(value = "仲裁原因")
+	@TableField(exist = false)
+	private String  reasonArbitration;
+
+	/**
+	 * 标识 1订单 2 零担  3库存品
+	 */
+	@ApiModelProperty(value = "标识 1订单 2 零担  3库存品 ")
+	@TableField(exist = false)
+	private String  identifying;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersaleSurveyRecordClient.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.AftersaleSurveyRecordEntity;
+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-12-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersaleSurveyRecordClient {
+
+    String API_PREFIX = "/surveyRecord/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取工单调查记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersaleSurveyRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesPersonResponsibleClient.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.AftersalesPersonResponsibleEntity;
+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-12-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesPersonResponsibleClient {
+
+    String API_PREFIX = "/personResponsible/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单预计责任人列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesPersonResponsibleEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersaleSurveyRecordVO.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.AftersaleSurveyRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordVO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -32,4 +32,14 @@ import lombok.EqualsAndHashCode;
 public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity {
 	private static final long serialVersionUID = 1L;
 
+	private Integer maxQuantity;
+
+
+	private Integer isAbnormalLoading;
+
+
+	private Integer isAbnormalSinging;
+
+
+
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesPersonResponsibleVO.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.AftersalesPersonResponsibleEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleVO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -56,6 +56,20 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	private List<AftersalesDecreaseImageVO> decreaseImageVOList;
 
 
+	private AftersalesProcessingResultsVO processingResultsVO;
+	/**
+	 * 处理方名称
+	 */
+	private String businessName;
+	/**
+	 * 处理方ID
+	 */
+	private Long businessId;
+
+	/**
+	 * processor表 处理方ID
+	 */
+	private Long processorId;
 
 
 

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

@@ -13,6 +13,14 @@
     <groupId>org.springblade</groupId>
     <artifactId>logpm-distribution-api</artifactId>
     <version>3.2.0.RELEASE</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-aftersales-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java

@@ -192,6 +192,12 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "包件id")
 	private Long parcelListId;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String packageCode;
 	/**
 	 * 所属商场
 	 */

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
@@ -100,6 +101,16 @@ public interface IDistributionDeliveryListClient {
 	@GetMapping(TOP+"/getRetentionDelivery")
 	DistributionDeliveryListVO getRetentionDelivery(@RequestParam("deliveryId")Long deliveryId);
 
+	/**
+	 * 查询配送任务下的包件信息
+	 * @param deliveryId
+	 * @param scanBarCode
+	 * @return
+	 */
+	@GetMapping(TOP+"/aftersalesPackageScan")
+	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(@RequestParam("deliveryId")Long deliveryId,@RequestParam("scanBarCode")String scanBarCode);
+
+
 
 //    /**
 //	 * 根据配送任务ID查询配送司机信息

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

@@ -115,4 +115,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/findByOrderPackageCodeAndStatus")
 	DistributionParcelListEntity findByOrderPackageCodeAndStatus(@RequestParam String orderPackageCode);
+
+	@GetMapping(API_PREFIX+"/updateOrderPackageCodeById")
+    void updateOrderPackageCodeById(@RequestParam Long packageId, @RequestParam String orderPackageStatus);
 }

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

@@ -121,4 +121,7 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/addCarsLoadNum")
 	void addCarsLoadNum(@RequestParam Integer planNum, @RequestParam String orderCode, @RequestParam Long warehouseId);
+
+	@GetMapping(API_PREFIX + "/addIncomingNum")
+    void addIncomingNum(@RequestParam Long orderId, @RequestParam Integer num);
 }

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

@@ -127,4 +127,7 @@ public interface IDistributionStockListClient {
 
 	@GetMapping(API_PREFIX+"/getEntityByMarketNameAndMaterialCodeAndIncomingBatch")
 	DistributionStockListEntity getEntityByMarketNameAndMaterialCodeAndIncomingBatch(@RequestParam("marketName") String marketName, @RequestParam("materialCode") String materialCode, @RequestParam("incomingBatch") String incomingBatch, @RequestParam("warehouseId") Long warehouseId);
+
+	@GetMapping(API_PREFIX+"/updeteSourceTypeById")
+    void updeteSourceTypeById(@RequestParam String sourceType, @RequestParam Long stockListId);
 }

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

@@ -41,11 +41,29 @@ public class DistributionReservationStocklistVO extends DistributionReservationS
 	 */
 	@ApiModelProperty(value = "门店名称")
 	private String storeName;
+
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private String orderCode;
+
+	/**
+	 * 批次号
+	 */
+	@ApiModelProperty(value = "批次号")
+	private String incomingBatch;
 	/**
 	 * 货物名称
 	 */
 	@ApiModelProperty(value = "货物名称")
 	private String descriptionGoods;
+
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
 	/**
 	 * 物料编号
 	 */
@@ -137,6 +155,12 @@ public class DistributionReservationStocklistVO extends DistributionReservationS
 	@ApiModelProperty(value = "签收时间")
 	private String signTime;
 
+	/**
+	 * 库存品批次ID
+	 */
+	@ApiModelProperty(value = "库存品批次ID")
+	private Long stockListId;
+
 
 	/**
 	 * 签收时间

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

@@ -133,4 +133,10 @@ public class DistributionStockListVO extends DistributionStockListEntity {
 	@ApiModelProperty(value = "shan")
 	private String mallName;
 
+	/**
+	 * 预约Id
+	 */
+	@ApiModelProperty(value = "预约Id")
+	private Long reservationId;
+
 }

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

@@ -100,6 +100,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	 */
 	@ApiModelProperty(value = "托盘码")
 	private String trayCode;
+	/**
+	 * 托盘名称
+	 */
+	@ApiModelProperty(value = "托盘码")
+	private String trayName;
 
 	/**
 	 * 货物名称

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java

@@ -254,7 +254,7 @@ public class AdvanceEntity  {
 	 * 开单状态：1=未开单，2=已开单
 	 */
 	@ApiModelProperty(value = "开单状态：1=未开单，2=已开单")
-	private Byte waybillStatus;
+	private Integer waybillStatus;
 	/**
 	 * 运单号
 	 */
@@ -287,7 +287,7 @@ public class AdvanceEntity  {
 	 * 冻结状态：1=正常，2=冻结
 	 */
 	@ApiModelProperty(value = "冻结状态：1=正常，2=冻结")
-	private Byte freeze;
+	private Integer freeze;
 	/**
 	 * 删除原因
 	 */

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java

@@ -96,4 +96,7 @@ public interface IAdvanceClient {
 
 	@GetMapping(API_PREFIX + "/getAdvanceList")
 	List<AdvanceEntity> getAdvanceList(@RequestParam String orderSelfNum);
+
+	@PostMapping(API_PREFIX + "/findListByAdvanceIds")
+    List<AdvanceEntity> findListByAdvanceIds(@RequestBody List<Integer> advanceIds);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java

@@ -39,7 +39,7 @@ import java.util.Map;
 )
 public interface IAdvanceDetailClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "/oldAdvanceDetail/client";
     String TOP = API_PREFIX + "/top1";
 
 //    /**
@@ -105,4 +105,7 @@ public interface IAdvanceDetailClient {
 
 	@GetMapping(API_PREFIX + "/getByUnitNoAndWarehouseId")
 	DistributionParcelListEntityVO getByUnitNoAndWarehouseId(@RequestParam String unitNo, @RequestParam Integer oldWarehouseId);
+
+	@GetMapping(API_PREFIX + "/findListByAdvanceId")
+    List<AdvanceDetailEntity> findListByAdvanceId(@RequestParam Integer advanceId);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java

@@ -19,8 +19,10 @@ package com.logpm.oldproject.feign;
 import com.logpm.oldproject.entity.DetailProductEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 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;
 
@@ -35,7 +37,7 @@ import java.util.List;
 )
 public interface IDetailProductClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "detailProduct/client";
     String TOP = API_PREFIX + "/top2";
 
 //    /**
@@ -58,4 +60,7 @@ public interface IDetailProductClient {
 
 	@PostMapping(API_PREFIX + "/addDetailProductList")
 	Boolean addDetailProductList(@RequestBody List<DetailProductEntity> detailProductEntitys);
+
+	@GetMapping(API_PREFIX + "/findListByUnitNo")
+    List<DetailProductEntity> findListByUnitNo(@RequestParam String unitNo);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java

@@ -44,10 +44,10 @@ public interface IOrderClient {
     List<String> findOrderListByParam(@RequestParam String param);
 
 	@GetMapping(API_PREFIX + "/getTotalCountBy")
-	Integer getTotalCountBy(@RequestParam String param, @RequestParam Integer oldWarehouseId);
+	Integer getTotalCountBy(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam String tableName);
 
 	@GetMapping(API_PREFIX + "/findOrderCodeListByPage")
-	List<String> findOrderCodeListByPage(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
+	List<String> findOrderCodeListByPage(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam String tableName);
 
 	@GetMapping(API_PREFIX + "/getGoodsTypeByOrderCode")
 	Integer getGoodsTypeByOrderCode(@RequestParam String orderCode,@RequestParam Integer oldWarehouseId);
@@ -57,4 +57,9 @@ public interface IOrderClient {
 
 	@GetMapping(API_PREFIX + "/findOrderCodeListByZero")
 	List<String> findOrderCodeListByZero(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
+
+	@GetMapping(API_PREFIX + "/getTotalCountByInventory")
+	Integer getTotalCountByInventory(@RequestParam String param, @RequestParam Integer oldWarehouseId);
+
+	List<String> findOrderCodeListByPageWithInventoryId(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java

@@ -22,6 +22,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接口类
  *
@@ -44,4 +46,6 @@ public interface IWayBillClient {
 	@GetMapping(API_PREFIX + "/getByWayBillByAdvanceId")
 	WayBillEntity getByWayBillByAdvanceId(@RequestParam("advId") Integer  advId);
 
+	@GetMapping(API_PREFIX + "/findAdvanceIdsByWaybillNo")
+    List<Integer> findAdvanceIdsByWaybillNo(@RequestParam String waybillNo);
 }

blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/WarehouseMappingDataEntity.java

@@ -23,4 +23,6 @@ public class WarehouseMappingDataEntity {
 
 	private Integer inventoryId;
 
+	private String tableName;
+
 }

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

@@ -53,8 +53,12 @@ public class LoadCarsDTO implements Serializable {
 	private List<LoadingZeroDTO> zeroList = new ArrayList<>();
 
 	private Long carsLoadScanId;
+	private String arriveDateStr;
 
 
 	private List<String> orderCodes;
 
+
+	private Integer enterNum;
+
 }

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

@@ -3,14 +3,14 @@ package com.logpm.trunkline.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 @Data
 public class LoadingZeroDTO implements Serializable {
 
 	private String waybillNo;
 
-	private List<ProductInfoDTO> productInfoList = new ArrayList<>();
+	private String orderCode;
+
+	private Integer enterNum;
 
 }

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

@@ -11,4 +11,7 @@ public class TrunklineCarsLoadDTO extends TrunklineCarsLoadEntity {
 
 	private List<TrunklineCarsLoadLineDTO> carsLoadLineList = new ArrayList<>();
 
+	private String carrierTimeStr;
+	private String receivingTimeStr;
+
 }

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

@@ -1,5 +1,7 @@
 package com.logpm.trunkline.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -129,9 +131,11 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	@ApiModelProperty(name = "最新到车仓库id",notes = "")
 	private Long nowWarehouseId ;
 	/** 发车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "发车时间",notes = "")
 	private Date startTime ;
 	/** 到车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "到车时间",notes = "")
 	private Date arriveTime ;
 	/** 取消时间 */

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

@@ -1,5 +1,7 @@
 package com.logpm.trunkline.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -77,21 +79,27 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity {
 	@ApiModelProperty(name = "排序",notes = "")
 	private Integer sort ;
 	/** 到车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "到车时间",notes = "")
 	private Date arriveDate ;
 	/** 到车时间确认人id */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "到车时间确认人id",notes = "")
 	private Long arriveUserId ;
 	/** 到车时间确认人名称 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "到车时间确认人名称",notes = "")
 	private String arriveUserName ;
 	/** 发车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "发车时间",notes = "")
 	private Date startDate ;
 	/** 发车时间确认人id */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "发车时间确认人id",notes = "")
 	private Long startUserId ;
 	/** 发车时间确认人名称 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "发车时间确认人名称",notes = "")
 	private String startUserName ;
 	/** 计划装车件数 */

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

@@ -64,9 +64,12 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	/** 有无数据 1有 0无 */
 	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
 	private Integer isData ;
-	/** 是否异常 1是 0否 */
-	@ApiModelProperty(name = "是否异常 1是 0否",notes = "")
-	private Integer isAbnormal ;
+	/** 装车异常 1是 0否 */
+	@ApiModelProperty(name = "装车异常 1是 0否",notes = "")
+	private Integer loadingAbnormal ;
+	/** 卸车异常 1是 0否 */
+	@ApiModelProperty(name = "卸车异常 1是 0否",notes = "")
+	private Integer unloadAbnormal ;
 	/** 托盘码 */
 	@ApiModelProperty(name = "托盘码",notes = "")
 	private String trayCode ;
@@ -76,6 +79,29 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	/** 托盘id */
 	@ApiModelProperty(name = "托盘id",notes = "")
 	private Long trayId ;
-
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 卸车数量 */
+	@ApiModelProperty(name = "卸车数量",notes = "")
+	private Integer unloadNum ;
+	/** 目的仓库id */
+	@ApiModelProperty(name = "目的仓库id",notes = "")
+	private Long finalNodeId ;
+	/** 目的仓库名称 */
+	@ApiModelProperty(name = "目的仓库名称",notes = "")
+	private String finalNodeName ;
+	/** 卸车仓库id */
+	@ApiModelProperty(name = "卸车仓库id",notes = "")
+	private Long unloadNodeId ;
+	/** 卸车仓库名称 */
+	@ApiModelProperty(name = "卸车仓库名称",notes = "")
+	private String unloadNodeName ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark;
+	/** 卸车确认 0未确认 1已确认*/
+	@ApiModelProperty(name = "卸车确认 0未确认 1已确认",notes = "")
+	private Integer unloadCheck ;
 
 }

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

@@ -0,0 +1,86 @@
+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_cars_loading_log")
+@ApiModel(value = "TrunklineCarsLoadingLog对象", description = "干线装车记录表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineCarsLoadingLogEntity 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 loadId ;
+	/** 配载批次号 */
+	@ApiModelProperty(name = "配载批次号",notes = "")
+	private String loadCode ;
+	/** 运单id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 订单号 */
+	@ApiModelProperty(name = "订单号",notes = "")
+	private String orderCode ;
+	/** 包件码/品类名 */
+	@ApiModelProperty(name = "包件码/品类名",notes = "")
+	private String scanCode ;
+	/** 数量 */
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer num ;
+	/** 类型 1订制品 2零担 */
+	@ApiModelProperty(name = "类型 1订制品 2零担",notes = "")
+	private Integer type ;
+	/** 有无数据 1有 0无 */
+	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
+	private Integer isData ;
+	/** 是否异常 1是 0否 */
+	@ApiModelProperty(name = "是否异常 1是 0否",notes = "")
+	private Integer isAbnormal ;
+	/** 托盘码 */
+	@ApiModelProperty(name = "托盘码",notes = "")
+	private String trayCode ;
+	/** 托盘名称 */
+	@ApiModelProperty(name = "托盘名称",notes = "")
+	private String trayName ;
+	/** 托盘id */
+	@ApiModelProperty(name = "托盘id",notes = "")
+	private Long trayId ;
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 装车记录id */
+	@ApiModelProperty(name = "装车记录id",notes = "")
+	private Long loadScanId ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark ;
+
+}

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

@@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 @Data
-@TableName("logpm_trunkline_cars_unload_scan")
-@ApiModel(value = "TrunklineCarsUnloadScan对象", description = "干线卸车扫描表")
+@TableName("logpm_trunkline_cars_unload_log")
+@ApiModel(value = "TrunklineCarsUnloadLog对象", description = "干线卸车记录表")
 @EqualsAndHashCode(callSuper = true)
-public class TrunklineCarsUnloadScanEntity extends TenantEntity {
+public class TrunklineCarsUnloadLogEntity extends TenantEntity {
 
 	/** 预留1 */
 	@ApiModelProperty(name = "预留1",notes = "")
@@ -58,9 +58,6 @@ public class TrunklineCarsUnloadScanEntity extends TenantEntity {
 	/** 类型 1订制品 2零担 */
 	@ApiModelProperty(name = "类型 1订制品 2零担",notes = "")
 	private Integer type ;
-	/** 扫描状态 1装车 2卸车 3签收 */
-	@ApiModelProperty(name = "扫描状态 1装车 2卸车 3签收",notes = "")
-	private String scanStatus ;
 	/** 有无数据 1有 0无 */
 	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
 	private Integer isData ;
@@ -76,5 +73,14 @@ public class TrunklineCarsUnloadScanEntity extends TenantEntity {
 	/** 托盘id */
 	@ApiModelProperty(name = "托盘id",notes = "")
 	private Long trayId ;
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 装车记录id */
+	@ApiModelProperty(name = "装车记录id",notes = "")
+	private Long loadScanId ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark ;
 
 }

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

@@ -0,0 +1,20 @@
+package com.logpm.trunkline.feign;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklineAdvanceClient {
+
+	String API_PREFIX = "trunklineAdvance/client";
+
+	@PostMapping(API_PREFIX+"/addAdvanceReturnId")
+	Long addAdvanceReturnId(@RequestBody TrunklineAdvanceEntity trunklineAdvanceEntity);
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.logpm.trunkline.feign;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklineAdvanceDetailClient {
+
+	String API_PREFIX = "trunklineAdvanceDetail/client";
+
+	@PostMapping(API_PREFIX+"/addAdvanceBatch")
+	void addAdvanceBatch(@RequestBody List<TrunklineAdvanceDetailEntity> advanceDetailEntities);
+
+}

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

@@ -0,0 +1,23 @@
+package com.logpm.trunkline.feign;
+
+import com.logpm.trunkline.entity.TrunklineDetailProductEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklineDetailProductClient {
+
+	String API_PREFIX = "trunklineDetailProduct/client";
+
+	@PostMapping(API_PREFIX+"/addEntityReturnId")
+	Long addEntityReturnId(@RequestBody TrunklineDetailProductEntity trunklineDetailProductEntity);
+
+	@PostMapping(API_PREFIX+"/addListEntity")
+	void addListEntity(@RequestBody List<TrunklineDetailProductEntity> trunklineDetailProductEntities);
+}

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

@@ -0,0 +1,25 @@
+package com.logpm.trunkline.feign;
+
+import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+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;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklineWaybillOrderClient {
+
+	String API_PREFIX = "trunklineWaybillOrder/client";
+
+	@GetMapping(API_PREFIX+"/findListByWaybillNo")
+	List<TrunklineWaybillOrderEntity> findListByWaybillNo(@RequestParam String waybillNo);
+
+	@PostMapping(API_PREFIX+"/addEntityReturnId")
+	Long addEntityReturnId(@RequestBody TrunklineWaybillOrderEntity trunklineWaybillOrderEntity);
+}

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoadScanOrderVO implements Serializable {
+
+	private String orderCode;
+	private String waybillNo;
+	private Integer totalNum;
+	private Integer planNum;
+	private Integer realNum;
+
+}

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
 public class LoadZeroListVO implements Serializable {
 
 	private String waybillNo;//运单号
+	private String orderCode;//订单号
 	private Integer planNum;//计划装车件数
 	private Integer loadingNum;//已装车件数
 	private Integer unloadingNum;//已卸车件数

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderScanDetailVO implements Serializable {
+
+	private Long loadScanId;
+	private String scanCode;
+	private Integer num;
+	private String trayName;
+	private String trayCode;
+
+}

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

@@ -3,7 +3,7 @@ package com.logpm.trunkline.vo;
 import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
 import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
-import com.logpm.trunkline.entity.TrunklineCarsUnloadScanEntity;
+import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -18,9 +18,9 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 
 	private List<TrunklineCarsLoadLineEntity> carsLoadLineList = new ArrayList<>();
 	private List<TrunklineCarsLoadScanEntity> carsLoadScanPackageList = new ArrayList<>();
-	private List<TrunklineCarsUnloadScanEntity> carsUnloadScanPackageList = new ArrayList<>();
-	private List<LoadZeroListVO> zeroList = new ArrayList<>();
+	private List<TrunklineCarsUnloadLogEntity> carsUnloadScanPackageList = new ArrayList<>();
 	private List<UnloadZeroVO> unloadZeroList = new ArrayList<>();
+	private List<UnloadScanOrderVO> unloadScanOrderList = new ArrayList<>();
 
 	private BigDecimal nowTransportCost;
 	private BigDecimal oilCost;
@@ -35,4 +35,12 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 	private BigDecimal unloadOtherCost ;
 	private BigDecimal fuel ;
 	private BigDecimal tollFee ;
+
+
+	private Integer orderNum;
+
+	private List<LoadScanOrderVO> loadScanOrderList = new ArrayList<>();
+	private List<LoadZeroListVO> zeroList = new ArrayList<>();
+	private List<TrunklineCarsLoadScanEntity> exceptionList = new ArrayList<>();
+
 }

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

@@ -0,0 +1,17 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UnloadPackageVO implements Serializable {
+
+	private String orderPackageCode;
+	private Integer num;
+	private Integer unloadNum;
+	private String trayName;
+	private String trayCode;
+	private String scanStatus;
+
+}

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

@@ -0,0 +1,20 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class UnloadScanOrderVO implements Serializable {
+
+	private String waybillNo;
+	private String orderCode;
+	private Integer loadingNum;
+	private Integer unloadNum;
+
+	private List<UnloadPackageVO> unloadPackageList = new ArrayList<>();
+
+
+}

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

@@ -10,9 +10,10 @@ import java.util.List;
 public class UnloadZeroVO implements Serializable {
 
 	private String waybillNo;//运单号
+	private String orderCode;//订单号
 	private Integer loadingNum;//装车数量
 	private Integer unloadNum;//卸车件数
 
-	private List<ProductUnloadInfoVO> productUnloadInfoList = new ArrayList<>();
+	private List<UnloadPackageVO> unloadPackageList = new ArrayList<>();
 
 }

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

@@ -25,6 +25,8 @@ 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;
+
 /**
  * 运单表 Feign接口类
  *
@@ -61,4 +63,6 @@ public interface IWarehouseWaybillClient {
 	@PostMapping(API_PREFIX + "/updateEntity")
 	void updateEntity(@RequestBody WarehouseWaybillEntity warehouseWaybill);
 
+	@GetMapping(API_PREFIX + "/findList")
+    List<WarehouseWaybillEntity> findList();
 }

blade-service/logpm-aftersales/pom.xml

@@ -56,6 +56,23 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-system-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-distribution-api</artifactId>
+            <version>${bladex.project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-biz-common</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/apicontroller/AftersalesWorkOrderAppController.java

@@ -1,15 +1,18 @@
 package com.logpm.aftersales.apicontroller;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @AllArgsConstructor
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class AftersalesWorkOrderAppController {
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+
 	@PostMapping("/addWorkOrder")
 	public R addWorkOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
 		aftersalesWorkOrderDTO.setInitiationIdentification("PDA");
@@ -25,4 +29,33 @@ public class AftersalesWorkOrderAppController {
 	}
 
 
+	@PostMapping("/aftersalesPackageScan")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "工单包件扫描", notes = "传入aftersalesAppeal")
+	public R<List<AftersalesAbnormalPackageVO>> aftersalesPackageScan(@RequestBody AftersalesPackageScanDTO aftersalesPackageScanDTO){
+		return R.data(aftersalesWorkOrderService.aftersalesPackageScan(aftersalesPackageScanDTO));
+	}
+
+
+	@PostMapping("/saveAfterSalesOrder")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "PDA保存异常工单", notes = "传入aftersalesAppeal")
+	public R saveAfterSalesOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
+		return aftersalesWorkOrderService.saveAfterSalesOrder(aftersalesWorkOrderDTO);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/bean/Res.java

@@ -0,0 +1,30 @@
+package com.logpm.aftersales.bean;
+
+import lombok.Data;
+import org.springblade.core.tool.api.R;
+
+@Data
+public class Res extends R {
+
+	private String audio;
+
+	private Object obj;
+
+	public static Res scanSuccess(String msg, String audio,Object obj){
+		Res resp = new Res();
+		resp.setCode(200);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		resp.setObj(obj);
+		return resp;
+	}
+
+//	public static Res scanFail(String msg, String audio){
+//		Res resp = new Res();
+//		resp.setCode(3001);
+//		resp.setMsg(msg);
+//		resp.setAudio(audio);
+//		return resp;
+//	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/bean/Resp.java

@@ -0,0 +1,36 @@
+package com.logpm.aftersales.bean;
+
+import lombok.Data;
+import org.springblade.core.tool.api.R;
+
+@Data
+public class Resp extends R {
+
+	private String audio;
+
+	public static Resp scanSuccess(String msg,String audio){
+		Resp resp = new Resp();
+		resp.setCode(200);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+	public static Resp scanFail(String msg,String audio){
+		Resp resp = new Resp();
+		resp.setCode(3001);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+	public static Resp scanFail(int code,String msg,String audio,Object data){
+		Resp resp = new Resp();
+		resp.setCode(code);
+		resp.setMsg(msg);
+		resp.setData(data);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+}

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

@@ -0,0 +1,152 @@
+/*
+ *      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 com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+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.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.wrapper.AftersaleSurveyRecordWrapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+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-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersaleSurveyRecord/aftersaleSurveyRecord")
+@Api(value = "工单调查记录表", tags = "工单调查记录表接口")
+public class AftersaleSurveyRecordController extends BladeController {
+
+	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+	/**
+	 * 工单调查记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersaleSurveyRecord")
+	public R<AftersaleSurveyRecordVO> detail(AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersaleSurveyRecordEntity detail = aftersaleSurveyRecordService.getOne(Condition.getQueryWrapper(aftersaleSurveyRecord));
+		return R.data(AftersaleSurveyRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 工单调查记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordEntity> pages = aftersaleSurveyRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class));
+		return R.data(AftersaleSurveyRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 工单调查记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> page(AftersaleSurveyRecordVO aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordVO> pages = aftersaleSurveyRecordService.selectAftersaleSurveyRecordPage(Condition.getPage(query), aftersaleSurveyRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 工单调查记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersaleSurveyRecord")
+	public R save(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.save(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersaleSurveyRecord")
+	public R update(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.updateById(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersaleSurveyRecord")
+	public R submit(@Valid @RequestBody AftersaleSurveyRecordDTO aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.saveOrUpdateOwn(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersaleSurveyRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersaleSurveyRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersaleSurveyRecord")
+	public void exportAftersaleSurveyRecord(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersaleSurveyRecordEntity> queryWrapper = Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersaleSurveyRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersaleSurveyRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersaleSurveyRecordExcel> list = aftersaleSurveyRecordService.exportAftersaleSurveyRecord(queryWrapper);
+		ExcelUtil.export(response, "工单调查记录表数据" + DateUtil.time(), "工单调查记录表数据表", list, AftersaleSurveyRecordExcel.class);
+	}
+
+}

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

@@ -80,6 +80,17 @@ public class AftersalesOvertimeFineController extends BladeController {
 		return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages));
 	}
 
+	/**
+	 * 异常工单超时记录表 分页
+	 */
+	@GetMapping("/listOwn")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine")
+	public R<IPage<AftersalesOvertimeFineVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> aftersalesOvertimeFine, Query query) {
+		IPage<AftersalesOvertimeFineEntity> pages = aftersalesOvertimeFineService.pageOwn(Condition.getPage(query),aftersalesOvertimeFine);
+		return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages));
+	}
+
 	/**
 	 * 异常工单超时记录表 自定义分页
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesPersonResponsibleController.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.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.wrapper.AftersalesPersonResponsibleWrapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+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-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersalesPersonResponsible/aftersalesPersonResponsible")
+@Api(value = "异常工单预计责任人", tags = "异常工单预计责任人接口")
+public class AftersalesPersonResponsibleController extends BladeController {
+
+	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+	/**
+	 * 异常工单预计责任人 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesPersonResponsible")
+	public R<AftersalesPersonResponsibleVO> detail(AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		AftersalesPersonResponsibleEntity detail = aftersalesPersonResponsibleService.getOne(Condition.getQueryWrapper(aftersalesPersonResponsible));
+		return R.data(AftersalesPersonResponsibleWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单预计责任人 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleEntity> pages = aftersalesPersonResponsibleService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class));
+		return R.data(AftersalesPersonResponsibleWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单预计责任人 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> page(AftersalesPersonResponsibleVO aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleVO> pages = aftersalesPersonResponsibleService.selectAftersalesPersonResponsiblePage(Condition.getPage(query), aftersalesPersonResponsible);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单预计责任人 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesPersonResponsible")
+	public R save(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.save(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesPersonResponsible")
+	public R update(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.updateById(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesPersonResponsible")
+	public R submit(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.saveOrUpdate(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesPersonResponsibleService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesPersonResponsible")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesPersonResponsible")
+	public void exportAftersalesPersonResponsible(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesPersonResponsibleEntity> queryWrapper = Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesPersonResponsible::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesPersonResponsibleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesPersonResponsibleExcel> list = aftersalesPersonResponsibleService.exportAftersalesPersonResponsible(queryWrapper);
+		ExcelUtil.export(response, "异常工单预计责任人数据" + DateUtil.time(), "异常工单预计责任人数据表", list, AftersalesPersonResponsibleExcel.class);
+	}
+
+}

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

@@ -16,6 +16,8 @@
  */
 package com.logpm.aftersales.controller;
 
+import com.logpm.aftersales.dto.AftersalesReturnRecordDTO;
+import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.common.constant.aftersales.ReturnRecordTypesOfStatusConstant;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -127,10 +130,36 @@ public class AftersalesReturnRecordController extends BladeController {
 	@PostMapping("/batchRepulse")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入aftersalesReturnRecord")
-	public R batchRepulse(@Valid @RequestBody List<AftersalesReturnRecordEntity> aftersalesReturnRecord) {
+	public R batchRepulse(@Valid @RequestBody AftersalesReturnRecordDTO aftersalesReturnRecord) {
+		if(aftersalesReturnRecord.getWorkOrderIds().isEmpty()){
+			return R.fail("请选择工单！");
+		}
+		if(aftersalesReturnRecord.getProcessorList().isEmpty()){
+			return R.fail("请选择打回的营业部！");
+		}
+		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.yibandahui.getValue());
 		return R.status(aftersalesReturnRecordService.batchRepulse(aftersalesReturnRecord));
 	}
 
+
+
+	/**
+	 * 客服异常工单 已完结数据打回操作
+	 */
+	@PostMapping("/getCompletedReturned")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "异常工单   已完结数据打回操作", notes = "传入aftersalesWorkOrder")
+	public R getCompletedReturned(@Valid @RequestBody AftersalesReturnRecordDTO aftersalesReturnRecord) {
+		if(aftersalesReturnRecord.getWorkOrderIds().isEmpty()){
+			return R.fail("请选择工单！");
+		}
+		if(aftersalesReturnRecord.getProcessorList().isEmpty()){
+			return R.fail("请选择打回的营业部！");
+		}
+		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.wanjeidahui.getValue());
+		return R.status(aftersalesReturnRecordService.getCompletedReturned(aftersalesReturnRecord));
+	}
+
 	/**
 	 * 异常 工单打回记录 删除
 	 */

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

@@ -18,6 +18,7 @@ package com.logpm.aftersales.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
 import com.logpm.aftersales.excel.AftersalesWorkOrderImporter;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -29,11 +30,14 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.User;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
@@ -99,10 +103,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询异常完整数据集合", notes = "传入aftersalesWorkOrder")
 	public R<IPage<AftersalesWorkOrderVO>> getListOwn(@ApiIgnore @RequestParam Map<String, Object> aftersalesWorkOrder, Query query) {
-		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-			aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
-		}
+
 		IPage<AftersalesWorkOrderEntity> pages = aftersalesWorkOrderService.pageListOwn(aftersalesWorkOrder, Condition.getPage(query));
 		return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages));
 	}
@@ -117,12 +118,57 @@ public class AftersalesWorkOrderController extends BladeController {
 		  aftersalesWorkOrderService.getIsItTimeout();
 	}
 
+
+	/**
+	 * 客服异常工单 查询客服人员信息
+	 */
+	@GetMapping("/getCustomerServicePersonnel")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询客服人员信息", notes = "传入aftersalesWorkOrder")
+	public R<List<User>> listUser() {
+		List<User> list =  aftersalesWorkOrderService.getCustomerServicePersonnel();
+		return R.data(list);
+	}
+
+	/**
+	 * 工单调查记录表 新增调查记录
+	 */
+	@PostMapping("/savaSurveyRecord")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增调查记录", notes = "传入aftersaleSurveyRecord")
+	public R savaSurveyRecord(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+		log.info("回复添加接口》》》{}", aftersalesWorkOrderDTO);
+		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getSurveyRecordDTO())){
+			throw new ServiceException("调查数据不能为空");
+		}
+		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
+			throw new ServiceException("异常工单ID不能为空");
+		}
+		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getProcessorEntityList())){
+			throw new ServiceException("处理方信息不能为空");
+		}
+
+		return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
+	}
+
+
+	/**
+	 * 客服异常工单  查询营业部责任人人员信息
+	 */
+	@GetMapping("/getBusinessDepartmentUser")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询营业部责任人人员信息", notes = "传入aftersalesWorkOrder")
+	public R<List<User>> getBusinessDepartmentUser(Long warehouseId) {
+		List<User> list =  aftersalesWorkOrderService.getBusinessDepartmentUser(warehouseId);
+		return R.data(list);
+	}
+
 	/**
-	 * 客服异常工单 分配处理客服信息
+	 * 客服异常工单 异常工单分配处理客服信息
 	 */
 	@PostMapping("/assignCustomerService")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "客服异常工单 分配处理客服信息", notes = "传入aftersalesWorkOrder")
+	@ApiOperation(value = "客服异常工单 异常工单分配处理客服信息", notes = "传入aftersalesWorkOrder")
 	public R updateAssignCustomerService(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
 		if(ObjectUtils.isNull( aftersalesWorkOrderDTO.getAssignList() )){
 			return R.fail("请选择指派的工单 ！");
@@ -185,6 +231,34 @@ public class AftersalesWorkOrderController extends BladeController {
 		return R.data(workOrderVO);
 	}
 
+	/**
+	 * 客服异常工单 申请仲裁
+	 */
+	@PostMapping("/arbitrate")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "申请仲裁", notes = "传入aftersalesWorkOrder")
+	public R updateArbitrate (@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		log.info("申请仲裁>>>>{}",aftersalesWorkOrder);
+		if(ObjectUtils.isNull(aftersalesWorkOrder) || aftersalesWorkOrder.getAssignList().isEmpty()){
+			throw new ServiceException("数据不能为空！！");
+		}
+		return R.status(aftersalesWorkOrderService.updateArbitrate(aftersalesWorkOrder));
+	}
+
+	/**
+	 * 客服异常工单 客服仲裁完结操作
+	 */
+	@PostMapping("/arbitrateEnd")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "客服异常工单 客服仲裁完结操作", notes = "传入aftersalesWorkOrder")
+	public R addArbitrateEnd(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		log.info("客服仲裁完结操作》》》{}",aftersalesWorkOrder);
+		if(ObjectUtils.isNull(aftersalesWorkOrder) || aftersalesWorkOrder.getAssignList().isEmpty()){
+			throw new ServiceException("数据不能为空！！");
+		}
+		return R.status(aftersalesWorkOrderService.addArbitrateEnd(aftersalesWorkOrder));
+	}
+
 	/**
 	 * 客服异常工单 修改
 	 */
@@ -218,6 +292,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入aftersalesWorkOrder")
 	public R submit(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		log.info("工单创建的数据{}",aftersalesWorkOrder.toString());
+		aftersalesWorkOrder.setInitiationIdentification("PC");
 		return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersaleSurveyRecordDTO.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.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordDTO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,46 @@
+package com.logpm.aftersales.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 配送装车签收发起工单包件扫描DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AftersalesPackageScanDTO {
+
+	/**
+	 * 配送任务ID
+	 */
+	private Long deliveryId;
+
+	/**
+	 * 预约客户ID
+	 */
+	private Long reservationId;
+
+//	/**
+//	 * 司机名称
+//	 */
+//	private String driverName;
+//
+//	/**
+//	 * 车牌号
+//	 */
+//	private String vehicleNub;
+//
+//	/**
+//	 * 配送任务ID
+//	 */
+//	private String vehicleNub;
+
+
+	/**
+	 * 扫描码值
+	 */
+	private String scanBarCode;
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesPersonResponsibleDTO.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.AftersalesPersonResponsibleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleDTO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -31,7 +31,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity {
+public class   AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 处理结果类型

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

@@ -20,6 +20,8 @@ import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 异常 工单打回记录 数据传输对象实体类
  *
@@ -30,5 +32,19 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class AftersalesReturnRecordDTO extends AftersalesReturnRecordEntity {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 工单ID
+	 */
+	private List<Long> workOrderIds;
+	/**
+	 * 打回营业部集合
+	 */
+	private List<Processor> processorList;
+
+	@Data
+	public static class Processor{
+		private Long id;
+		private String name;
+	}
 
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.aftersales.dto;
 
 import com.logpm.aftersales.entity.*;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -72,6 +73,41 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity {
 	 */
 	private List<Long> assignList;
 
+	/**
+	 * 处理结果
+	 */
+	private AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO;
+
+	/**
+	 * 添加预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> personResponsibleDTO;
+	/**
+	 * 取消预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> unPersonResponsibleDTO;
+	/**
+	 *
+	 * 调查经过
+	 */
+	private AftersaleSurveyRecordDTO surveyRecordDTO;
+
+
+	/**
+	 * 工单指派 ID
+	 */
+	private List<AftersalesAbnormalPackageVO> packageList;
+
+	/**
+	 * 配送任务Id
+	 */
+	private Long deliveryId;
+
+
+
+
+
+
 
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersaleSurveyRecordExcel.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-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersaleSurveyRecordExcel 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 addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单ID")
+	private String workOrderId;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesPersonResponsibleExcel.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-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesPersonResponsibleExcel 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 wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ *      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 com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 工单调查记录表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersaleSurveyRecordClient implements IAftersaleSurveyRecordClient {
+
+    private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersaleSurveyRecordEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersaleSurveyRecordEntity> page = aftersaleSurveyRecordService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ *      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 com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 异常工单预计责任人 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersalesPersonResponsibleClient implements IAftersalesPersonResponsibleClient {
+
+    private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersalesPersonResponsibleEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersalesPersonResponsibleEntity> page = aftersalesPersonResponsibleService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersaleSurveyRecordMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      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.mapper;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 工单调查记录表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface AftersaleSurveyRecordMapper extends BaseMapper<AftersaleSurveyRecordEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	List<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(@Param("ew") Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersaleSurveyRecordMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.aftersales.mapper.AftersaleSurveyRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersaleSurveyRecordResultMap" type="com.logpm.aftersales.entity.AftersaleSurveyRecordEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="add_people" property="addPeople"/>
+        <result column="add_department" property="addDepartment"/>
+        <result column="content" property="content"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+        <result column="work_order_id" property="workOrderId"/>
+    </resultMap>
+
+
+    <select id="selectAftersaleSurveyRecordPage" resultMap="aftersaleSurveyRecordResultMap">
+        select * from logpm_aftersale_survey_record where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersaleSurveyRecord" resultType="com.logpm.aftersales.excel.AftersaleSurveyRecordExcel">
+        SELECT * FROM logpm_aftersale_survey_record ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java

@@ -51,4 +51,11 @@ public interface AftersalesOvertimeFineMapper extends BaseMapper<AftersalesOvert
 	 */
 	List<AftersalesOvertimeFineExcel> exportAftersalesOvertimeFine(@Param("ew") Wrapper<AftersalesOvertimeFineEntity> queryWrapper);
 
+	/**
+	 * 查询
+	 * @param page
+	 * @param overtimeFineEntity
+	 * @return
+	 */
+    IPage<AftersalesOvertimeFineVO> pageListOwn(IPage<Object> page,@Param("param") AftersalesOvertimeFineEntity overtimeFineEntity);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml

@@ -24,7 +24,14 @@
         <result column="warehouse_id" property="warehouseId"/>
         <result column="remarks" property="remarks"/>
     </resultMap>
-
+    <select id="pageListOwn" resultType="com.logpm.aftersales.vo.AftersalesOvertimeFineVO" >
+        select lawo.work_order_number,lawo.work_order_type,lawo.discovery_node,COUNT(laof.id),laof.create_time,laof.timeout
+        from logpm_aftersales_overtime_fine  laof
+                 LEFT JOIN logpm_aftersales_work_order lawo on lawo.id = laof.work_order_id
+        <where>
+            <if test=" param. != null and param. != ''">and   = #{param. }</if>
+        </where>
+    </select>
 
     <select id="selectAftersalesOvertimeFinePage" resultMap="aftersalesOvertimeFineResultMap">
         select * from logpm_aftersales_overtime_fine where is_deleted = 0

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesPersonResponsibleMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      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.mapper;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface AftersalesPersonResponsibleMapper extends BaseMapper<AftersalesPersonResponsibleEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(@Param("ew") Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesPersonResponsibleMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.aftersales.mapper.AftersalesPersonResponsibleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersalesPersonResponsibleResultMap" type="com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="word_order_id" property="wordOrderId"/>
+        <result column="person_responsible_id" property="personResponsibleId"/>
+        <result column="person_responsible_name" property="personResponsibleName"/>
+        <result column="responsibility_ratio" property="responsibilityRatio"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+    </resultMap>
+
+
+    <select id="selectAftersalesPersonResponsiblePage" resultMap="aftersalesPersonResponsibleResultMap">
+        select * from logpm_aftersales_person_responsible where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersalesPersonResponsible" resultType="com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel">
+        SELECT * FROM logpm_aftersales_person_responsible ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -51,10 +51,52 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
-        select lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
+        select lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
                lawo.secondary,lawo.vehicle_route,lawo.deliver_goods_time,lawo.discovery_time,lawo.warehousing_time,lawo.waybill_mall,lawo.remarks,lawo.delivery_time,
                lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by
         from logpm_aftersales_work_order lawo
+        <where>
+            <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
+            <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
+            <if test="param.initiationIdentification != null and paraminitiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
+            <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number = #{param.workOrderNumber } </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number = #{param.waybillNumber } </if>
+            <if test="param.orderCode != null and param.orderCode != '' ">and  lawo.order_code = #{param.orderCode } </if>
+            <if test="param.trainNumber != null and param.trainNumber != '' ">and  lawo.train_number = #{param.trainNumber } </if>
+            <if test="param.first != null and param.first != '' ">and  lawo.first = #{param.first } </if>
+            <if test="param.secondary != null and param.secondary != '' ">and  lawo.secondary = #{param.secondary } </if>
+            <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route = #{param.vehicleRoute } </if>
+<!-- create_time >= unix_timestamp('2013-10-24 00:00:00') and create_time <=  unix_timestamp('2013-10-24 23:59:59')
+date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
+-->
+            <if test="param.deliverGoodsTime != null and param.deliverGoodsTime != '' ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
+            <if test="param.discoveryTime != null and param.discoveryTime != '' ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
+            <if test="param.warehousingTime != null and param.warehousingTime != '' "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
+            <if test="param.deliveryTime != null and param.deliveryTime != '' ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
+            <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
+            <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
+            <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall = #{param.waybillMall } </if>
+            <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
+            <if test="param.workOrderStatus != null and param.workOrderStatus != '' ">and  lawo.work_order_status = #{param.workOrderStatus } </if>
+            <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
+            <if test="param.customerServiceName != null and param.customerServiceName != '' ">and  lawo.customer_service_name = #{param.customerServiceName } </if>
+            <if test="param.waybillMallId != null and param.waybillMallId != '' ">and  lawo.waybill_mall_id = #{param.waybillMallId } </if>
+            <if test="param.problemDescription != null and param.problemDescription != '' ">and  lawo.problem_description = #{param.problemDescription} </if>
+            <if test="param.warehouseId != null and param.warehouseId != '' ">and  lawo.warehouse_id = #{param.warehouseId} </if>
+            <if test="param.personResponsible != null and param.personResponsible != '' ">and  lawo.person_responsible = #{param.personResponsible } </if>
+            <if test="param.processNumber != null and param.processNumber != '' ">and  lawo.process_number = #{param.processNumber } </if>
+            <if test="param.reviewedBy != null and param.reviewedBy != '' ">and  lawo.reviewed_by = #{param.reviewedBy } </if>
+            <if test="param.operator != null and param.operator != '' ">and  lawo.operator = #{param.operator } </if>
+            <if test="param.responsiblePerson != null and param.responsiblePerson != '' ">and  lawo.responsible_person = #{param.responsiblePerson } </if>
+            <if test="param.processedBy != null and param.processedBy != '' ">and  lawo.processed_by = #{param.processedBy} </if>
+            <if test="param.investigationProcess != null and param.investigationProcess != '' ">and  lawo.investigation_process = #{param.investigationProcess } </if>
+            <if test="param.relatedWorkOrdersId != null and param.relatedWorkOrdersId != '' ">and  lawo.related_work_orders_id = #{param.relatedWorkOrdersId } </if>
+            <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
+                     and  lawo.work_order_status in  ('30','40','50','60','70','80','90')
+            </if>
+        </where>
 
     </select>
     <update id="updateList">

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

@@ -0,0 +1,59 @@
+/*
+ *      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.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 工单调查记录表 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersaleSurveyRecordService extends BaseService<AftersaleSurveyRecordEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+	/**
+	 * 添加或修改
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	boolean saveOrUpdateOwn(AftersaleSurveyRecordDTO aftersaleSurveyRecord);
+}

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

@@ -23,6 +23,7 @@ import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 异常工单超时记录表 服务类
@@ -49,4 +50,11 @@ public interface IAftersalesOvertimeFineService extends BaseService<AftersalesOv
 	 */
 	List<AftersalesOvertimeFineExcel> exportAftersalesOvertimeFine(Wrapper<AftersalesOvertimeFineEntity> queryWrapper);
 
+	/**
+	 * 查询超时记录数据
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+    IPage<AftersalesOvertimeFineEntity> pageOwn(IPage<Object> page, Map<String, Object>  queryWrapper);
 }

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

@@ -0,0 +1,52 @@
+/*
+ *      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.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersalesPersonResponsibleService extends BaseService<AftersalesPersonResponsibleEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

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

@@ -17,6 +17,7 @@
 package com.logpm.aftersales.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.dto.AftersalesReturnRecordDTO;
 import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
 import com.logpm.aftersales.vo.AftersalesReturnRecordVO;
 import com.logpm.aftersales.excel.AftersalesReturnRecordExcel;
@@ -61,5 +62,12 @@ public interface IAftersalesReturnRecordService extends BaseService<AftersalesRe
 	 * @param aftersalesReturnRecord
 	 * @return
 	 */
-	boolean batchRepulse(List<AftersalesReturnRecordEntity> aftersalesReturnRecord);
+	boolean batchRepulse(AftersalesReturnRecordDTO aftersalesReturnRecord);
+
+	/**
+	 * 异常工单   已完结数据打回操作
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean getCompletedReturned(AftersalesReturnRecordDTO aftersalesWorkOrder);
 }

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

@@ -16,13 +16,17 @@
  */
 package com.logpm.aftersales.service;
 
+import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.entity.User;
 
 import java.util.List;
 import java.util.Map;
@@ -129,4 +133,57 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @param isCovered
 	 */
 	void importUser(List<AftersalesWorkOrderExcel> data, Boolean isCovered);
+
+	/**
+	 * PDA扫描工单关联包件
+	 * @param aftersalesPackageScanDTO
+	 * @return
+	 */
+	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(AftersalesPackageScanDTO aftersalesPackageScanDTO);
+
+	/**
+	 * PDA工单签收包件扫描
+	 * @param aftersalesPackageScanDTO
+	 * @return
+	 */
+
+	/**
+	 * PDA保存异常工单
+	 * @param aftersalesWorkOrderDTO
+	 * @return
+	 */
+	R saveAfterSalesOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
+	/**
+	 * 查询客服信息
+	 * @return
+	 */
+	List<User> getCustomerServicePersonnel();
+
+	/**
+	 * 申请仲裁
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean updateArbitrate(AftersalesWorkOrderDTO aftersalesWorkOrder);
+
+	/**
+	 * 异常工单 客服仲裁完结
+	 * @param aftersalesWorkOrder
+	 * @return
+	 */
+	boolean addArbitrateEnd(AftersalesWorkOrderDTO aftersalesWorkOrder);
+
+	/**
+	 * 查询营业部责任人
+	 * @return
+	 */
+	List<User> getBusinessDepartmentUser(Long warehouseId);
+
+	/**
+	 * 添加调查结果
+	 * @param aftersalesWorkOrderDTO
+	 * @return
+	 */
+	boolean savaSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersaleSurveyRecordServiceImpl.java

@@ -0,0 +1,78 @@
+/*
+ *      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.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.mapper.AftersaleSurveyRecordMapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 工单调查记录表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Service
+public class AftersaleSurveyRecordServiceImpl extends BaseServiceImpl<AftersaleSurveyRecordMapper, AftersaleSurveyRecordEntity> implements IAftersaleSurveyRecordService {
+
+	@Override
+	public IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord) {
+		return page.setRecords(baseMapper.selectAftersaleSurveyRecordPage(page, aftersaleSurveyRecord));
+	}
+
+
+	@Override
+	public List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper) {
+		List<AftersaleSurveyRecordExcel> aftersaleSurveyRecordList = baseMapper.exportAftersaleSurveyRecord(queryWrapper);
+		//aftersaleSurveyRecordList.forEach(aftersaleSurveyRecord -> {
+		//	aftersaleSurveyRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersaleSurveyRecord.getType()));
+		//});
+		return aftersaleSurveyRecordList;
+	}
+
+	/**
+	 * 添加或修改信息
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	@Override
+	public boolean saveOrUpdateOwn(AftersaleSurveyRecordDTO aftersaleSurveyRecord) {
+		if(ObjectUtils.isNotNull(aftersaleSurveyRecord.getId())){
+			//修改
+			return false;
+		}else{
+			//添加
+			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
+			BeanUtil.copyProperties(aftersaleSurveyRecord,surveyRecordEntity);
+			baseMapper.insert(surveyRecordEntity);
+			return true;
+		}
+
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java

@@ -18,8 +18,11 @@ package com.logpm.aftersales.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.entity.AftersalesExchangeEntity;
+import com.logpm.aftersales.entity.AftersalesProcessorEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.service.IAftersalesProcessorService;
 import com.logpm.aftersales.service.IAftersalesWorkOrderService;
 import com.logpm.aftersales.service.WebSocketServer;
 import com.logpm.aftersales.vo.AftersalesExchangeVO;
@@ -27,8 +30,11 @@ import com.logpm.aftersales.excel.AftersalesExchangeExcel;
 import com.logpm.aftersales.mapper.AftersalesExchangeMapper;
 import com.logpm.aftersales.service.IAftersalesExchangeService;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -54,6 +60,8 @@ import java.util.Optional;
 public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExchangeMapper, AftersalesExchangeEntity> implements IAftersalesExchangeService {
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final IAftersalesProcessorService  aftersalesProcessorService;
 
 	private static int count=0;
 
@@ -80,7 +88,10 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExc
 	@Override
 	public boolean ownSaveOrUpdate(AftersalesExchangeEntity aftersalesExchange) {
 		BladeUser user = AuthUtil.getUser();
-
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtil.isNull(myCurrentWarehouse)){
+			throw new ServiceException("请选择仓库！！");
+		}
 
 		if(ObjectUtil.isNull(aftersalesExchange.getId())){
 			//修改工单状态
@@ -94,6 +105,20 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl<AftersalesExc
 					aftersalesWorkOrderService.updateById(aftersalesWorkOrder);
 				}
 			}
+			AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda()
+				.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesExchange.getWorkOrderId())
+				.eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())
+				.eq(AftersalesProcessorEntity::getTypesOf,"2")
+				.eq(AftersalesProcessorEntity::getIsDeleted, "0")
+			);
+			if(ObjectUtil.isNull(one)){
+				throw  new ServiceException("处理方信息不存在！！");
+			}
+			if("1".equals(one.getProcessingStatus())){
+				//修改处理状态
+				one.setProcessingStatus("2");
+				aftersalesProcessorService.updateById(one);
+			}
 
 			//添加回复处理交流数据
 			aftersalesExchange.setCreateTime(new Date());

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java

@@ -16,16 +16,19 @@
  */
 package com.logpm.aftersales.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity;
 import com.logpm.aftersales.vo.AftersalesOvertimeFineVO;
 import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel;
 import com.logpm.aftersales.mapper.AftersalesOvertimeFineMapper;
 import com.logpm.aftersales.service.IAftersalesOvertimeFineService;
+import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 异常工单超时记录表 服务实现类
@@ -51,4 +54,20 @@ public class AftersalesOvertimeFineServiceImpl extends BaseServiceImpl<Aftersale
 		return aftersalesOvertimeFineList;
 	}
 
+	/**
+	 * 查询超时记录
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	@Override
+	public IPage<AftersalesOvertimeFineEntity> pageOwn(IPage<Object> page, Map<String, Object> queryWrapper) {
+
+		AftersalesOvertimeFineEntity overtimeFineEntity = JSONObject.parseObject(JSONObject.toJSONString(queryWrapper), AftersalesOvertimeFineEntity.class);
+		IPage<AftersalesOvertimeFineVO> overtimeFineVOIPage = baseMapper.pageListOwn(page,overtimeFineEntity);
+		//todo 处理数据
+
+		return null;
+	}
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesPersonResponsibleServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      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.service.impl;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.mapper.AftersalesPersonResponsibleMapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 服务实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Service
+public class AftersalesPersonResponsibleServiceImpl extends BaseServiceImpl<AftersalesPersonResponsibleMapper, AftersalesPersonResponsibleEntity> implements IAftersalesPersonResponsibleService {
+
+	@Override
+	public IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible) {
+		return page.setRecords(baseMapper.selectAftersalesPersonResponsiblePage(page, aftersalesPersonResponsible));
+	}
+
+
+	@Override
+	public List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper) {
+		List<AftersalesPersonResponsibleExcel> aftersalesPersonResponsibleList = baseMapper.exportAftersalesPersonResponsible(queryWrapper);
+		//aftersalesPersonResponsibleList.forEach(aftersalesPersonResponsible -> {
+		//	aftersalesPersonResponsible.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesPersonResponsible.getType()));
+		//});
+		return aftersalesPersonResponsibleList;
+	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java

@@ -96,18 +96,21 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 	}
 
 	/**
-	 *
+	 * 查询处理结果数据
 	 * @param aftersalesProcessingResults
 	 * @return
 	 */
 	@Override
 	public AftersalesProcessingResultsVO getQueryProcessing(AftersalesProcessingResultsEntity aftersalesProcessingResults) {
-		AftersalesProcessingResultsEntity aftersalesProcessingResultsEntity = baseMapper.selectById(aftersalesProcessingResults.getWorkOrderId());
-		if(ObjectUtil.isNull(aftersalesProcessingResultsEntity)){
+//		AftersalesProcessingResultsEntity aftersalesProcessingResultsEntity = baseMapper.selectById(aftersalesProcessingResults.getWorkOrderId());
+		List<AftersalesProcessingResultsEntity> processingResultsEntityList = baseMapper.selectList(Wrappers.<AftersalesProcessingResultsEntity>query().lambda()
+			.eq(AftersalesProcessingResultsEntity::getWorkOrderId, aftersalesProcessingResults.getWorkOrderId())
+		);
+		if(processingResultsEntityList.isEmpty() || ObjectUtil.isNull( processingResultsEntityList.get(0))){
 			return new AftersalesProcessingResultsVO();
 		}
 		List<AftersalesProcessingMoneyEntity> list = aftersalesProcessingMoneyService.list(Wrappers.<AftersalesProcessingMoneyEntity>query().lambda()
-			.eq(AftersalesProcessingMoneyEntity::getProcessingResultsId, aftersalesProcessingResultsEntity.getId())
+			.eq(AftersalesProcessingMoneyEntity::getProcessingResultsId, processingResultsEntityList.get(0).getId())
 		);
 		List<AftersalesProcessingMoneyVO> processingMoneyEntityList = new ArrayList<>();
 
@@ -119,7 +122,7 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 			processingMoneyEntityList.add(processingMoneyVO);
 		});
 		AftersalesProcessingResultsVO processingResultsVO = new AftersalesProcessingResultsVO();
-		BeanUtil.copyProperties(aftersalesProcessingResultsEntity,processingResultsVO);
+		BeanUtil.copyProperties(processingResultsEntityList.get(0),processingResultsVO);
 		processingResultsVO.setProcessingMoneyEntityList(processingMoneyEntityList);
 		return processingResultsVO;
 	}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java

@@ -17,22 +17,30 @@
 package com.logpm.aftersales.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.logpm.aftersales.entity.AftersalesReturnRecordEntity;
-import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
-import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.aftersales.dto.AftersalesReturnRecordDTO;
+import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.entity.*;
+import com.logpm.aftersales.service.*;
 import com.logpm.aftersales.vo.AftersalesReturnRecordVO;
 import com.logpm.aftersales.excel.AftersalesReturnRecordExcel;
 import com.logpm.aftersales.mapper.AftersalesReturnRecordMapper;
-import com.logpm.aftersales.service.IAftersalesReturnRecordService;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.aftersales.ProcessorConditionsStatusConstant;
+import org.springblade.common.constant.aftersales.ProcessorProcessingStatusStatusConstant;
+import org.springblade.common.constant.aftersales.ProcessorTypesOfStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 异常 工单打回记录 服务实现类
@@ -46,6 +54,9 @@ public class AftersalesReturnRecordServiceImpl extends BaseServiceImpl<Aftersale
 
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+	private final IAftersalesProcessorService aftersalesProcessorService;
+	private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService;
+	private final IAftersalesDecreaseImageService aftersalesDecreaseImageService;
 
 	@Override
 	public IPage<AftersalesReturnRecordVO> selectAftersalesReturnRecordPage(IPage<AftersalesReturnRecordVO> page, AftersalesReturnRecordVO aftersalesReturnRecord) {
@@ -93,20 +104,90 @@ public class AftersalesReturnRecordServiceImpl extends BaseServiceImpl<Aftersale
 	 * @return
 	 */
 	@Override
-	public boolean batchRepulse(List<AftersalesReturnRecordEntity> aftersalesReturnRecord) {
-		if(ObjectUtil.isNull(aftersalesReturnRecord)){
-			aftersalesReturnRecord.forEach( i ->{
+	public boolean batchRepulse(AftersalesReturnRecordDTO aftersalesReturnRecord) {
+		if(ObjectUtil.isNotNull(aftersalesReturnRecord)){
+			List<AftersalesProcessorEntity> processorEntityList = new ArrayList<>();
+			//打回的异常工单
+			aftersalesReturnRecord.getWorkOrderIds().forEach( i ->{
+				//查询处理方
+				List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
+					.eq(AftersalesProcessorEntity::getWorkOrderId, i)
+					.eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue())
+				);
+				if(!list.isEmpty()){
+					//删除
+					List<Long> collect = list.stream().map(AftersalesProcessorEntity::getId).collect(Collectors.toList());
+					aftersalesProcessorService.deleteLogic(collect);
+				}
+				//直接添加
+				aftersalesReturnRecord.getProcessorList().forEach(q ->{
+					AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
+					processor.setBusinessId(q.getId());
+					processor.setBusinessName(q.getName());
+					processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.daichuli.getValue());
+					processor.setConditions(ProcessorConditionsStatusConstant.xinzeng.getValue());
+					processor.setTypesOf(ProcessorTypesOfStatusConstant.chulifang.getValue());
+					processor.setWorkOrderId(i);
+					processorEntityList.add(processor);
+				});
 				//修改异常工单的状态
 				AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderVO();
-				workOrderEntity.setId(i.getWorkOrderId());
+				workOrderEntity.setId(i);
 				workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.daichuli.getValue());
 				aftersalesWorkOrderService.updateById(workOrderEntity);
-				//添加
-				baseMapper.insert(i);
+				AftersalesReturnRecordEntity returnRecordEntity = new AftersalesReturnRecordEntity();
+				BeanUtil.copyProperties(aftersalesReturnRecord,returnRecordEntity);
+				returnRecordEntity.setWorkOrderId(i);
+				baseMapper.insert(returnRecordEntity);
 			});
 			return true;
 		}
 			return false;
 	}
 
+	/**
+	 *  异常工单   已完结数据打回操作
+	 * @param aftersalesReturnRecordDTO
+	 * @return
+	 */
+	@Override
+	public boolean getCompletedReturned(AftersalesReturnRecordDTO aftersalesReturnRecordDTO) {
+		if(ObjectUtil.isNotNull(aftersalesReturnRecordDTO)){
+			for (Long workOrderId : aftersalesReturnRecordDTO.getWorkOrderIds()) {
+				//查询是不是已完结的工单
+				AftersalesWorkOrderEntity byId = aftersalesWorkOrderService.getById(workOrderId);
+				if(!byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.yiwanjei.getValue())){
+					throw new ServiceException("包含不属于已完结的异常工单！！");
+				}
+				//添加异常打回记录
+				AftersalesReturnRecordEntity returnRecordEntity = new AftersalesReturnRecordEntity();
+				BeanUtil.copyProperties(aftersalesReturnRecordDTO,returnRecordEntity);
+				baseMapper.insert(returnRecordEntity);
+				//查询包件信息
+				List<AftersalesAbnormalPackageEntity> list1 = aftersalesAbnormalPackageService.list(Wrappers.<AftersalesAbnormalPackageEntity>query().lambda()
+					.eq(AftersalesAbnormalPackageEntity::getWorkOrderId, workOrderId)
+				);
+				//查询处理方和责任方
+				List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
+					.eq(AftersalesProcessorEntity::getWorkOrderId, workOrderId)
+					.apply("conditions  in (1,2)")
+				);
+				//查询图片信息
+				List<AftersalesDecreaseImageEntity> list2 = aftersalesDecreaseImageService.list(Wrappers.<AftersalesDecreaseImageEntity>query().lambda()
+					.eq(AftersalesDecreaseImageEntity::getWorkOrderId, workOrderId)
+				);
+				//添加异常工单
+				AftersalesWorkOrderDTO aftersalesWorkOrderDTO = new AftersalesWorkOrderDTO();
+				BeanUtil.copyProperties(byId,aftersalesWorkOrderDTO);
+				aftersalesWorkOrderDTO.setDecreaseImageEntityList(list2);
+				aftersalesWorkOrderDTO.setPackageEntityList(list1);
+				aftersalesWorkOrderDTO.setProcessorEntityList(list);
+				aftersalesWorkOrderDTO.setRelatedWorkOrdersId(workOrderId);
+				aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrderDTO);
+			}
+			return true;
+		}
+		return false;
+	}
+
 }