diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index b9b7067c4..193aaacfc 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -111,4 +111,11 @@ public class DictBizConstant { //---------------2023-11-07--------------------- public static final String BILLLADING_CHARGE_TYPE = "billlading_charge_type"; //提货单计费方式 + //---------------2023-11-18 + public static final String OPEN_ORDER_PAY_TYPE = "open_order_pay_type"; + public static final String OPEN_ORDER_PAY_WAY = "open_order_pay_way"; + public static final String OPEN_ORDER_DELIVERY_WAY = "open_order_delivery_way"; + public static final String OPEN_ORDER_URGENCY = "open_order_urgency"; + public static final String OPEN_ORDER_RECEIPT = "open_order_receipt"; + public static final String OPEN_ORDER_TRANSPORT_TYPE = "open_order_transport_type"; } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index f85dde928..95746ccec 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -36,6 +36,11 @@ public interface ModuleNameConstant { */ String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+DEVAUTH; + /** + * 售后服务名称 + */ + String APPLICATION_AFTERSALES_NAME = "logpm-aftersales"+DEVAUTH; + /** * 仓库服务名称 diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java new file mode 100644 index 000000000..997667a7e --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常处理包件记录 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_abnormal_package") +@ApiModel(value = "AftersalesAbnormalPackage对象", description = "异常处理包件记录") +@EqualsAndHashCode(callSuper = true) +public class AftersalesAbnormalPackageEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常ID + */ + @ApiModelProperty(value = "异常ID") + private String workOrderId; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private String number; + /** + * 包件码 + */ + @ApiModelProperty(value = "包件码") + private String packageCode; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + /** + * 包件图片路径 + */ + @ApiModelProperty(value = "包件图片路径") + private String packageImage; + /** + * 类型;窜货，少货 + */ + @ApiModelProperty(value = "类型;窜货，少货") + private String typesOf; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesArbitrationOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesArbitrationOrderEntity.java new file mode 100644 index 000000000..a92ca5fc6 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesArbitrationOrderEntity.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常工单仲裁申请单 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_arbitration_order") +@ApiModel(value = "AftersalesArbitrationOrder对象", description = "异常工单仲裁申请单") +@EqualsAndHashCode(callSuper = true) +public class AftersalesArbitrationOrderEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常工单Id + */ + @ApiModelProperty(value = "异常工单Id") + private String workOrderId; + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String typesOf; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCargoRecordsEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCargoRecordsEntity.java new file mode 100644 index 000000000..4f1bdb03f --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCargoRecordsEntity.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 货物催 — 查记录表 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_cargo_records") +@ApiModel(value = "AftersalesCargoRecords对象", description = "货物催 — 查记录表") +@EqualsAndHashCode(callSuper = true) +public class AftersalesCargoRecordsEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 订单号 + */ + @ApiModelProperty(value = "订单号") + private String orderNumber; + /** + * 包件号 + */ + @ApiModelProperty(value = "包件号") + private String packageCode; + /** + * 客户交流记录 + */ + @ApiModelProperty(value = "客户交流记录") + private String customerCommunication; + /** + * 咨询人员 + */ + @ApiModelProperty(value = "咨询人员") + private String consultant; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java new file mode 100644 index 000000000..7af98d3a5 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常工单完结处理结果受款方 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_completion_recipient") +@ApiModel(value = "AftersalesCompletionRecipient对象", description = "异常工单完结处理结果受款方") +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecipientEntity extends TenantEntity { + + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java new file mode 100644 index 000000000..962a9a318 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常工单完结处理结果赔款方 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_completion_record") +@ApiModel(value = "AftersalesCompletionRecord对象", description = "异常工单完结处理结果赔款方") +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecordEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 赔款方 + */ + @ApiModelProperty(value = "赔款方") + private String indemnitor; + /** + * 原因 + */ + @ApiModelProperty(value = "原因") + private String reason; + /** + * 金额 + */ + @ApiModelProperty(value = "金额") + private BigDecimal money; + /** + * 仲裁原因 + */ + @ApiModelProperty(value = "仲裁原因") + private String reasonArbitration; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java new file mode 100644 index 000000000..621bd23b9 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常运损图片（最少两张） 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_decrease_image") +@ApiModel(value = "AftersalesDecreaseImage对象", description = "异常运损图片（最少两张）") +@EqualsAndHashCode(callSuper = true) +public class AftersalesDecreaseImageEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常工单Id + */ + @ApiModelProperty(value = "异常工单Id") + private String workOrderId; + /** + * 图片类型 + */ + @ApiModelProperty(value = "图片类型") + private String imageType; + /** + * 图片名称 + */ + @ApiModelProperty(value = "图片名称") + private String imageName; + /** + * 图片路径 + */ + @ApiModelProperty(value = "图片路径") + private String imagePath; + /** + * 仓库id + */ + @ApiModelProperty(value = "仓库id") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesExchangeEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesExchangeEntity.java new file mode 100644 index 000000000..1bc9169c1 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesExchangeEntity.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 工单交流处理数据记录 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_exchange") +@ApiModel(value = "AftersalesExchange对象", description = "工单交流处理数据记录") +@EqualsAndHashCode(callSuper = true) +public class AftersalesExchangeEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 营业部名称 + */ + @ApiModelProperty(value = "营业部名称") + private String businessName; + /** + * 营业部ID + */ + @ApiModelProperty(value = "营业部ID") + private String businessId; + /** + * 交流内容 + */ + @ApiModelProperty(value = "交流内容") + private String content; + /** + * 附件内容 + */ + @ApiModelProperty(value = "附件内容") + private String annex; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java new file mode 100644 index 000000000..41be69198 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesOvertimeFineEntity.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常工单超时记录表 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_overtime_fine") +@ApiModel(value = "AftersalesOvertimeFine对象", description = "异常工单超时记录表") +@EqualsAndHashCode(callSuper = true) +public class AftersalesOvertimeFineEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 金额 + */ + @ApiModelProperty(value = "金额") + private BigDecimal money; + /** + * 超时时间 + */ + @ApiModelProperty(value = "超时时间") + private Date timeout; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java new file mode 100644 index 000000000..a080b0159 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingResultsEntity.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常工单处理结果 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_processing_results") +@ApiModel(value = "AftersalesProcessingResults对象", description = "异常工单处理结果") +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessingResultsEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 处理结果类型 + */ + @ApiModelProperty(value = "处理结果类型") + private String resultType; + /** + * 金额 + */ + @ApiModelProperty(value = "金额") + private BigDecimal money; + /** + * 赔付方式 + */ + @ApiModelProperty(value = "赔付方式") + private String compensationMethod; + /** + * 赔付时间 + */ + @ApiModelProperty(value = "赔付时间") + private Date compensationTime; + /** + * 赔付凭证 + */ + @ApiModelProperty(value = "赔付凭证") + private String compensationVoucher; + /** + * 处理结果说明 + */ + @ApiModelProperty(value = "处理结果说明") + private String resultDescription; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java new file mode 100644 index 000000000..219e2cc7e --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常责任方和处理方 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_processor") +@ApiModel(value = "AftersalesProcessor对象", description = "异常责任方和处理方") +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessorEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String businessName; + /** + * ID + */ + @ApiModelProperty(value = "ID") + private String businessId; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private String conditions; + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String typesOf; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesReturnRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesReturnRecordEntity.java new file mode 100644 index 000000000..4f1882bf3 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesReturnRecordEntity.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 异常 工单打回记录 实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_return_record") +@ApiModel(value = "AftersalesReturnRecord对象", description = "异常 工单打回记录") +@EqualsAndHashCode(callSuper = true) +public class AftersalesReturnRecordEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ApiModelProperty(value = "异常工单ID") + private String workOrderId; + /** + * 待处理营业部ID + */ + @ApiModelProperty(value = "待处理营业部ID") + private String businessId; + /** + * 待处理营业部名称 + */ + @ApiModelProperty(value = "待处理营业部名称") + private String businessName; + /** + * 打回原因 + */ + @ApiModelProperty(value = "打回原因") + private String reasonReturn; + /** + * 仓库Id + */ + @ApiModelProperty(value = "仓库Id") + private String warehouseId; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java new file mode 100644 index 000000000..f246e4377 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 客服异常工单 实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +@TableName("logpm_aftersales_work_order") +@ApiModel(value = "AftersalesWorkOrder对象", description = "客服异常工单") +@EqualsAndHashCode(callSuper = true) +public class AftersalesWorkOrderEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 工单异常类型;货损，少货，窜货，加急，其他 + */ + @ApiModelProperty(value = "工单异常类型;货损，少货，窜货，加急，其他") + private String workOrderType; + /** + * 发起工单标识;PDA，PC + */ + @ApiModelProperty(value = "发起工单标识;PDA，PC") + private String initiationIdentification; + /** + * 发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC） + */ + @ApiModelProperty(value = "发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）") + private String discoveryNode; + /** + * 异常工单号 + */ + @ApiModelProperty(value = "异常工单号") + private String workOrderNumber; + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNumber; + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; + /** + * 车次号 (干线卸车环节) + */ + @ApiModelProperty(value = "车次号 (干线卸车环节)") + private String trainNumber; + /** + * 一级品类 + */ + @ApiModelProperty(value = "一级品类") + private String first; + /** + * 二级品类 + */ + @ApiModelProperty(value = "二级品类") + private String secondary; + /** + * 车辆路线;车次号、通过车次号自动带出车辆线路 + */ + @ApiModelProperty(value = "车辆路线;车次号、通过车次号自动带出车辆线路") + private String vehicleRoute; + /** + * 送货时间 + */ + @ApiModelProperty(value = "送货时间") + private Date deliverGoodsTime; + /** + * 发现时间 （库内作业环节,配送装车环节） + */ + @ApiModelProperty(value = "发现时间 （库内作业环节,配送装车环节）") + private Date discoveryTime; + /** + * 入库时间（库内作业环节） + */ + @ApiModelProperty(value = "入库时间（库内作业环节）") + private Date warehousingTime; + /** + * 运单商场 + */ + @ApiModelProperty(value = "运单商场") + private String waybillMall; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + /** + * 配送时间(配送装车环节) + */ + @ApiModelProperty(value = "配送时间(配送装车环节)") + private Date deliveryTime; + /** + * 配送司机(配送装车环节) + */ + @ApiModelProperty(value = "配送司机(配送装车环节)") + private String deliveryDriver; + /** + * 工单状态 + */ + @ApiModelProperty(value = "工单状态") + private String workOrderStatus; + /** + * 归属客服ID + */ + @ApiModelProperty(value = "归属客服ID") + private String customerServiceId; + /** + * 归属客服名称 + */ + @ApiModelProperty(value = "归属客服名称") + private String customerServiceName; + /** + * 商场ID + */ + @ApiModelProperty(value = "商场ID") + private String waybillMallId; + /** + * 完结时间 + */ + @ApiModelProperty(value = "完结时间") + private Date overTime; + /** + * 异常问题描述 + */ + @ApiModelProperty(value = "异常问题描述") + private String problemDescription; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private String warehouseId; + /** + * 责任人 （库内作业环节） + */ + @ApiModelProperty(value = "责任人 （库内作业环节）") + private String personResponsible; + /** + * 钉钉流程号 + */ + @ApiModelProperty(value = "钉钉流程号") + private String processNumber; + /** + * 审核人 + */ + @ApiModelProperty(value = "审核人") + private String reviewedBy; + /** + * 审核时间 + */ + @ApiModelProperty(value = "审核时间") + private Date auditTime; + /** + * 财务入账时间 + */ + @ApiModelProperty(value = "财务入账时间") + private Date entryTime; + /** + * 操作人 + */ + @ApiModelProperty(value = "操作人") + private String operator; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalPackageClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalPackageClient.java new file mode 100644 index 000000000..833e6a595 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalPackageClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常处理包件记录 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesAbnormalPackageClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/topPackage"; + + /** + * 获取异常处理包件记录列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesArbitrationOrderClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesArbitrationOrderClient.java new file mode 100644 index 000000000..dbcde6c96 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesArbitrationOrderClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常工单仲裁申请单 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesArbitrationOrderClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/topOrder"; + + /** + * 获取异常工单仲裁申请单列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCargoRecordsClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCargoRecordsClient.java new file mode 100644 index 000000000..490fc07d7 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCargoRecordsClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 货物催 — 查记录表 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesCargoRecordsClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/topRecords"; + + /** + * 获取货物催 — 查记录表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecipientClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecipientClient.java new file mode 100644 index 000000000..5e9b30d9f --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecipientClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常工单完结处理结果受款方 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesCompletionRecipientClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/topRecipient"; + + /** + * 获取异常工单完结处理结果受款方列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecordClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecordClient.java new file mode 100644 index 000000000..8539769da --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesCompletionRecordClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常工单完结处理结果赔款方 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesCompletionRecordClient { + + String API_PREFIX = "/completionRecord/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常工单完结处理结果赔款方列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesDecreaseImageClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesDecreaseImageClient.java new file mode 100644 index 000000000..c44938da6 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesDecreaseImageClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常运损图片（最少两张） Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesDecreaseImageClient { + + String API_PREFIX = "/image/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常运损图片（最少两张）列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesExchangeClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesExchangeClient.java new file mode 100644 index 000000000..ec4daaa1f --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesExchangeClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesExchangeEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 工单交流处理数据记录 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesExchangeClient { + + String API_PREFIX = "/exchange/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取工单交流处理数据记录列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesOvertimeFineClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesOvertimeFineClient.java new file mode 100644 index 000000000..95d299bc7 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesOvertimeFineClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常工单超时记录表 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesOvertimeFineClient { + + String API_PREFIX = "/overtime/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常工单超时记录表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessingResultsClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessingResultsClient.java new file mode 100644 index 000000000..9cd9e3826 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessingResultsClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常工单处理结果 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesProcessingResultsClient { + + String API_PREFIX = "/processing/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常工单处理结果列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessorClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessorClient.java new file mode 100644 index 000000000..264ce91dd --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesProcessorClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesProcessorEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常责任方和处理方 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesProcessorClient { + + String API_PREFIX = "/processor/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常责任方和处理方列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesReturnRecordClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesReturnRecordClient.java new file mode 100644 index 000000000..3c9c05c44 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesReturnRecordClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesReturnRecordEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 异常 工单打回记录 Feign接口类 + * + * @author cyz + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesReturnRecordClient { + + String API_PREFIX = "/return/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取异常 工单打回记录列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesWorkOrderClient.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesWorkOrderClient.java new file mode 100644 index 000000000..bb4654ed8 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesWorkOrderClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 客服异常工单 Feign接口类 + * + * @author BladeX + * @since 2023-11-17 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME +) +public interface IAftersalesWorkOrderClient { + + String API_PREFIX = "/work/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取客服异常工单列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java new file mode 100644 index 000000000..c53b6dacf --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常处理包件记录 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesArbitrationOrderVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesArbitrationOrderVO.java new file mode 100644 index 000000000..d6e867304 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesArbitrationOrderVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单仲裁申请单 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesArbitrationOrderVO extends AftersalesArbitrationOrderEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCargoRecordsVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCargoRecordsVO.java new file mode 100644 index 000000000..13a2bb3d5 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCargoRecordsVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 货物催 — 查记录表 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCargoRecordsVO extends AftersalesCargoRecordsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecipientVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecipientVO.java new file mode 100644 index 000000000..462fa2654 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecipientVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单完结处理结果受款方 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecipientVO extends AftersalesCompletionRecipientEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecordVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecordVO.java new file mode 100644 index 000000000..55d17a18e --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesCompletionRecordVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单完结处理结果赔款方 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecordVO extends AftersalesCompletionRecordEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDecreaseImageVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDecreaseImageVO.java new file mode 100644 index 000000000..c95a2ad77 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDecreaseImageVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常运损图片（最少两张） 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesDecreaseImageVO extends AftersalesDecreaseImageEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesExchangeVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesExchangeVO.java new file mode 100644 index 000000000..4eec7915d --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesExchangeVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesExchangeEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单交流处理数据记录 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesExchangeVO extends AftersalesExchangeEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesOvertimeFineVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesOvertimeFineVO.java new file mode 100644 index 000000000..2d9d561ef --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesOvertimeFineVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单超时记录表 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesOvertimeFineVO extends AftersalesOvertimeFineEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessingResultsVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessingResultsVO.java new file mode 100644 index 000000000..c0e86be6b --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessingResultsVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单处理结果 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessingResultsVO extends AftersalesProcessingResultsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java new file mode 100644 index 000000000..e90d70ab0 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesProcessorVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesProcessorEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常责任方和处理方 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessorVO extends AftersalesProcessorEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesReturnRecordVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesReturnRecordVO.java new file mode 100644 index 000000000..bc37b7be5 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesReturnRecordVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesReturnRecordEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常 工单打回记录 视图实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesReturnRecordVO extends AftersalesReturnRecordEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java new file mode 100644 index 000000000..d51c86baa --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.vo; + +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 客服异常工单 视图实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java index 5f5a4261e..e0fa6b723 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java @@ -21,6 +21,8 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -47,4 +49,9 @@ public interface IBasicdataCategoryClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + @GetMapping(API_PREFIX+"/findByName") + BasicdataCategoryEntity findByName(@RequestParam String goodsName); + + @PostMapping(API_PREFIX+"/addReturnId") + Long addReturnId(@RequestBody BasicdataCategoryEntity basicdataCategoryEntity); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java index 5aef1eb0f..10ebe490e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java @@ -22,6 +22,8 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -37,7 +39,7 @@ import java.util.List; ) public interface IBasicdataClientClient { - String API_PREFIX = "/client"; + String API_PREFIX = "/client12122"; String TOP = API_PREFIX + "/top2"; String GETCUSTOMER = API_PREFIX + "/customer"; String BASICDATACLIENTUSERENTITYLISTBYUSERID = API_PREFIX + "/BasicdataClientUserEntityListByUserId"; @@ -70,4 +72,7 @@ public interface IBasicdataClientClient { @GetMapping(API_PREFIX+"/findEntityById") BasicdataClientEntity findEntityById(@RequestParam Long id); + + @PostMapping(API_PREFIX+"/addReturnId") + Long addReturnId(@RequestBody BasicdataClientEntity basicdataClientEntity); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java index 824fee655..8eb7cb4e7 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java @@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 门店服务仓库表 Feign接口类 * @@ -47,4 +49,6 @@ public interface IBasicdataStorageServicesClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + @GetMapping(API_PREFIX+"/findBySendWarehouseIdAndClientId") + List findBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java index 39ca56a4c..479e29220 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java @@ -34,8 +34,9 @@ import org.springframework.web.bind.annotation.RequestParam; ) public interface IBasicdataTripartiteMallClient { - String API_PREFIX = "/client"; + String API_PREFIX = "/tripartite/client"; String TOP = API_PREFIX + "/1top"; + String GETNAMEBRAND = API_PREFIX + "/getNameBrand"; /** * 获取客户三方商城列表 @@ -47,4 +48,8 @@ public interface IBasicdataTripartiteMallClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + @GetMapping(GETNAMEBRAND) + Long getClientIdByNameAndBrand(@RequestParam String name, @RequestParam String brand); + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index ec0864d28..0958bce57 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -112,4 +112,11 @@ public interface IDistributionStockArticleClient { */ @PostMapping(GETSTOCKARTICLEINFO) List getStockArticleInfo(@RequestBody DistributionStockArticleEntity distributionStockArticleEntity); + + @GetMapping(API_PREFIX + "/updateCustomerInfoByOrderCode") + void updateCustomerInfoByOrderCode(@RequestParam String customerName, @RequestParam String customerPhone, @RequestParam String customerRoad, @RequestParam String orderCode); + + @GetMapping(API_PREFIX + "/freezeByOrderCode") + void freezeByOrderCode(@RequestParam String orderCode,@RequestParam String freezeStatus); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java index 94cbba3fd..fe7dc65fc 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java @@ -11,6 +11,7 @@ import lombok.Data; @Data public class DistributionBillOrderPackVO { private String orderPackageCode; + private String orderPackageStatus; private String warehouse; private String firsts; private String second; diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java index 93de3da3a..72cc8a771 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java @@ -38,12 +38,13 @@ public class SignPushDataDTO { /** * 出库人ID */ - private int out_to_id; + private Long out_to_id; /** * 出库人 */ private String out_to_name; + /** * 出库时间 */ @@ -114,6 +115,11 @@ public class SignPushDataDTO { */ private String administrators_name; + /** + * 操作人 + */ + private String kind; + /** * 签收客户集合 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java index c5cc7272e..e772e9069 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java @@ -104,7 +104,7 @@ public class SignPushDataUnitDTO { private long administrators_id; /** - * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收,5=pc签收 + * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收, 5=pc签收 */ private int broke_state; diff --git a/blade-service-api/logpm-trunkline-api/pom.xml b/blade-service-api/logpm-trunkline-api/pom.xml index 98b8ad40a..e92377d24 100644 --- a/blade-service-api/logpm-trunkline-api/pom.xml +++ b/blade-service-api/logpm-trunkline-api/pom.xml @@ -3,6 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + org.springblade + blade-dict-api + 3.2.0.RELEASE + compile + + org.springblade diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java new file mode 100644 index 000000000..c9a9dac6f --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java @@ -0,0 +1,27 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class AdvanceDTO implements Serializable { + + private Integer pageNum; + private Integer pageSize; + + private Long warehouseId; + + private Long advanceId; + + private List advanceIds = new ArrayList<>(); + + private String customerName; + private String customerPhone; + private String customerRoad; + + private String freezeStatus; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDetailDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDetailDTO.java new file mode 100644 index 000000000..60dbde8a7 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDetailDTO.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.dto; + +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import lombok.Data; + +@Data +public class AdvanceDetailDTO extends TrunklineAdvanceDetailEntity { + + private Integer pageNum; + private Integer pageSize; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/DetailProductDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/DetailProductDTO.java new file mode 100644 index 000000000..096fca087 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/DetailProductDTO.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DetailProductDTO implements Serializable { + + private String orderPackageCode; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java index 5ddc78400..d1297df07 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java @@ -15,4 +15,8 @@ public class InComingDTO implements Serializable { private Integer incomingType;//入库类型 + private String trayCode;//托盘码 + + private String trayType;//打托方式 + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java new file mode 100644 index 000000000..82d048b37 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -0,0 +1,73 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +@Data +public class OpenOrderDTO implements Serializable { + + private String brand;//品牌 + private String customerTrain;//客户车次号 + private String waybillNo;//运单号 + private Long departureWarehouseId;//发站仓id + private String departureWarehouseName;//发站仓名称 + private String destination;//到站 + private String destinationWarehouseName;//目的仓名称 + private Long destinationWarehouseId;//目的仓Id + private String goodsCode;//货号 + private List advanceIds;//暂存单ids + private String orderNo;//订单号 + + private Long shipperId;//发货单位id + private String shipper;//发货单位 + private String shipperName;//发货人 + private String shipperMobile;//发货人电话 + private String shipperAddress;//发货地址 + + private Long consigneeId;//收货单位id + private String consignee;//收货单位 + private String consigneeName;//收货人 + private String consigneeMobile;//收货人电话 + private String consigneeAddress;//收货地址 + private String goodsName;//货物名称 + + private List waybillDetailList = new ArrayList<>(); + + private Integer totalCount; + private BigDecimal totalWeghit; + private BigDecimal totalVolume; + private BigDecimal totalFreight = BigDecimal.ZERO;//运费 + private BigDecimal deliveryFee = BigDecimal.ZERO;//送货费 + private BigDecimal pickupFee = BigDecimal.ZERO;//提货费 + private BigDecimal warehouseManagementFee = BigDecimal.ZERO;//仓库管理费 + private BigDecimal storageFee = BigDecimal.ZERO;//仓储费 + private BigDecimal handlingFee = BigDecimal.ZERO;//装卸费 + private BigDecimal otherFee = BigDecimal.ZERO;//其他费 + private BigDecimal insuranceFee = BigDecimal.ZERO;//保价费 + private BigDecimal claimingValue;//申明价值 + + private String payType;//支付方式 + private String payWay;//付款方式 + private BigDecimal xPay = BigDecimal.ZERO;//现付 + private BigDecimal dPay = BigDecimal.ZERO;//到付 + private BigDecimal yPay = BigDecimal.ZERO;//月结 + private BigDecimal hPay = BigDecimal.ZERO;//回付 + + private BigDecimal thirdOperationFee = BigDecimal.ZERO;//三方操作费 + + private String deliveryWay;//送货方式 + private String urgency;//紧急度 + private String receipt;//回单方式（多选） + private String transportType;//运输方式 + + private String remark;//备注 + + private Integer waybillType; + + private Long warehouseId;//仓库id + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillDetailDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillDetailDTO.java new file mode 100644 index 000000000..95d461cfc --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillDetailDTO.java @@ -0,0 +1,21 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class WaybillDetailDTO implements Serializable { + + private Integer chargeType;//计价方式 1件 2方 3公斤 + + private Long goodsId;//品类id + private String goodsName;//货物名称 + private Integer num;//件数 + private BigDecimal weight;//重量 + private BigDecimal volume;//体积 + private BigDecimal price ;//单价 + private BigDecimal subtotalFreight;//小计运费 + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillOrderDTO.java new file mode 100644 index 000000000..8fd8f94ab --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/WaybillOrderDTO.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WaybillOrderDTO implements Serializable { + + private Long waybillId; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java index 96ce48157..ec8436f78 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigDecimal; + @Data @TableName("logpm_trunkline_advance_detail") @ApiModel(value = "TrunklineAdvanceDetail对象", description = "暂存单包件数据表") @@ -98,6 +100,15 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity { /** 物料名称 */ @ApiModelProperty(name = "物料名称",notes = "") private String materialName ; + /** 重量 */ + @ApiModelProperty(name = "重量",notes = "") + private BigDecimal weight ; + /** 体积 */ + @ApiModelProperty(name = "体积",notes = "") + private BigDecimal volume ; + /** 计价方式 1件 2方 3公斤 */ + @ApiModelProperty(name = "计价方式 1件 2方 3公斤",notes = "") + private Integer chargeType ; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java index 356ecc949..2cb520787 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.util.Date; + @Data @TableName("logpm_trunkline_advance") @ApiModel(value = "TrunklineAdvance对象", description = "暂存单数据表") @@ -112,5 +114,11 @@ public class TrunklineAdvanceEntity extends TenantEntity { /** 冻结状态 0未冻结 1已冻结 */ @ApiModelProperty(name = "冻结状态 0未冻结 1已冻结",notes = "") private String freezeStatus ; + /** 遗留状态 0否 1是 */ + @ApiModelProperty(name = "遗留状态 0否 1是",notes = "") + private String legacyStatus ; + /** 交期 */ + @ApiModelProperty(name = "交期",notes = "") + private Date deliveryDate ; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillOrderEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillOrderEntity.java index 766bf0f7d..eca3c8585 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillOrderEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillOrderEntity.java @@ -11,7 +11,7 @@ import org.springblade.core.tenant.mp.TenantEntity; @TableName("logpm_trunkline_waybill_order") @ApiModel(value = "TrunklineWaybillOrder对象", description = "运单订单关联表") @EqualsAndHashCode(callSuper = true) - public class TrunklineWaybillOrderEntity extends TenantEntity { +public class TrunklineWaybillOrderEntity extends TenantEntity { /** 预留1 */ @ApiModelProperty(name = "预留1",notes = "") diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java new file mode 100644 index 000000000..0576e3f40 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java @@ -0,0 +1,57 @@ +package com.logpm.trunkline.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_trunkline_waybill_track") +@ApiModel(value = "TrunklineWaybillTrack对象", description = "运单跟踪记录表") +@EqualsAndHashCode(callSuper = true) +public class TrunklineWaybillTrackEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + /** 仓库id */ + @ApiModelProperty(name = "仓库id",notes = "") + private Long warehouseId ; + /** 仓库名称 */ + @ApiModelProperty(name = "仓库名称",notes = "") + private String warehouseName ; + /** 运单id */ + @ApiModelProperty(name = "运单id",notes = "") + private Long waybillId ; + /** 运单号 */ + @ApiModelProperty(name = "运单号",notes = "") + private String waybillNo ; + /** 跟踪类型 10创建运单 */ + @ApiModelProperty(name = "跟踪类型 10创建运单",notes = "") + private String trackType ; + /** 描述 */ + @ApiModelProperty(name = "描述",notes = "") + private String describe ; + /** 操作备注 */ + @ApiModelProperty(name = "操作备注",notes = "") + private String operationRemark ; + /** 操作人名称 */ + @ApiModelProperty(name = "操作人名称",notes = "") + private String createUserName ; + + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailGoodsVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailGoodsVO.java new file mode 100644 index 000000000..c63b8c104 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailGoodsVO.java @@ -0,0 +1,20 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class AdvanceDetailGoodsVO implements Serializable { + + private Integer chargeType;//计价方式 1件 2方 3公斤 + + private Long goodsId;//品类id + private String goodsName;//货物名称 + private Integer num;//件数 + private BigDecimal weight;//重量 + private BigDecimal volume;//体积 + private BigDecimal price = BigDecimal.ZERO;//单价 + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailStockNumVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailStockNumVO.java new file mode 100644 index 000000000..39e910ad8 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailStockNumVO.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class AdvanceDetailStockNumVO implements Serializable { + + private Integer stockNum = 0; + private BigDecimal stockVolume = BigDecimal.ZERO; + private BigDecimal stockWeight = BigDecimal.ZERO; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingPackageVO.java new file mode 100644 index 000000000..fe5b204dd --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingPackageVO.java @@ -0,0 +1,14 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class BillladingPackageVO implements Serializable { + + private Long billladingId; + private Integer num; + + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java new file mode 100644 index 000000000..233c1cb56 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java @@ -0,0 +1,42 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; +import org.springblade.system.entity.DictBiz; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class OpenOrderVO implements Serializable { + + private String brand; + private String trainNumber; + private String orderCode; + + private List advanceIds = new ArrayList<>(); + + private String departureWarehouseName;//发展仓名称 + private Long departureWarehouseId;//发展仓Id + + private String destinationWarehouseName;//目的仓名称 + private Long destinationWarehouseId;//目的仓Id + + private Long consigneeClientId;//收货单位clientId + private String consignee;//收货单位 + private String consigneeName;//收货人 + private String consigneeMobile;//收货人电话 + private String consigneeAddress;//收货单位地址 + + private List goodsList = new ArrayList<>(); + + private List payTypeList;//支付方式 + private List payWayList;//付款方式 + private List deliveryWayList;//送货方式 + private List urgencyList;//紧急度 + private List receiptList;//回单方式 + private List transportTypeList;//运输方式 + + private String openOrderUserName;//开单人 + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java index bd47ed0ac..932f3d934 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java @@ -5,4 +5,10 @@ import lombok.Data; @Data public class TrunklineAdvanceDetailVO extends TrunklineAdvanceDetailEntity { + + private String trainNumber; + + private String trayCode; + private String trayName; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java index 76afa1c32..1d37d8a2c 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java @@ -5,4 +5,7 @@ import lombok.Data; @Data public class TrunklineAdvanceVO extends TrunklineAdvanceEntity { + + private String htMallName; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java new file mode 100644 index 000000000..e706d3e65 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java @@ -0,0 +1,9 @@ +package com.logpm.trunkline.vo; + +import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import lombok.Data; + +@Data +public class TrunklineWaybillTrackVO extends TrunklineWaybillTrackEntity { + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java index 798fcaac4..cbadd589f 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java @@ -92,7 +92,7 @@ public class QuestDetailEntity extends TenantEntity { * 包条码;对应定制品 */ @ApiModelProperty(value = "包条码;对应定制品") - private String ordePackageCode; + private String orderPackageCode; /** * 零担 运单号 */ @@ -164,7 +164,7 @@ public class QuestDetailEntity extends TenantEntity { private String allocationId; /** - * 是否是新增数据 + * 是否是新增数据 0 正常 1 新增 */ @ApiModelProperty(value = "是否是新增数据") private Integer isNew; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java index 5e5e9f9b1..94479c10c 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; +import java.math.BigDecimal; + @Data @ApiModel(value = "运单明细",description = "") @TableName("logpm_warehouse_waybill_detail") @@ -23,8 +25,32 @@ public class WarehouseWayBillDetail extends BaseEntity { @ApiModelProperty(name = "品名",notes = "") private String productName; + /** 品名id */ + @ApiModelProperty(name = "品名id",notes = "") + private Long productId; + /** 数量 */ @ApiModelProperty(name = "数量",notes = "") private Integer num; + /** 体积 */ + @ApiModelProperty(name = "体积",notes = "") + private BigDecimal volume; + + /** 重量 */ + @ApiModelProperty(name = "重量",notes = "") + private BigDecimal weight; + + /** 单价 */ + @ApiModelProperty(name = "单价",notes = "") + private BigDecimal price; + + /** 小计运费 */ + @ApiModelProperty(name = "小计运费",notes = "") + private BigDecimal subtotalFreight; + + /** 计价方式 1件 2方 3公斤 */ + @ApiModelProperty(name = "计价方式 1件 2方 3公斤",notes = "") + private Integer chargeType; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 464d60f37..f8aa4a3db 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -158,12 +158,6 @@ public class WarehouseWaybillEntity extends TenantEntity { @TableField(exist = false) private String deliveryMethodStr; - /** - * 紧急度 - */ - @ApiModelProperty(value = "紧急度") - private Integer urgency; - @TableField(exist = false) private String urgencyStr; @@ -300,4 +294,114 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "金额是否收齐") private Integer receivedStatus;//收款状态 0未签收 1已签收 + //--------------2023-11-18 干线新增字段 + /** + * 运费 + */ + @ApiModelProperty(value = "运费") + private BigDecimal totalFreight;//运费 + /** + * 送货费 + */ + @ApiModelProperty(value = "送货费") + private BigDecimal deliveryFee;//送货费 + /** + * 提货费 + */ + @ApiModelProperty(value = "提货费") + private BigDecimal pickupFee;//提货费 + /** + * 仓库管理费 + */ + @ApiModelProperty(value = "仓库管理费") + private BigDecimal warehouseManagementFee;//仓库管理费 + /** + * 仓储费 + */ + @ApiModelProperty(value = "仓储费") + private BigDecimal storageFee;//仓储费 + /** + * 装卸费 + */ + @ApiModelProperty(value = "装卸费") + private BigDecimal handlingFee;//装卸费 + /** + * 其他费 + */ + @ApiModelProperty(value = "其他费") + private BigDecimal otherFee;//其他费 + /** + * 保价费 + */ + @ApiModelProperty(value = "保价费") + private BigDecimal insuranceFee;//保价费 + /** + * 申明价值 + */ + @ApiModelProperty(value = "申明价值") + private BigDecimal claimingValue;//申明价值 + + /** + * 支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本 + */ + @ApiModelProperty(value = "支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本") + private String payType;//支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本 + /** + * 付款方式 1现付 2到付 3月结 4回付 5内部结算 6多笔付 + */ + @ApiModelProperty(value = "付款方式 1现付 2到付 3月结 4回付 5内部结算 6多笔付") + private String payWay;//付款方式 + /** + * 现付金额 + */ + @ApiModelProperty(value = "现付金额") + private BigDecimal xPay;//现付金额 + /** + * 到付 + */ + @ApiModelProperty(value = "到付") + private BigDecimal dPay;//到付 + /** + * 月结 + */ + @ApiModelProperty(value = "月结") + private BigDecimal yPay;//月结 + /** + * 回付 + */ + @ApiModelProperty(value = "回付") + private BigDecimal hPay;//回付 + /** + * 三方操作费 + */ + @ApiModelProperty(value = "三方操作费") + private BigDecimal thirdOperationFee;//三方操作费 + + /** + * 送货方式 1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装 + */ + @ApiModelProperty(value = "送货方式 1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装") + private String deliveryWay;//送货方式 1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装 + /** + * 紧急度 1正常 2急 3加急 4特急 + */ + @ApiModelProperty(value = "紧急度 1正常 2急 3加急 4特急") + private String urgency;//紧急度 1正常 2急 3加急 4特急 + /** + * 回单方式 1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单 + */ + @ApiModelProperty(value = "回单方式 1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单") + private String receipt;//回单方式（多选） + /** + * 运输方式 1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递 + */ + @ApiModelProperty(value = "运输方式 1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递") + private String transportType;//运输方式 1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递 + + /** + * 运单状态 0未入库 10部分入库 20已入库 + */ + @ApiModelProperty(value = "运单状态") + private String waybillStatus;//运单状态 0未入库 10部分入库 20已入库 + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskDataVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskDataVO.java index 7f18327f7..3d2f4c915 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskDataVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskDataVO.java @@ -47,4 +47,6 @@ public class TaskDataVO { + + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java index c80fd1cd6..195ed0cfb 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java @@ -1,8 +1,12 @@ package com.logpm.warehouse.vo; +import com.logpm.warehouse.entity.QuestDetailChildEntity; +import com.logpm.warehouse.entity.QuestDetailEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class TaskPackagelistVO { @@ -84,4 +88,10 @@ public class TaskPackagelistVO { @ApiModelProperty(value = "是否新增") private String isNew; + /** + * 盘点明细数据 + */ + private List questChildVOList; + + } diff --git a/blade-service/logpm-aftersales/pom.xml b/blade-service/logpm-aftersales/pom.xml index 6fb929191..86653f783 100644 --- a/blade-service/logpm-aftersales/pom.xml +++ b/blade-service/logpm-aftersales/pom.xml @@ -29,6 +29,39 @@ blade-core-auto compile + + org.springblade + blade-starter-excel + + + org.springblade + logpm-aftersales-api + ${bladex.project.version} + compile + + + + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + + + org.apache.maven.plugins + maven-antrun-plugin + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java index 3289385c6..b0db4c432 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java @@ -29,7 +29,7 @@ import org.springblade.core.launch.BladeApplication; public class AftersalesApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, AftersalesApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_AFTERSALES_NAME, AftersalesApplication.class, args); } } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/AftersalesProperties.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/AftersalesProperties.java new file mode 100644 index 000000000..d75bde125 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/AftersalesProperties.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.config; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * 配置feign、mybatis包名、properties + * + * @author chaos + */ +@Configuration(proxyBeanMethods = false) +@ComponentScan({"org.springblade", "com.logpm"}) +@EnableFeignClients({"org.springblade", "com.logpm"}) +@MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"}) +@EnableConfigurationProperties(AftersalesProperties.class) +public class AftersalesProperties { + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java new file mode 100644 index 000000000..fcb27e329 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel; +import com.logpm.aftersales.wrapper.AftersalesAbnormalPackageWrapper; +import com.logpm.aftersales.service.IAftersalesAbnormalPackageService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常处理包件记录 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesAbnormalPackage") +@Api(value = "异常处理包件记录", tags = "异常处理包件记录接口") +public class AftersalesAbnormalPackageController extends BladeController { + + private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService; + + /** + * 异常处理包件记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesAbnormalPackage") + public R detail(AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) { + AftersalesAbnormalPackageEntity detail = aftersalesAbnormalPackageService.getOne(Condition.getQueryWrapper(aftersalesAbnormalPackage)); + return R.data(AftersalesAbnormalPackageWrapper.build().entityVO(detail)); + } + /** + * 异常处理包件记录 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesAbnormalPackage") + public R> list(@ApiIgnore @RequestParam Map aftersalesAbnormalPackage, Query query) { + IPage pages = aftersalesAbnormalPackageService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesAbnormalPackage, AftersalesAbnormalPackageEntity.class)); + return R.data(AftersalesAbnormalPackageWrapper.build().pageVO(pages)); + } + + /** + * 异常处理包件记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesAbnormalPackage") + public R> page(AftersalesAbnormalPackageVO aftersalesAbnormalPackage, Query query) { + IPage pages = aftersalesAbnormalPackageService.selectAftersalesAbnormalPackagePage(Condition.getPage(query), aftersalesAbnormalPackage); + return R.data(pages); + } + + /** + * 异常处理包件记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesAbnormalPackage") + public R save(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) { + return R.status(aftersalesAbnormalPackageService.save(aftersalesAbnormalPackage)); + } + + /** + * 异常处理包件记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesAbnormalPackage") + public R update(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) { + return R.status(aftersalesAbnormalPackageService.updateById(aftersalesAbnormalPackage)); + } + + /** + * 异常处理包件记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesAbnormalPackage") + public R submit(@Valid @RequestBody AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) { + return R.status(aftersalesAbnormalPackageService.saveOrUpdate(aftersalesAbnormalPackage)); + } + + /** + * 异常处理包件记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesAbnormalPackageService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesAbnormalPackage") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesAbnormalPackage") + public void exportAftersalesAbnormalPackage(@ApiIgnore @RequestParam Map aftersalesAbnormalPackage, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesAbnormalPackage, AftersalesAbnormalPackageEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesAbnormalPackage::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesAbnormalPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesAbnormalPackageService.exportAftersalesAbnormalPackage(queryWrapper); + ExcelUtil.export(response, "异常处理包件记录数据" + DateUtil.time(), "异常处理包件记录数据表", list, AftersalesAbnormalPackageExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesArbitrationOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesArbitrationOrderController.java new file mode 100644 index 000000000..9cd6c4364 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesArbitrationOrderController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO; +import com.logpm.aftersales.excel.AftersalesArbitrationOrderExcel; +import com.logpm.aftersales.wrapper.AftersalesArbitrationOrderWrapper; +import com.logpm.aftersales.service.IAftersalesArbitrationOrderService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常工单仲裁申请单 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesArbitrationOrder") +@Api(value = "异常工单仲裁申请单", tags = "异常工单仲裁申请单接口") +public class AftersalesArbitrationOrderController extends BladeController { + + private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService; + + /** + * 异常工单仲裁申请单 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesArbitrationOrder") + public R detail(AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) { + AftersalesArbitrationOrderEntity detail = aftersalesArbitrationOrderService.getOne(Condition.getQueryWrapper(aftersalesArbitrationOrder)); + return R.data(AftersalesArbitrationOrderWrapper.build().entityVO(detail)); + } + /** + * 异常工单仲裁申请单 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesArbitrationOrder") + public R> list(@ApiIgnore @RequestParam Map aftersalesArbitrationOrder, Query query) { + IPage pages = aftersalesArbitrationOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesArbitrationOrder, AftersalesArbitrationOrderEntity.class)); + return R.data(AftersalesArbitrationOrderWrapper.build().pageVO(pages)); + } + + /** + * 异常工单仲裁申请单 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesArbitrationOrder") + public R> page(AftersalesArbitrationOrderVO aftersalesArbitrationOrder, Query query) { + IPage pages = aftersalesArbitrationOrderService.selectAftersalesArbitrationOrderPage(Condition.getPage(query), aftersalesArbitrationOrder); + return R.data(pages); + } + + /** + * 异常工单仲裁申请单 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesArbitrationOrder") + public R save(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) { + return R.status(aftersalesArbitrationOrderService.save(aftersalesArbitrationOrder)); + } + + /** + * 异常工单仲裁申请单 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesArbitrationOrder") + public R update(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) { + return R.status(aftersalesArbitrationOrderService.updateById(aftersalesArbitrationOrder)); + } + + /** + * 异常工单仲裁申请单 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesArbitrationOrder") + public R submit(@Valid @RequestBody AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) { + return R.status(aftersalesArbitrationOrderService.saveOrUpdate(aftersalesArbitrationOrder)); + } + + /** + * 异常工单仲裁申请单 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesArbitrationOrderService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesArbitrationOrder") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesArbitrationOrder") + public void exportAftersalesArbitrationOrder(@ApiIgnore @RequestParam Map aftersalesArbitrationOrder, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesArbitrationOrder, AftersalesArbitrationOrderEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesArbitrationOrder::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesArbitrationOrderEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesArbitrationOrderService.exportAftersalesArbitrationOrder(queryWrapper); + ExcelUtil.export(response, "异常工单仲裁申请单数据" + DateUtil.time(), "异常工单仲裁申请单数据表", list, AftersalesArbitrationOrderExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCargoRecordsController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCargoRecordsController.java new file mode 100644 index 000000000..eb517ec09 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCargoRecordsController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.vo.AftersalesCargoRecordsVO; +import com.logpm.aftersales.excel.AftersalesCargoRecordsExcel; +import com.logpm.aftersales.wrapper.AftersalesCargoRecordsWrapper; +import com.logpm.aftersales.service.IAftersalesCargoRecordsService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 货物催 — 查记录表 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesCargoRecords") +@Api(value = "货物催 — 查记录表", tags = "货物催 — 查记录表接口") +public class AftersalesCargoRecordsController extends BladeController { + + private final IAftersalesCargoRecordsService aftersalesCargoRecordsService; + + /** + * 货物催 — 查记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesCargoRecords") + public R detail(AftersalesCargoRecordsEntity aftersalesCargoRecords) { + AftersalesCargoRecordsEntity detail = aftersalesCargoRecordsService.getOne(Condition.getQueryWrapper(aftersalesCargoRecords)); + return R.data(AftersalesCargoRecordsWrapper.build().entityVO(detail)); + } + /** + * 货物催 — 查记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesCargoRecords") + public R> list(@ApiIgnore @RequestParam Map aftersalesCargoRecords, Query query) { + IPage pages = aftersalesCargoRecordsService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCargoRecords, AftersalesCargoRecordsEntity.class)); + return R.data(AftersalesCargoRecordsWrapper.build().pageVO(pages)); + } + + /** + * 货物催 — 查记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesCargoRecords") + public R> page(AftersalesCargoRecordsVO aftersalesCargoRecords, Query query) { + IPage pages = aftersalesCargoRecordsService.selectAftersalesCargoRecordsPage(Condition.getPage(query), aftersalesCargoRecords); + return R.data(pages); + } + + /** + * 货物催 — 查记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesCargoRecords") + public R save(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) { + return R.status(aftersalesCargoRecordsService.save(aftersalesCargoRecords)); + } + + /** + * 货物催 — 查记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesCargoRecords") + public R update(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) { + return R.status(aftersalesCargoRecordsService.updateById(aftersalesCargoRecords)); + } + + /** + * 货物催 — 查记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesCargoRecords") + public R submit(@Valid @RequestBody AftersalesCargoRecordsEntity aftersalesCargoRecords) { + return R.status(aftersalesCargoRecordsService.saveOrUpdate(aftersalesCargoRecords)); + } + + /** + * 货物催 — 查记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesCargoRecordsService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesCargoRecords") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesCargoRecords") + public void exportAftersalesCargoRecords(@ApiIgnore @RequestParam Map aftersalesCargoRecords, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesCargoRecords, AftersalesCargoRecordsEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesCargoRecords::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesCargoRecordsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesCargoRecordsService.exportAftersalesCargoRecords(queryWrapper); + ExcelUtil.export(response, "货物催 — 查记录表数据" + DateUtil.time(), "货物催 — 查记录表数据表", list, AftersalesCargoRecordsExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecipientController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecipientController.java new file mode 100644 index 000000000..fdb11bd8e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecipientController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecipientExcel; +import com.logpm.aftersales.wrapper.AftersalesCompletionRecipientWrapper; +import com.logpm.aftersales.service.IAftersalesCompletionRecipientService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常工单完结处理结果受款方 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesCompletionRecipient") +@Api(value = "异常工单完结处理结果受款方", tags = "异常工单完结处理结果受款方接口") +public class AftersalesCompletionRecipientController extends BladeController { + + private final IAftersalesCompletionRecipientService aftersalesCompletionRecipientService; + + /** + * 异常工单完结处理结果受款方 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesCompletionRecipient") + public R detail(AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) { + AftersalesCompletionRecipientEntity detail = aftersalesCompletionRecipientService.getOne(Condition.getQueryWrapper(aftersalesCompletionRecipient)); + return R.data(AftersalesCompletionRecipientWrapper.build().entityVO(detail)); + } + /** + * 异常工单完结处理结果受款方 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecipient") + public R> list(@ApiIgnore @RequestParam Map aftersalesCompletionRecipient, Query query) { + IPage pages = aftersalesCompletionRecipientService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCompletionRecipient, AftersalesCompletionRecipientEntity.class)); + return R.data(AftersalesCompletionRecipientWrapper.build().pageVO(pages)); + } + + /** + * 异常工单完结处理结果受款方 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecipient") + public R> page(AftersalesCompletionRecipientVO aftersalesCompletionRecipient, Query query) { + IPage pages = aftersalesCompletionRecipientService.selectAftersalesCompletionRecipientPage(Condition.getPage(query), aftersalesCompletionRecipient); + return R.data(pages); + } + + /** + * 异常工单完结处理结果受款方 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesCompletionRecipient") + public R save(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) { + return R.status(aftersalesCompletionRecipientService.save(aftersalesCompletionRecipient)); + } + + /** + * 异常工单完结处理结果受款方 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecipient") + public R update(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) { + return R.status(aftersalesCompletionRecipientService.updateById(aftersalesCompletionRecipient)); + } + + /** + * 异常工单完结处理结果受款方 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesCompletionRecipient") + public R submit(@Valid @RequestBody AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) { + return R.status(aftersalesCompletionRecipientService.saveOrUpdate(aftersalesCompletionRecipient)); + } + + /** + * 异常工单完结处理结果受款方 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesCompletionRecipientService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesCompletionRecipient") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesCompletionRecipient") + public void exportAftersalesCompletionRecipient(@ApiIgnore @RequestParam Map aftersalesCompletionRecipient, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesCompletionRecipient, AftersalesCompletionRecipientEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesCompletionRecipient::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesCompletionRecipientEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesCompletionRecipientService.exportAftersalesCompletionRecipient(queryWrapper); + ExcelUtil.export(response, "异常工单完结处理结果受款方数据" + DateUtil.time(), "异常工单完结处理结果受款方数据表", list, AftersalesCompletionRecipientExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java new file mode 100644 index 000000000..a7c436c89 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesCompletionRecordController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecordVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecordExcel; +import com.logpm.aftersales.wrapper.AftersalesCompletionRecordWrapper; +import com.logpm.aftersales.service.IAftersalesCompletionRecordService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常工单完结处理结果赔款方 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesCompletionRecord") +@Api(value = "异常工单完结处理结果赔款方", tags = "异常工单完结处理结果赔款方接口") +public class AftersalesCompletionRecordController extends BladeController { + + private final IAftersalesCompletionRecordService aftersalesCompletionRecordService; + + /** + * 异常工单完结处理结果赔款方 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesCompletionRecord") + public R detail(AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + AftersalesCompletionRecordEntity detail = aftersalesCompletionRecordService.getOne(Condition.getQueryWrapper(aftersalesCompletionRecord)); + return R.data(AftersalesCompletionRecordWrapper.build().entityVO(detail)); + } + /** + * 异常工单完结处理结果赔款方 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecord") + public R> list(@ApiIgnore @RequestParam Map aftersalesCompletionRecord, Query query) { + IPage pages = aftersalesCompletionRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesCompletionRecord, AftersalesCompletionRecordEntity.class)); + return R.data(AftersalesCompletionRecordWrapper.build().pageVO(pages)); + } + + /** + * 异常工单完结处理结果赔款方 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesCompletionRecord") + public R> page(AftersalesCompletionRecordVO aftersalesCompletionRecord, Query query) { + IPage pages = aftersalesCompletionRecordService.selectAftersalesCompletionRecordPage(Condition.getPage(query), aftersalesCompletionRecord); + return R.data(pages); + } + + /** + * 异常工单完结处理结果赔款方 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesCompletionRecord") + public R save(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + return R.status(aftersalesCompletionRecordService.save(aftersalesCompletionRecord)); + } + + /** + * 异常工单完结处理结果赔款方 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecord") + public R update(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + return R.status(aftersalesCompletionRecordService.updateById(aftersalesCompletionRecord)); + } + + /** + * 异常工单完结处理结果赔款方 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesCompletionRecord") + public R submit(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + return R.status(aftersalesCompletionRecordService.saveOrUpdate(aftersalesCompletionRecord)); + } + + /** + * 异常工单完结处理结果赔款方 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesCompletionRecordService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesCompletionRecord") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesCompletionRecord") + public void exportAftersalesCompletionRecord(@ApiIgnore @RequestParam Map aftersalesCompletionRecord, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesCompletionRecord, AftersalesCompletionRecordEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesCompletionRecord::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesCompletionRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesCompletionRecordService.exportAftersalesCompletionRecord(queryWrapper); + ExcelUtil.export(response, "异常工单完结处理结果赔款方数据" + DateUtil.time(), "异常工单完结处理结果赔款方数据表", list, AftersalesCompletionRecordExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesDecreaseImageController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesDecreaseImageController.java new file mode 100644 index 000000000..60d4e2a6f --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesDecreaseImageController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.vo.AftersalesDecreaseImageVO; +import com.logpm.aftersales.excel.AftersalesDecreaseImageExcel; +import com.logpm.aftersales.wrapper.AftersalesDecreaseImageWrapper; +import com.logpm.aftersales.service.IAftersalesDecreaseImageService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常运损图片（最少两张） 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesDecreaseImage") +@Api(value = "异常运损图片（最少两张）", tags = "异常运损图片（最少两张）接口") +public class AftersalesDecreaseImageController extends BladeController { + + private final IAftersalesDecreaseImageService aftersalesDecreaseImageService; + + /** + * 异常运损图片（最少两张） 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesDecreaseImage") + public R detail(AftersalesDecreaseImageEntity aftersalesDecreaseImage) { + AftersalesDecreaseImageEntity detail = aftersalesDecreaseImageService.getOne(Condition.getQueryWrapper(aftersalesDecreaseImage)); + return R.data(AftersalesDecreaseImageWrapper.build().entityVO(detail)); + } + /** + * 异常运损图片（最少两张） 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesDecreaseImage") + public R> list(@ApiIgnore @RequestParam Map aftersalesDecreaseImage, Query query) { + IPage pages = aftersalesDecreaseImageService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesDecreaseImage, AftersalesDecreaseImageEntity.class)); + return R.data(AftersalesDecreaseImageWrapper.build().pageVO(pages)); + } + + /** + * 异常运损图片（最少两张） 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesDecreaseImage") + public R> page(AftersalesDecreaseImageVO aftersalesDecreaseImage, Query query) { + IPage pages = aftersalesDecreaseImageService.selectAftersalesDecreaseImagePage(Condition.getPage(query), aftersalesDecreaseImage); + return R.data(pages); + } + + /** + * 异常运损图片（最少两张） 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesDecreaseImage") + public R save(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) { + return R.status(aftersalesDecreaseImageService.save(aftersalesDecreaseImage)); + } + + /** + * 异常运损图片（最少两张） 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesDecreaseImage") + public R update(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) { + return R.status(aftersalesDecreaseImageService.updateById(aftersalesDecreaseImage)); + } + + /** + * 异常运损图片（最少两张） 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesDecreaseImage") + public R submit(@Valid @RequestBody AftersalesDecreaseImageEntity aftersalesDecreaseImage) { + return R.status(aftersalesDecreaseImageService.saveOrUpdate(aftersalesDecreaseImage)); + } + + /** + * 异常运损图片（最少两张） 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesDecreaseImageService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesDecreaseImage") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesDecreaseImage") + public void exportAftersalesDecreaseImage(@ApiIgnore @RequestParam Map aftersalesDecreaseImage, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesDecreaseImage, AftersalesDecreaseImageEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesDecreaseImage::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesDecreaseImageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesDecreaseImageService.exportAftersalesDecreaseImage(queryWrapper); + ExcelUtil.export(response, "异常运损图片（最少两张）数据" + DateUtil.time(), "异常运损图片（最少两张）数据表", list, AftersalesDecreaseImageExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesExchangeController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesExchangeController.java new file mode 100644 index 000000000..180af8a0a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesExchangeController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesExchangeEntity; +import com.logpm.aftersales.vo.AftersalesExchangeVO; +import com.logpm.aftersales.excel.AftersalesExchangeExcel; +import com.logpm.aftersales.wrapper.AftersalesExchangeWrapper; +import com.logpm.aftersales.service.IAftersalesExchangeService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 工单交流处理数据记录 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesExchange") +@Api(value = "工单交流处理数据记录", tags = "工单交流处理数据记录接口") +public class AftersalesExchangeController extends BladeController { + + private final IAftersalesExchangeService aftersalesExchangeService; + + /** + * 工单交流处理数据记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesExchange") + public R detail(AftersalesExchangeEntity aftersalesExchange) { + AftersalesExchangeEntity detail = aftersalesExchangeService.getOne(Condition.getQueryWrapper(aftersalesExchange)); + return R.data(AftersalesExchangeWrapper.build().entityVO(detail)); + } + /** + * 工单交流处理数据记录 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesExchange") + public R> list(@ApiIgnore @RequestParam Map aftersalesExchange, Query query) { + IPage pages = aftersalesExchangeService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesExchange, AftersalesExchangeEntity.class)); + return R.data(AftersalesExchangeWrapper.build().pageVO(pages)); + } + + /** + * 工单交流处理数据记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesExchange") + public R> page(AftersalesExchangeVO aftersalesExchange, Query query) { + IPage pages = aftersalesExchangeService.selectAftersalesExchangePage(Condition.getPage(query), aftersalesExchange); + return R.data(pages); + } + + /** + * 工单交流处理数据记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesExchange") + public R save(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) { + return R.status(aftersalesExchangeService.save(aftersalesExchange)); + } + + /** + * 工单交流处理数据记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesExchange") + public R update(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) { + return R.status(aftersalesExchangeService.updateById(aftersalesExchange)); + } + + /** + * 工单交流处理数据记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesExchange") + public R submit(@Valid @RequestBody AftersalesExchangeEntity aftersalesExchange) { + return R.status(aftersalesExchangeService.saveOrUpdate(aftersalesExchange)); + } + + /** + * 工单交流处理数据记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesExchangeService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesExchange") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesExchange") + public void exportAftersalesExchange(@ApiIgnore @RequestParam Map aftersalesExchange, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesExchange, AftersalesExchangeEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesExchange::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesExchangeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesExchangeService.exportAftersalesExchange(queryWrapper); + ExcelUtil.export(response, "工单交流处理数据记录数据" + DateUtil.time(), "工单交流处理数据记录数据表", list, AftersalesExchangeExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java new file mode 100644 index 000000000..0d5c2dd6c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesOvertimeFineController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity; +import com.logpm.aftersales.vo.AftersalesOvertimeFineVO; +import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel; +import com.logpm.aftersales.wrapper.AftersalesOvertimeFineWrapper; +import com.logpm.aftersales.service.IAftersalesOvertimeFineService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常工单超时记录表 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesOvertimeFine") +@Api(value = "异常工单超时记录表", tags = "异常工单超时记录表接口") +public class AftersalesOvertimeFineController extends BladeController { + + private final IAftersalesOvertimeFineService aftersalesOvertimeFineService; + + /** + * 异常工单超时记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesOvertimeFine") + public R detail(AftersalesOvertimeFineEntity aftersalesOvertimeFine) { + AftersalesOvertimeFineEntity detail = aftersalesOvertimeFineService.getOne(Condition.getQueryWrapper(aftersalesOvertimeFine)); + return R.data(AftersalesOvertimeFineWrapper.build().entityVO(detail)); + } + /** + * 异常工单超时记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine") + public R> list(@ApiIgnore @RequestParam Map aftersalesOvertimeFine, Query query) { + IPage pages = aftersalesOvertimeFineService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesOvertimeFine, AftersalesOvertimeFineEntity.class)); + return R.data(AftersalesOvertimeFineWrapper.build().pageVO(pages)); + } + + /** + * 异常工单超时记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesOvertimeFine") + public R> page(AftersalesOvertimeFineVO aftersalesOvertimeFine, Query query) { + IPage pages = aftersalesOvertimeFineService.selectAftersalesOvertimeFinePage(Condition.getPage(query), aftersalesOvertimeFine); + return R.data(pages); + } + + /** + * 异常工单超时记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesOvertimeFine") + public R save(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) { + return R.status(aftersalesOvertimeFineService.save(aftersalesOvertimeFine)); + } + + /** + * 异常工单超时记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesOvertimeFine") + public R update(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) { + return R.status(aftersalesOvertimeFineService.updateById(aftersalesOvertimeFine)); + } + + /** + * 异常工单超时记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesOvertimeFine") + public R submit(@Valid @RequestBody AftersalesOvertimeFineEntity aftersalesOvertimeFine) { + return R.status(aftersalesOvertimeFineService.saveOrUpdate(aftersalesOvertimeFine)); + } + + /** + * 异常工单超时记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesOvertimeFineService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesOvertimeFine") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesOvertimeFine") + public void exportAftersalesOvertimeFine(@ApiIgnore @RequestParam Map aftersalesOvertimeFine, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesOvertimeFine, AftersalesOvertimeFineEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesOvertimeFine::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesOvertimeFineEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesOvertimeFineService.exportAftersalesOvertimeFine(queryWrapper); + ExcelUtil.export(response, "异常工单超时记录表数据" + DateUtil.time(), "异常工单超时记录表数据表", list, AftersalesOvertimeFineExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessingResultsController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessingResultsController.java new file mode 100644 index 000000000..5ec410391 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessingResultsController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.vo.AftersalesProcessingResultsVO; +import com.logpm.aftersales.excel.AftersalesProcessingResultsExcel; +import com.logpm.aftersales.wrapper.AftersalesProcessingResultsWrapper; +import com.logpm.aftersales.service.IAftersalesProcessingResultsService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常工单处理结果 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesProcessingResults") +@Api(value = "异常工单处理结果", tags = "异常工单处理结果接口") +public class AftersalesProcessingResultsController extends BladeController { + + private final IAftersalesProcessingResultsService aftersalesProcessingResultsService; + + /** + * 异常工单处理结果 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesProcessingResults") + public R detail(AftersalesProcessingResultsEntity aftersalesProcessingResults) { + AftersalesProcessingResultsEntity detail = aftersalesProcessingResultsService.getOne(Condition.getQueryWrapper(aftersalesProcessingResults)); + return R.data(AftersalesProcessingResultsWrapper.build().entityVO(detail)); + } + /** + * 异常工单处理结果 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesProcessingResults") + public R> list(@ApiIgnore @RequestParam Map aftersalesProcessingResults, Query query) { + IPage pages = aftersalesProcessingResultsService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesProcessingResults, AftersalesProcessingResultsEntity.class)); + return R.data(AftersalesProcessingResultsWrapper.build().pageVO(pages)); + } + + /** + * 异常工单处理结果 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesProcessingResults") + public R> page(AftersalesProcessingResultsVO aftersalesProcessingResults, Query query) { + IPage pages = aftersalesProcessingResultsService.selectAftersalesProcessingResultsPage(Condition.getPage(query), aftersalesProcessingResults); + return R.data(pages); + } + + /** + * 异常工单处理结果 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesProcessingResults") + public R save(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) { + return R.status(aftersalesProcessingResultsService.save(aftersalesProcessingResults)); + } + + /** + * 异常工单处理结果 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesProcessingResults") + public R update(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) { + return R.status(aftersalesProcessingResultsService.updateById(aftersalesProcessingResults)); + } + + /** + * 异常工单处理结果 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesProcessingResults") + public R submit(@Valid @RequestBody AftersalesProcessingResultsEntity aftersalesProcessingResults) { + return R.status(aftersalesProcessingResultsService.saveOrUpdate(aftersalesProcessingResults)); + } + + /** + * 异常工单处理结果 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesProcessingResultsService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesProcessingResults") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesProcessingResults") + public void exportAftersalesProcessingResults(@ApiIgnore @RequestParam Map aftersalesProcessingResults, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesProcessingResults, AftersalesProcessingResultsEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesProcessingResults::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesProcessingResultsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesProcessingResultsService.exportAftersalesProcessingResults(queryWrapper); + ExcelUtil.export(response, "异常工单处理结果数据" + DateUtil.time(), "异常工单处理结果数据表", list, AftersalesProcessingResultsExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessorController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessorController.java new file mode 100644 index 000000000..fc0d7d566 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesProcessorController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesProcessorEntity; +import com.logpm.aftersales.vo.AftersalesProcessorVO; +import com.logpm.aftersales.excel.AftersalesProcessorExcel; +import com.logpm.aftersales.wrapper.AftersalesProcessorWrapper; +import com.logpm.aftersales.service.IAftersalesProcessorService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常责任方和处理方 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesProcessor") +@Api(value = "异常责任方和处理方", tags = "异常责任方和处理方接口") +public class AftersalesProcessorController extends BladeController { + + private final IAftersalesProcessorService aftersalesProcessorService; + + /** + * 异常责任方和处理方 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesProcessor") + public R detail(AftersalesProcessorEntity aftersalesProcessor) { + AftersalesProcessorEntity detail = aftersalesProcessorService.getOne(Condition.getQueryWrapper(aftersalesProcessor)); + return R.data(AftersalesProcessorWrapper.build().entityVO(detail)); + } + /** + * 异常责任方和处理方 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesProcessor") + public R> list(@ApiIgnore @RequestParam Map aftersalesProcessor, Query query) { + IPage pages = aftersalesProcessorService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesProcessor, AftersalesProcessorEntity.class)); + return R.data(AftersalesProcessorWrapper.build().pageVO(pages)); + } + + /** + * 异常责任方和处理方 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesProcessor") + public R> page(AftersalesProcessorVO aftersalesProcessor, Query query) { + IPage pages = aftersalesProcessorService.selectAftersalesProcessorPage(Condition.getPage(query), aftersalesProcessor); + return R.data(pages); + } + + /** + * 异常责任方和处理方 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesProcessor") + public R save(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) { + return R.status(aftersalesProcessorService.save(aftersalesProcessor)); + } + + /** + * 异常责任方和处理方 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesProcessor") + public R update(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) { + return R.status(aftersalesProcessorService.updateById(aftersalesProcessor)); + } + + /** + * 异常责任方和处理方 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesProcessor") + public R submit(@Valid @RequestBody AftersalesProcessorEntity aftersalesProcessor) { + return R.status(aftersalesProcessorService.saveOrUpdate(aftersalesProcessor)); + } + + /** + * 异常责任方和处理方 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesProcessorService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesProcessor") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesProcessor") + public void exportAftersalesProcessor(@ApiIgnore @RequestParam Map aftersalesProcessor, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesProcessor, AftersalesProcessorEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesProcessor::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesProcessorEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesProcessorService.exportAftersalesProcessor(queryWrapper); + ExcelUtil.export(response, "异常责任方和处理方数据" + DateUtil.time(), "异常责任方和处理方数据表", list, AftersalesProcessorExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java new file mode 100644 index 000000000..3bcb4cbe7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesReturnRecordEntity; +import com.logpm.aftersales.vo.AftersalesReturnRecordVO; +import com.logpm.aftersales.excel.AftersalesReturnRecordExcel; +import com.logpm.aftersales.wrapper.AftersalesReturnRecordWrapper; +import com.logpm.aftersales.service.IAftersalesReturnRecordService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 异常 工单打回记录 控制器 + * + * @author cyz + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesReturnRecord") +@Api(value = "异常 工单打回记录", tags = "异常 工单打回记录接口") +public class AftersalesReturnRecordController extends BladeController { + + private final IAftersalesReturnRecordService aftersalesReturnRecordService; + + /** + * 异常 工单打回记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesReturnRecord") + public R detail(AftersalesReturnRecordEntity aftersalesReturnRecord) { + AftersalesReturnRecordEntity detail = aftersalesReturnRecordService.getOne(Condition.getQueryWrapper(aftersalesReturnRecord)); + return R.data(AftersalesReturnRecordWrapper.build().entityVO(detail)); + } + /** + * 异常 工单打回记录 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesReturnRecord") + public R> list(@ApiIgnore @RequestParam Map aftersalesReturnRecord, Query query) { + IPage pages = aftersalesReturnRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesReturnRecord, AftersalesReturnRecordEntity.class)); + return R.data(AftersalesReturnRecordWrapper.build().pageVO(pages)); + } + + /** + * 异常 工单打回记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesReturnRecord") + public R> page(AftersalesReturnRecordVO aftersalesReturnRecord, Query query) { + IPage pages = aftersalesReturnRecordService.selectAftersalesReturnRecordPage(Condition.getPage(query), aftersalesReturnRecord); + return R.data(pages); + } + + /** + * 异常 工单打回记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesReturnRecord") + public R save(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) { + return R.status(aftersalesReturnRecordService.save(aftersalesReturnRecord)); + } + + /** + * 异常 工单打回记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesReturnRecord") + public R update(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) { + return R.status(aftersalesReturnRecordService.updateById(aftersalesReturnRecord)); + } + + /** + * 异常 工单打回记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesReturnRecord") + public R submit(@Valid @RequestBody AftersalesReturnRecordEntity aftersalesReturnRecord) { + return R.status(aftersalesReturnRecordService.saveOrUpdate(aftersalesReturnRecord)); + } + + /** + * 异常 工单打回记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesReturnRecordService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesReturnRecord") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesReturnRecord") + public void exportAftersalesReturnRecord(@ApiIgnore @RequestParam Map aftersalesReturnRecord, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesReturnRecord, AftersalesReturnRecordEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesReturnRecord::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesReturnRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesReturnRecordService.exportAftersalesReturnRecord(queryWrapper); + ExcelUtil.export(response, "异常 工单打回记录数据" + DateUtil.time(), "异常 工单打回记录数据表", list, AftersalesReturnRecordExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java new file mode 100644 index 000000000..e9dfaef5c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import com.logpm.aftersales.vo.AftersalesWorkOrderVO; +import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; +import com.logpm.aftersales.wrapper.AftersalesWorkOrderWrapper; +import com.logpm.aftersales.service.IAftersalesWorkOrderService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 客服异常工单 控制器 + * + * @author BladeX + * @since 2023-11-17 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/aftersalesWorkOrder") +@Api(value = "客服异常工单", tags = "客服异常工单接口") +public class AftersalesWorkOrderController extends BladeController { + + private final IAftersalesWorkOrderService aftersalesWorkOrderService; + + /** + * 客服异常工单 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入aftersalesWorkOrder") + public R detail(AftersalesWorkOrderEntity aftersalesWorkOrder) { + AftersalesWorkOrderEntity detail = aftersalesWorkOrderService.getOne(Condition.getQueryWrapper(aftersalesWorkOrder)); + return R.data(AftersalesWorkOrderWrapper.build().entityVO(detail)); + } + /** + * 客服异常工单 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder") + public R> list(@ApiIgnore @RequestParam Map aftersalesWorkOrder, Query query) { + IPage pages = aftersalesWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesWorkOrder, AftersalesWorkOrderEntity.class)); + return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages)); + } + + /** + * 客服异常工单 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder") + public R> page(AftersalesWorkOrderVO aftersalesWorkOrder, Query query) { + IPage pages = aftersalesWorkOrderService.selectAftersalesWorkOrderPage(Condition.getPage(query), aftersalesWorkOrder); + return R.data(pages); + } + + /** + * 客服异常工单 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入aftersalesWorkOrder") + public R save(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) { + return R.status(aftersalesWorkOrderService.save(aftersalesWorkOrder)); + } + + /** + * 客服异常工单 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesWorkOrder") + public R update(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) { + return R.status(aftersalesWorkOrderService.updateById(aftersalesWorkOrder)); + } + + /** + * 客服异常工单 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入aftersalesWorkOrder") + public R submit(@Valid @RequestBody AftersalesWorkOrderEntity aftersalesWorkOrder) { + return R.status(aftersalesWorkOrderService.saveOrUpdate(aftersalesWorkOrder)); + } + + /** + * 客服异常工单 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(aftersalesWorkOrderService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-aftersalesWorkOrder") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder") + public void exportAftersalesWorkOrder(@ApiIgnore @RequestParam Map aftersalesWorkOrder, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(aftersalesWorkOrder, AftersalesWorkOrderEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AftersalesWorkOrder::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(AftersalesWorkOrderEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = aftersalesWorkOrderService.exportAftersalesWorkOrder(queryWrapper); + ExcelUtil.export(response, "客服异常工单数据" + DateUtil.time(), "客服异常工单数据表", list, AftersalesWorkOrderExcel.class); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAbnormalPackageDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAbnormalPackageDTO.java new file mode 100644 index 000000000..c3ab0f75d --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAbnormalPackageDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常处理包件记录 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesAbnormalPackageDTO extends AftersalesAbnormalPackageEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesArbitrationOrderDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesArbitrationOrderDTO.java new file mode 100644 index 000000000..38f558907 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesArbitrationOrderDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单仲裁申请单 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesArbitrationOrderDTO extends AftersalesArbitrationOrderEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCargoRecordsDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCargoRecordsDTO.java new file mode 100644 index 000000000..0aa6c6752 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCargoRecordsDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 货物催 — 查记录表 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCargoRecordsDTO extends AftersalesCargoRecordsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecipientDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecipientDTO.java new file mode 100644 index 000000000..77611c76b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecipientDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单完结处理结果受款方 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecipientDTO extends AftersalesCompletionRecipientEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecordDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecordDTO.java new file mode 100644 index 000000000..3c692ea5e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesCompletionRecordDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单完结处理结果赔款方 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesCompletionRecordDTO extends AftersalesCompletionRecordEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesDecreaseImageDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesDecreaseImageDTO.java new file mode 100644 index 000000000..dbf76f248 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesDecreaseImageDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常运损图片（最少两张） 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesDecreaseImageDTO extends AftersalesDecreaseImageEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesExchangeDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesExchangeDTO.java new file mode 100644 index 000000000..5f3bf6770 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesExchangeDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesExchangeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单交流处理数据记录 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesExchangeDTO extends AftersalesExchangeEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesOvertimeFineDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesOvertimeFineDTO.java new file mode 100644 index 000000000..cec60eec7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesOvertimeFineDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单超时记录表 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesOvertimeFineDTO extends AftersalesOvertimeFineEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java new file mode 100644 index 000000000..3a4ef7f9f --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessingResultsDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常工单处理结果 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessingResultsDTO extends AftersalesProcessingResultsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessorDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessorDTO.java new file mode 100644 index 000000000..2c23f0cce --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesProcessorDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesProcessorEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常责任方和处理方 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesProcessorDTO extends AftersalesProcessorEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesReturnRecordDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesReturnRecordDTO.java new file mode 100644 index 000000000..fab412c8a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesReturnRecordDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesReturnRecordEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 异常 工单打回记录 数据传输对象实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesReturnRecordDTO extends AftersalesReturnRecordEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java new file mode 100644 index 000000000..c91186946 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.dto; + +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 客服异常工单 数据传输对象实体类 + * + * @author BladeX + * @since 2023-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesAbnormalPackageExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesAbnormalPackageExcel.java new file mode 100644 index 000000000..90b0de690 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesAbnormalPackageExcel.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常处理包件记录 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesAbnormalPackageExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常ID + */ + @ColumnWidth(20) + @ExcelProperty("异常ID") + private String workOrderId; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private String number; + /** + * 包件码 + */ + @ColumnWidth(20) + @ExcelProperty("包件码") + private String packageCode; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + /** + * 包件图片路径 + */ + @ColumnWidth(20) + @ExcelProperty("包件图片路径") + private String packageImage; + /** + * 类型;窜货，少货 + */ + @ColumnWidth(20) + @ExcelProperty("类型;窜货，少货") + private String typesOf; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesArbitrationOrderExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesArbitrationOrderExcel.java new file mode 100644 index 000000000..3cd0d9594 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesArbitrationOrderExcel.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常工单仲裁申请单 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesArbitrationOrderExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常工单Id + */ + @ColumnWidth(20) + @ExcelProperty("异常工单Id") + private String workOrderId; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private String typesOf; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCargoRecordsExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCargoRecordsExcel.java new file mode 100644 index 000000000..05d7877ae --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCargoRecordsExcel.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 货物催 — 查记录表 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesCargoRecordsExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 订单号 + */ + @ColumnWidth(20) + @ExcelProperty("订单号") + private String orderNumber; + /** + * 包件号 + */ + @ColumnWidth(20) + @ExcelProperty("包件号") + private String packageCode; + /** + * 客户交流记录 + */ + @ColumnWidth(20) + @ExcelProperty("客户交流记录") + private String customerCommunication; + /** + * 咨询人员 + */ + @ColumnWidth(20) + @ExcelProperty("咨询人员") + private String consultant; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecipientExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecipientExcel.java new file mode 100644 index 000000000..fce173f79 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecipientExcel.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常工单完结处理结果受款方 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesCompletionRecipientExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecordExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecordExcel.java new file mode 100644 index 000000000..ca41c0760 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesCompletionRecordExcel.java @@ -0,0 +1,124 @@ +/* + * 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 java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常工单完结处理结果赔款方 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesCompletionRecordExcel 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 indemnitor; + /** + * 原因 + */ + @ColumnWidth(20) + @ExcelProperty("原因") + private String reason; + /** + * 金额 + */ + @ColumnWidth(20) + @ExcelProperty("金额") + private BigDecimal money; + /** + * 仲裁原因 + */ + @ColumnWidth(20) + @ExcelProperty("仲裁原因") + private String reasonArbitration; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesDecreaseImageExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesDecreaseImageExcel.java new file mode 100644 index 000000000..d6b06376a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesDecreaseImageExcel.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常运损图片（最少两张） Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesDecreaseImageExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常工单Id + */ + @ColumnWidth(20) + @ExcelProperty("异常工单Id") + private String workOrderId; + /** + * 图片类型 + */ + @ColumnWidth(20) + @ExcelProperty("图片类型") + private String imageType; + /** + * 图片名称 + */ + @ColumnWidth(20) + @ExcelProperty("图片名称") + private String imageName; + /** + * 图片路径 + */ + @ColumnWidth(20) + @ExcelProperty("图片路径") + private String imagePath; + /** + * 仓库id + */ + @ColumnWidth(20) + @ExcelProperty("仓库id") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesExchangeExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesExchangeExcel.java new file mode 100644 index 000000000..9be0e453a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesExchangeExcel.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 工单交流处理数据记录 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesExchangeExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 营业部名称 + */ + @ColumnWidth(20) + @ExcelProperty("营业部名称") + private String businessName; + /** + * 营业部ID + */ + @ColumnWidth(20) + @ExcelProperty("营业部ID") + private String businessId; + /** + * 交流内容 + */ + @ColumnWidth(20) + @ExcelProperty("交流内容") + private String content; + /** + * 附件内容 + */ + @ColumnWidth(20) + @ExcelProperty("附件内容") + private String annex; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java new file mode 100644 index 000000000..b004e44ae --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesOvertimeFineExcel.java @@ -0,0 +1,118 @@ +/* + * 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 java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常工单超时记录表 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesOvertimeFineExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 金额 + */ + @ColumnWidth(20) + @ExcelProperty("金额") + private BigDecimal money; + /** + * 超时时间 + */ + @ColumnWidth(20) + @ExcelProperty("超时时间") + private Date timeout; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remarks; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessingResultsExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessingResultsExcel.java new file mode 100644 index 000000000..1e310d7bc --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessingResultsExcel.java @@ -0,0 +1,136 @@ +/* + * 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 java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常工单处理结果 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesProcessingResultsExcel 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 resultType; + /** + * 金额 + */ + @ColumnWidth(20) + @ExcelProperty("金额") + private BigDecimal money; + /** + * 赔付方式 + */ + @ColumnWidth(20) + @ExcelProperty("赔付方式") + private String compensationMethod; + /** + * 赔付时间 + */ + @ColumnWidth(20) + @ExcelProperty("赔付时间") + private Date compensationTime; + /** + * 赔付凭证 + */ + @ColumnWidth(20) + @ExcelProperty("赔付凭证") + private String compensationVoucher; + /** + * 处理结果说明 + */ + @ColumnWidth(20) + @ExcelProperty("处理结果说明") + private String resultDescription; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessorExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessorExcel.java new file mode 100644 index 000000000..e06b2c771 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesProcessorExcel.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常责任方和处理方 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesProcessorExcel 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 businessName; + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private String businessId; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 状态 + */ + @ColumnWidth(20) + @ExcelProperty("状态") + private String conditions; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private String typesOf; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesReturnRecordExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesReturnRecordExcel.java new file mode 100644 index 000000000..22c502aff --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesReturnRecordExcel.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.aftersales.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 异常 工单打回记录 Excel实体类 + * + * @author cyz + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesReturnRecordExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 异常工单ID + */ + @ColumnWidth(20) + @ExcelProperty("异常工单ID") + private String workOrderId; + /** + * 待处理营业部ID + */ + @ColumnWidth(20) + @ExcelProperty("待处理营业部ID") + private String businessId; + /** + * 待处理营业部名称 + */ + @ColumnWidth(20) + @ExcelProperty("待处理营业部名称") + private String businessName; + /** + * 打回原因 + */ + @ColumnWidth(20) + @ExcelProperty("打回原因") + private String reasonReturn; + /** + * 仓库Id + */ + @ColumnWidth(20) + @ExcelProperty("仓库Id") + private String warehouseId; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java new file mode 100644 index 000000000..887fff3e8 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java @@ -0,0 +1,267 @@ +/* + * 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 BladeX + * @since 2023-11-17 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class AftersalesWorkOrderExcel 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 workOrderType; + /** + * 发起工单标识;PDA，PC + */ + @ColumnWidth(20) + @ExcelProperty("发起工单标识;PDA，PC") + private String initiationIdentification; + /** + * 发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC） + */ + @ColumnWidth(20) + @ExcelProperty("发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）") + private String discoveryNode; + /** + * 异常工单号 + */ + @ColumnWidth(20) + @ExcelProperty("异常工单号") + private String workOrderNumber; + /** + * 运单号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + /** + * 订单自编号 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + /** + * 车次号 (干线卸车环节) + */ + @ColumnWidth(20) + @ExcelProperty("车次号 (干线卸车环节)") + private String trainNumber; + /** + * 一级品类 + */ + @ColumnWidth(20) + @ExcelProperty("一级品类") + private String first; + /** + * 二级品类 + */ + @ColumnWidth(20) + @ExcelProperty("二级品类") + private String secondary; + /** + * 车辆路线;车次号、通过车次号自动带出车辆线路 + */ + @ColumnWidth(20) + @ExcelProperty("车辆路线;车次号、通过车次号自动带出车辆线路") + private String vehicleRoute; + /** + * 送货时间 + */ + @ColumnWidth(20) + @ExcelProperty("送货时间") + private Date deliverGoodsTime; + /** + * 发现时间 （库内作业环节,配送装车环节） + */ + @ColumnWidth(20) + @ExcelProperty("发现时间 （库内作业环节,配送装车环节）") + private Date discoveryTime; + /** + * 入库时间（库内作业环节） + */ + @ColumnWidth(20) + @ExcelProperty("入库时间（库内作业环节）") + private Date warehousingTime; + /** + * 运单商场 + */ + @ColumnWidth(20) + @ExcelProperty("运单商场") + private String waybillMall; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remarks; + /** + * 配送时间(配送装车环节) + */ + @ColumnWidth(20) + @ExcelProperty("配送时间(配送装车环节)") + private Date deliveryTime; + /** + * 配送司机(配送装车环节) + */ + @ColumnWidth(20) + @ExcelProperty("配送司机(配送装车环节)") + private String deliveryDriver; + /** + * 工单状态 + */ + @ColumnWidth(20) + @ExcelProperty("工单状态") + private String workOrderStatus; + /** + * 归属客服ID + */ + @ColumnWidth(20) + @ExcelProperty("归属客服ID") + private String customerServiceId; + /** + * 归属客服名称 + */ + @ColumnWidth(20) + @ExcelProperty("归属客服名称") + private String customerServiceName; + /** + * 商场ID + */ + @ColumnWidth(20) + @ExcelProperty("商场ID") + private String waybillMallId; + /** + * 完结时间 + */ + @ColumnWidth(20) + @ExcelProperty("完结时间") + private Date overTime; + /** + * 异常问题描述 + */ + @ColumnWidth(20) + @ExcelProperty("异常问题描述") + private String problemDescription; + /** + * 仓库ID + */ + @ColumnWidth(20) + @ExcelProperty("仓库ID") + private String warehouseId; + /** + * 责任人 （库内作业环节） + */ + @ColumnWidth(20) + @ExcelProperty("责任人 （库内作业环节）") + private String personResponsible; + /** + * 钉钉流程号 + */ + @ColumnWidth(20) + @ExcelProperty("钉钉流程号") + private String processNumber; + /** + * 审核人 + */ + @ColumnWidth(20) + @ExcelProperty("审核人") + private String reviewedBy; + /** + * 审核时间 + */ + @ColumnWidth(20) + @ExcelProperty("审核时间") + private Date auditTime; + /** + * 财务入账时间 + */ + @ColumnWidth(20) + @ExcelProperty("财务入账时间") + private Date entryTime; + /** + * 操作人 + */ + @ColumnWidth(20) + @ExcelProperty("操作人") + private String operator; + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalPackageClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalPackageClient.java new file mode 100644 index 000000000..35070f175 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalPackageClient.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.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.service.IAftersalesAbnormalPackageService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常处理包件记录 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesAbnormalPackageClient implements IAftersalesAbnormalPackageClient { + + private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesAbnormalPackageService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesArbitrationOrderClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesArbitrationOrderClient.java new file mode 100644 index 000000000..59642a4d7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesArbitrationOrderClient.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.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.service.IAftersalesArbitrationOrderService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常工单仲裁申请单 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesArbitrationOrderClient implements IAftersalesArbitrationOrderClient { + + private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesArbitrationOrderService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCargoRecordsClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCargoRecordsClient.java new file mode 100644 index 000000000..5b0a26241 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCargoRecordsClient.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.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.service.IAftersalesCargoRecordsService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 货物催 — 查记录表 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesCargoRecordsClient implements IAftersalesCargoRecordsClient { + + private final IAftersalesCargoRecordsService aftersalesCargoRecordsService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesCargoRecordsService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecipientClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecipientClient.java new file mode 100644 index 000000000..d19451a66 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecipientClient.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.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.service.IAftersalesCompletionRecipientService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常工单完结处理结果受款方 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesCompletionRecipientClient implements IAftersalesCompletionRecipientClient { + + private final IAftersalesCompletionRecipientService aftersalesCompletionRecipientService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesCompletionRecipientService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecordClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecordClient.java new file mode 100644 index 000000000..771933438 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesCompletionRecordClient.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.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.service.IAftersalesCompletionRecordService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常工单完结处理结果赔款方 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesCompletionRecordClient implements IAftersalesCompletionRecordClient { + + private final IAftersalesCompletionRecordService aftersalesCompletionRecordService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesCompletionRecordService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesDecreaseImageClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesDecreaseImageClient.java new file mode 100644 index 000000000..41796aef1 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesDecreaseImageClient.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.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.service.IAftersalesDecreaseImageService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常运损图片（最少两张） Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesDecreaseImageClient implements IAftersalesDecreaseImageClient { + + private final IAftersalesDecreaseImageService aftersalesDecreaseImageService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesDecreaseImageService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesExchangeClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesExchangeClient.java new file mode 100644 index 000000000..2d3511b7a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesExchangeClient.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.AftersalesExchangeEntity; +import com.logpm.aftersales.service.IAftersalesExchangeService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 工单交流处理数据记录 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesExchangeClient implements IAftersalesExchangeClient { + + private final IAftersalesExchangeService aftersalesExchangeService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesExchangeService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesOvertimeFineClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesOvertimeFineClient.java new file mode 100644 index 000000000..480ec4560 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesOvertimeFineClient.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.AftersalesOvertimeFineEntity; +import com.logpm.aftersales.service.IAftersalesOvertimeFineService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常工单超时记录表 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesOvertimeFineClient implements IAftersalesOvertimeFineClient { + + private final IAftersalesOvertimeFineService aftersalesOvertimeFineService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesOvertimeFineService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessingResultsClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessingResultsClient.java new file mode 100644 index 000000000..3b226f951 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessingResultsClient.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.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.service.IAftersalesProcessingResultsService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常工单处理结果 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesProcessingResultsClient implements IAftersalesProcessingResultsClient { + + private final IAftersalesProcessingResultsService aftersalesProcessingResultsService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesProcessingResultsService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessorClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessorClient.java new file mode 100644 index 000000000..c337c1023 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesProcessorClient.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.AftersalesProcessorEntity; +import com.logpm.aftersales.service.IAftersalesProcessorService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常责任方和处理方 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesProcessorClient implements IAftersalesProcessorClient { + + private final IAftersalesProcessorService aftersalesProcessorService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesProcessorService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesReturnRecordClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesReturnRecordClient.java new file mode 100644 index 000000000..dc514c7b8 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesReturnRecordClient.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.AftersalesReturnRecordEntity; +import com.logpm.aftersales.service.IAftersalesReturnRecordService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 异常 工单打回记录 Feign实现类 + * + * @author cyz + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesReturnRecordClient implements IAftersalesReturnRecordClient { + + private final IAftersalesReturnRecordService aftersalesReturnRecordService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesReturnRecordService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesWorkOrderClient.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesWorkOrderClient.java new file mode 100644 index 000000000..11b216158 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesWorkOrderClient.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.AftersalesWorkOrderEntity; +import com.logpm.aftersales.service.IAftersalesWorkOrderService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 客服异常工单 Feign实现类 + * + * @author BladeX + * @since 2023-11-17 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class AftersalesWorkOrderClient implements IAftersalesWorkOrderClient { + + private final IAftersalesWorkOrderService aftersalesWorkOrderService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = aftersalesWorkOrderService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/launcher/AftersalesLauncherServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/launcher/AftersalesLauncherServiceImpl.java new file mode 100644 index 000000000..039ff016a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/launcher/AftersalesLauncherServiceImpl.java @@ -0,0 +1,60 @@ +/* + * 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.launcher; + +import org.springblade.core.auto.service.AutoService; +import org.springblade.core.launch.constant.NacosConstant; +import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; +import org.springframework.boot.builder.SpringApplicationBuilder; + +import java.util.Properties; + +/** + * 启动参数拓展 + * + * @author Chill + */ +@AutoService(LauncherService.class) +public class AftersalesLauncherServiceImpl implements LauncherService { + + @Override + public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { + Properties props = System.getProperties(); + // 开启多数据源 + PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); + // 指定注册配置信息 + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); + // 指定注册IP + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1"); + // 指定注册端口 + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200"); + // 自定义命名空间 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE); + // 自定义分组 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP); + } + + @Override + public int getOrder() { + return 20; + } +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java new file mode 100644 index 000000000..f22a4f61c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.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.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel; +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-11-17 + */ +public interface AftersalesAbnormalPackageMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesAbnormalPackage + * @return + */ + List selectAftersalesAbnormalPackagePage(IPage page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesAbnormalPackage(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml new file mode 100644 index 000000000..424306141 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.java new file mode 100644 index 000000000..cb477c1a1 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.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.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO; +import com.logpm.aftersales.excel.AftersalesArbitrationOrderExcel; +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-11-17 + */ +public interface AftersalesArbitrationOrderMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesArbitrationOrder + * @return + */ + List selectAftersalesArbitrationOrderPage(IPage page, AftersalesArbitrationOrderVO aftersalesArbitrationOrder); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesArbitrationOrder(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.xml new file mode 100644 index 000000000..a775ab7ca --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesArbitrationOrderMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.java new file mode 100644 index 000000000..5ed711849 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.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.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.vo.AftersalesCargoRecordsVO; +import com.logpm.aftersales.excel.AftersalesCargoRecordsExcel; +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-11-17 + */ +public interface AftersalesCargoRecordsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesCargoRecords + * @return + */ + List selectAftersalesCargoRecordsPage(IPage page, AftersalesCargoRecordsVO aftersalesCargoRecords); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCargoRecords(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.xml new file mode 100644 index 000000000..8a2ffbe3e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCargoRecordsMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.java new file mode 100644 index 000000000..85664a294 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.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.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecipientExcel; +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-11-17 + */ +public interface AftersalesCompletionRecipientMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesCompletionRecipient + * @return + */ + List selectAftersalesCompletionRecipientPage(IPage page, AftersalesCompletionRecipientVO aftersalesCompletionRecipient); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCompletionRecipient(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.xml new file mode 100644 index 000000000..6148e45fa --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecipientMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.java new file mode 100644 index 000000000..14edf8de6 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.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.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecordVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecordExcel; +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-11-17 + */ +public interface AftersalesCompletionRecordMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesCompletionRecord + * @return + */ + List selectAftersalesCompletionRecordPage(IPage page, AftersalesCompletionRecordVO aftersalesCompletionRecord); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCompletionRecord(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml new file mode 100644 index 000000000..78b5705f1 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCompletionRecordMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.java new file mode 100644 index 000000000..d70149624 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.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.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.vo.AftersalesDecreaseImageVO; +import com.logpm.aftersales.excel.AftersalesDecreaseImageExcel; +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-11-17 + */ +public interface AftersalesDecreaseImageMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesDecreaseImage + * @return + */ + List selectAftersalesDecreaseImagePage(IPage page, AftersalesDecreaseImageVO aftersalesDecreaseImage); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesDecreaseImage(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.xml new file mode 100644 index 000000000..22e425445 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesDecreaseImageMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.java new file mode 100644 index 000000000..43e71bdad --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.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.AftersalesExchangeEntity; +import com.logpm.aftersales.vo.AftersalesExchangeVO; +import com.logpm.aftersales.excel.AftersalesExchangeExcel; +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-11-17 + */ +public interface AftersalesExchangeMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesExchange + * @return + */ + List selectAftersalesExchangePage(IPage page, AftersalesExchangeVO aftersalesExchange); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesExchange(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.xml new file mode 100644 index 000000000..ea0bd28a8 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesExchangeMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.java new file mode 100644 index 000000000..d4a18d14c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.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.AftersalesOvertimeFineEntity; +import com.logpm.aftersales.vo.AftersalesOvertimeFineVO; +import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel; +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-11-17 + */ +public interface AftersalesOvertimeFineMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesOvertimeFine + * @return + */ + List selectAftersalesOvertimeFinePage(IPage page, AftersalesOvertimeFineVO aftersalesOvertimeFine); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesOvertimeFine(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml new file mode 100644 index 000000000..2cc6a66c5 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.java new file mode 100644 index 000000000..853476303 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.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.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.vo.AftersalesProcessingResultsVO; +import com.logpm.aftersales.excel.AftersalesProcessingResultsExcel; +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-11-17 + */ +public interface AftersalesProcessingResultsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesProcessingResults + * @return + */ + List selectAftersalesProcessingResultsPage(IPage page, AftersalesProcessingResultsVO aftersalesProcessingResults); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesProcessingResults(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.xml new file mode 100644 index 000000000..07ef4057b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessingResultsMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.java new file mode 100644 index 000000000..d3c633bb9 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.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.AftersalesProcessorEntity; +import com.logpm.aftersales.vo.AftersalesProcessorVO; +import com.logpm.aftersales.excel.AftersalesProcessorExcel; +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-11-17 + */ +public interface AftersalesProcessorMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesProcessor + * @return + */ + List selectAftersalesProcessorPage(IPage page, AftersalesProcessorVO aftersalesProcessor); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesProcessor(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.xml new file mode 100644 index 000000000..f2f510059 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesProcessorMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.java new file mode 100644 index 000000000..492d64447 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.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.AftersalesReturnRecordEntity; +import com.logpm.aftersales.vo.AftersalesReturnRecordVO; +import com.logpm.aftersales.excel.AftersalesReturnRecordExcel; +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-11-17 + */ +public interface AftersalesReturnRecordMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesReturnRecord + * @return + */ + List selectAftersalesReturnRecordPage(IPage page, AftersalesReturnRecordVO aftersalesReturnRecord); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesReturnRecord(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.xml new file mode 100644 index 000000000..eb82caa74 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesReturnRecordMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java new file mode 100644 index 000000000..166a1b17f --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.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.AftersalesWorkOrderEntity; +import com.logpm.aftersales.vo.AftersalesWorkOrderVO; +import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; +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 BladeX + * @since 2023-11-17 + */ +public interface AftersalesWorkOrderMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param aftersalesWorkOrder + * @return + */ + List selectAftersalesWorkOrderPage(IPage page, AftersalesWorkOrderVO aftersalesWorkOrder); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesWorkOrder(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml new file mode 100644 index 000000000..b206b7966 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/prop/AftersalesProperties.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/prop/AftersalesProperties.java new file mode 100644 index 000000000..2bcb0933e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/prop/AftersalesProperties.java @@ -0,0 +1,21 @@ +package com.logpm.aftersales.prop; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * FactoryProperties + * + * @author pref + */ +@Data +@ConfigurationProperties(prefix = "logpm") +public class AftersalesProperties { + /** + * 名称 + */ + private String name; + + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java new file mode 100644 index 000000000..7f7e0c350 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.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.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常处理包件记录 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesAbnormalPackageService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesAbnormalPackage + * @return + */ + IPage selectAftersalesAbnormalPackagePage(IPage page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesAbnormalPackage(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesArbitrationOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesArbitrationOrderService.java new file mode 100644 index 000000000..54d383e24 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesArbitrationOrderService.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.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO; +import com.logpm.aftersales.excel.AftersalesArbitrationOrderExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常工单仲裁申请单 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesArbitrationOrderService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesArbitrationOrder + * @return + */ + IPage selectAftersalesArbitrationOrderPage(IPage page, AftersalesArbitrationOrderVO aftersalesArbitrationOrder); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesArbitrationOrder(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCargoRecordsService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCargoRecordsService.java new file mode 100644 index 000000000..df443dc2e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCargoRecordsService.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.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.vo.AftersalesCargoRecordsVO; +import com.logpm.aftersales.excel.AftersalesCargoRecordsExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 货物催 — 查记录表 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesCargoRecordsService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesCargoRecords + * @return + */ + IPage selectAftersalesCargoRecordsPage(IPage page, AftersalesCargoRecordsVO aftersalesCargoRecords); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCargoRecords(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecipientService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecipientService.java new file mode 100644 index 000000000..325699e1a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecipientService.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.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecipientExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常工单完结处理结果受款方 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesCompletionRecipientService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesCompletionRecipient + * @return + */ + IPage selectAftersalesCompletionRecipientPage(IPage page, AftersalesCompletionRecipientVO aftersalesCompletionRecipient); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCompletionRecipient(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.java new file mode 100644 index 000000000..989d9c4fe --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesCompletionRecordService.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.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecordVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecordExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常工单完结处理结果赔款方 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesCompletionRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesCompletionRecord + * @return + */ + IPage selectAftersalesCompletionRecordPage(IPage page, AftersalesCompletionRecordVO aftersalesCompletionRecord); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesCompletionRecord(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesDecreaseImageService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesDecreaseImageService.java new file mode 100644 index 000000000..095714054 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesDecreaseImageService.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.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.vo.AftersalesDecreaseImageVO; +import com.logpm.aftersales.excel.AftersalesDecreaseImageExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常运损图片（最少两张） 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesDecreaseImageService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesDecreaseImage + * @return + */ + IPage selectAftersalesDecreaseImagePage(IPage page, AftersalesDecreaseImageVO aftersalesDecreaseImage); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesDecreaseImage(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesExchangeService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesExchangeService.java new file mode 100644 index 000000000..f4e359da7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesExchangeService.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.AftersalesExchangeEntity; +import com.logpm.aftersales.vo.AftersalesExchangeVO; +import com.logpm.aftersales.excel.AftersalesExchangeExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 工单交流处理数据记录 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesExchangeService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesExchange + * @return + */ + IPage selectAftersalesExchangePage(IPage page, AftersalesExchangeVO aftersalesExchange); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesExchange(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.java new file mode 100644 index 000000000..e07f3eff4 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesOvertimeFineService.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.AftersalesOvertimeFineEntity; +import com.logpm.aftersales.vo.AftersalesOvertimeFineVO; +import com.logpm.aftersales.excel.AftersalesOvertimeFineExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常工单超时记录表 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesOvertimeFineService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesOvertimeFine + * @return + */ + IPage selectAftersalesOvertimeFinePage(IPage page, AftersalesOvertimeFineVO aftersalesOvertimeFine); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesOvertimeFine(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessingResultsService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessingResultsService.java new file mode 100644 index 000000000..381aaea9d --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessingResultsService.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.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.vo.AftersalesProcessingResultsVO; +import com.logpm.aftersales.excel.AftersalesProcessingResultsExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常工单处理结果 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesProcessingResultsService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesProcessingResults + * @return + */ + IPage selectAftersalesProcessingResultsPage(IPage page, AftersalesProcessingResultsVO aftersalesProcessingResults); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesProcessingResults(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessorService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessorService.java new file mode 100644 index 000000000..65cf2cd6b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesProcessorService.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.AftersalesProcessorEntity; +import com.logpm.aftersales.vo.AftersalesProcessorVO; +import com.logpm.aftersales.excel.AftersalesProcessorExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常责任方和处理方 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesProcessorService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesProcessor + * @return + */ + IPage selectAftersalesProcessorPage(IPage page, AftersalesProcessorVO aftersalesProcessor); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesProcessor(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesReturnRecordService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesReturnRecordService.java new file mode 100644 index 000000000..b447d132b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesReturnRecordService.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.AftersalesReturnRecordEntity; +import com.logpm.aftersales.vo.AftersalesReturnRecordVO; +import com.logpm.aftersales.excel.AftersalesReturnRecordExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 异常 工单打回记录 服务类 + * + * @author cyz + * @since 2023-11-17 + */ +public interface IAftersalesReturnRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesReturnRecord + * @return + */ + IPage selectAftersalesReturnRecordPage(IPage page, AftersalesReturnRecordVO aftersalesReturnRecord); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesReturnRecord(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java new file mode 100644 index 000000000..77313edec --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.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.AftersalesWorkOrderEntity; +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 java.util.List; + +/** + * 客服异常工单 服务类 + * + * @author BladeX + * @since 2023-11-17 + */ +public interface IAftersalesWorkOrderService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param aftersalesWorkOrder + * @return + */ + IPage selectAftersalesWorkOrderPage(IPage page, AftersalesWorkOrderVO aftersalesWorkOrder); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportAftersalesWorkOrder(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java new file mode 100644 index 000000000..c9ea9df7c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.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.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel; +import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper; +import com.logpm.aftersales.service.IAftersalesAbnormalPackageService; +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-11-17 + */ +@Service +public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl implements IAftersalesAbnormalPackageService { + + @Override + public IPage selectAftersalesAbnormalPackagePage(IPage page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage) { + return page.setRecords(baseMapper.selectAftersalesAbnormalPackagePage(page, aftersalesAbnormalPackage)); + } + + + @Override + public List exportAftersalesAbnormalPackage(Wrapper queryWrapper) { + List aftersalesAbnormalPackageList = baseMapper.exportAftersalesAbnormalPackage(queryWrapper); + //aftersalesAbnormalPackageList.forEach(aftersalesAbnormalPackage -> { + // aftersalesAbnormalPackage.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesAbnormalPackage.getType())); + //}); + return aftersalesAbnormalPackageList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesArbitrationOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesArbitrationOrderServiceImpl.java new file mode 100644 index 000000000..73a57b3d7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesArbitrationOrderServiceImpl.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.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO; +import com.logpm.aftersales.excel.AftersalesArbitrationOrderExcel; +import com.logpm.aftersales.mapper.AftersalesArbitrationOrderMapper; +import com.logpm.aftersales.service.IAftersalesArbitrationOrderService; +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-11-17 + */ +@Service +public class AftersalesArbitrationOrderServiceImpl extends BaseServiceImpl implements IAftersalesArbitrationOrderService { + + @Override + public IPage selectAftersalesArbitrationOrderPage(IPage page, AftersalesArbitrationOrderVO aftersalesArbitrationOrder) { + return page.setRecords(baseMapper.selectAftersalesArbitrationOrderPage(page, aftersalesArbitrationOrder)); + } + + + @Override + public List exportAftersalesArbitrationOrder(Wrapper queryWrapper) { + List aftersalesArbitrationOrderList = baseMapper.exportAftersalesArbitrationOrder(queryWrapper); + //aftersalesArbitrationOrderList.forEach(aftersalesArbitrationOrder -> { + // aftersalesArbitrationOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesArbitrationOrder.getType())); + //}); + return aftersalesArbitrationOrderList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCargoRecordsServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCargoRecordsServiceImpl.java new file mode 100644 index 000000000..485148e7f --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCargoRecordsServiceImpl.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.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.vo.AftersalesCargoRecordsVO; +import com.logpm.aftersales.excel.AftersalesCargoRecordsExcel; +import com.logpm.aftersales.mapper.AftersalesCargoRecordsMapper; +import com.logpm.aftersales.service.IAftersalesCargoRecordsService; +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-11-17 + */ +@Service +public class AftersalesCargoRecordsServiceImpl extends BaseServiceImpl implements IAftersalesCargoRecordsService { + + @Override + public IPage selectAftersalesCargoRecordsPage(IPage page, AftersalesCargoRecordsVO aftersalesCargoRecords) { + return page.setRecords(baseMapper.selectAftersalesCargoRecordsPage(page, aftersalesCargoRecords)); + } + + + @Override + public List exportAftersalesCargoRecords(Wrapper queryWrapper) { + List aftersalesCargoRecordsList = baseMapper.exportAftersalesCargoRecords(queryWrapper); + //aftersalesCargoRecordsList.forEach(aftersalesCargoRecords -> { + // aftersalesCargoRecords.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesCargoRecords.getType())); + //}); + return aftersalesCargoRecordsList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecipientServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecipientServiceImpl.java new file mode 100644 index 000000000..922061bdc --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecipientServiceImpl.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.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecipientExcel; +import com.logpm.aftersales.mapper.AftersalesCompletionRecipientMapper; +import com.logpm.aftersales.service.IAftersalesCompletionRecipientService; +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-11-17 + */ +@Service +public class AftersalesCompletionRecipientServiceImpl extends BaseServiceImpl implements IAftersalesCompletionRecipientService { + + @Override + public IPage selectAftersalesCompletionRecipientPage(IPage page, AftersalesCompletionRecipientVO aftersalesCompletionRecipient) { + return page.setRecords(baseMapper.selectAftersalesCompletionRecipientPage(page, aftersalesCompletionRecipient)); + } + + + @Override + public List exportAftersalesCompletionRecipient(Wrapper queryWrapper) { + List aftersalesCompletionRecipientList = baseMapper.exportAftersalesCompletionRecipient(queryWrapper); + //aftersalesCompletionRecipientList.forEach(aftersalesCompletionRecipient -> { + // aftersalesCompletionRecipient.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesCompletionRecipient.getType())); + //}); + return aftersalesCompletionRecipientList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecordServiceImpl.java new file mode 100644 index 000000000..6e0bf7a08 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesCompletionRecordServiceImpl.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.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecordVO; +import com.logpm.aftersales.excel.AftersalesCompletionRecordExcel; +import com.logpm.aftersales.mapper.AftersalesCompletionRecordMapper; +import com.logpm.aftersales.service.IAftersalesCompletionRecordService; +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-11-17 + */ +@Service +public class AftersalesCompletionRecordServiceImpl extends BaseServiceImpl implements IAftersalesCompletionRecordService { + + @Override + public IPage selectAftersalesCompletionRecordPage(IPage page, AftersalesCompletionRecordVO aftersalesCompletionRecord) { + return page.setRecords(baseMapper.selectAftersalesCompletionRecordPage(page, aftersalesCompletionRecord)); + } + + + @Override + public List exportAftersalesCompletionRecord(Wrapper queryWrapper) { + List aftersalesCompletionRecordList = baseMapper.exportAftersalesCompletionRecord(queryWrapper); + //aftersalesCompletionRecordList.forEach(aftersalesCompletionRecord -> { + // aftersalesCompletionRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesCompletionRecord.getType())); + //}); + return aftersalesCompletionRecordList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesDecreaseImageServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesDecreaseImageServiceImpl.java new file mode 100644 index 000000000..88ba1a232 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesDecreaseImageServiceImpl.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.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.vo.AftersalesDecreaseImageVO; +import com.logpm.aftersales.excel.AftersalesDecreaseImageExcel; +import com.logpm.aftersales.mapper.AftersalesDecreaseImageMapper; +import com.logpm.aftersales.service.IAftersalesDecreaseImageService; +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-11-17 + */ +@Service +public class AftersalesDecreaseImageServiceImpl extends BaseServiceImpl implements IAftersalesDecreaseImageService { + + @Override + public IPage selectAftersalesDecreaseImagePage(IPage page, AftersalesDecreaseImageVO aftersalesDecreaseImage) { + return page.setRecords(baseMapper.selectAftersalesDecreaseImagePage(page, aftersalesDecreaseImage)); + } + + + @Override + public List exportAftersalesDecreaseImage(Wrapper queryWrapper) { + List aftersalesDecreaseImageList = baseMapper.exportAftersalesDecreaseImage(queryWrapper); + //aftersalesDecreaseImageList.forEach(aftersalesDecreaseImage -> { + // aftersalesDecreaseImage.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesDecreaseImage.getType())); + //}); + return aftersalesDecreaseImageList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java new file mode 100644 index 000000000..405b446a6 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.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.AftersalesExchangeEntity; +import com.logpm.aftersales.vo.AftersalesExchangeVO; +import com.logpm.aftersales.excel.AftersalesExchangeExcel; +import com.logpm.aftersales.mapper.AftersalesExchangeMapper; +import com.logpm.aftersales.service.IAftersalesExchangeService; +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-11-17 + */ +@Service +public class AftersalesExchangeServiceImpl extends BaseServiceImpl implements IAftersalesExchangeService { + + @Override + public IPage selectAftersalesExchangePage(IPage page, AftersalesExchangeVO aftersalesExchange) { + return page.setRecords(baseMapper.selectAftersalesExchangePage(page, aftersalesExchange)); + } + + + @Override + public List exportAftersalesExchange(Wrapper queryWrapper) { + List aftersalesExchangeList = baseMapper.exportAftersalesExchange(queryWrapper); + //aftersalesExchangeList.forEach(aftersalesExchange -> { + // aftersalesExchange.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesExchange.getType())); + //}); + return aftersalesExchangeList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.java new file mode 100644 index 000000000..b73b90c55 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesOvertimeFineServiceImpl.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.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.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-11-17 + */ +@Service +public class AftersalesOvertimeFineServiceImpl extends BaseServiceImpl implements IAftersalesOvertimeFineService { + + @Override + public IPage selectAftersalesOvertimeFinePage(IPage page, AftersalesOvertimeFineVO aftersalesOvertimeFine) { + return page.setRecords(baseMapper.selectAftersalesOvertimeFinePage(page, aftersalesOvertimeFine)); + } + + + @Override + public List exportAftersalesOvertimeFine(Wrapper queryWrapper) { + List aftersalesOvertimeFineList = baseMapper.exportAftersalesOvertimeFine(queryWrapper); + //aftersalesOvertimeFineList.forEach(aftersalesOvertimeFine -> { + // aftersalesOvertimeFine.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesOvertimeFine.getType())); + //}); + return aftersalesOvertimeFineList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java new file mode 100644 index 000000000..c58a13da8 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.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.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.vo.AftersalesProcessingResultsVO; +import com.logpm.aftersales.excel.AftersalesProcessingResultsExcel; +import com.logpm.aftersales.mapper.AftersalesProcessingResultsMapper; +import com.logpm.aftersales.service.IAftersalesProcessingResultsService; +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-11-17 + */ +@Service +public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl implements IAftersalesProcessingResultsService { + + @Override + public IPage selectAftersalesProcessingResultsPage(IPage page, AftersalesProcessingResultsVO aftersalesProcessingResults) { + return page.setRecords(baseMapper.selectAftersalesProcessingResultsPage(page, aftersalesProcessingResults)); + } + + + @Override + public List exportAftersalesProcessingResults(Wrapper queryWrapper) { + List aftersalesProcessingResultsList = baseMapper.exportAftersalesProcessingResults(queryWrapper); + //aftersalesProcessingResultsList.forEach(aftersalesProcessingResults -> { + // aftersalesProcessingResults.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesProcessingResults.getType())); + //}); + return aftersalesProcessingResultsList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessorServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessorServiceImpl.java new file mode 100644 index 000000000..fd9b128f7 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessorServiceImpl.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.AftersalesProcessorEntity; +import com.logpm.aftersales.vo.AftersalesProcessorVO; +import com.logpm.aftersales.excel.AftersalesProcessorExcel; +import com.logpm.aftersales.mapper.AftersalesProcessorMapper; +import com.logpm.aftersales.service.IAftersalesProcessorService; +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-11-17 + */ +@Service +public class AftersalesProcessorServiceImpl extends BaseServiceImpl implements IAftersalesProcessorService { + + @Override + public IPage selectAftersalesProcessorPage(IPage page, AftersalesProcessorVO aftersalesProcessor) { + return page.setRecords(baseMapper.selectAftersalesProcessorPage(page, aftersalesProcessor)); + } + + + @Override + public List exportAftersalesProcessor(Wrapper queryWrapper) { + List aftersalesProcessorList = baseMapper.exportAftersalesProcessor(queryWrapper); + //aftersalesProcessorList.forEach(aftersalesProcessor -> { + // aftersalesProcessor.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesProcessor.getType())); + //}); + return aftersalesProcessorList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java new file mode 100644 index 000000000..5d913f53d --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.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.AftersalesReturnRecordEntity; +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 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-11-17 + */ +@Service +public class AftersalesReturnRecordServiceImpl extends BaseServiceImpl implements IAftersalesReturnRecordService { + + @Override + public IPage selectAftersalesReturnRecordPage(IPage page, AftersalesReturnRecordVO aftersalesReturnRecord) { + return page.setRecords(baseMapper.selectAftersalesReturnRecordPage(page, aftersalesReturnRecord)); + } + + + @Override + public List exportAftersalesReturnRecord(Wrapper queryWrapper) { + List aftersalesReturnRecordList = baseMapper.exportAftersalesReturnRecord(queryWrapper); + //aftersalesReturnRecordList.forEach(aftersalesReturnRecord -> { + // aftersalesReturnRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesReturnRecord.getType())); + //}); + return aftersalesReturnRecordList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java new file mode 100644 index 000000000..903871926 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.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.AftersalesWorkOrderEntity; +import com.logpm.aftersales.vo.AftersalesWorkOrderVO; +import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; +import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper; +import com.logpm.aftersales.service.IAftersalesWorkOrderService; +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 BladeX + * @since 2023-11-17 + */ +@Service +public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl implements IAftersalesWorkOrderService { + + @Override + public IPage selectAftersalesWorkOrderPage(IPage page, AftersalesWorkOrderVO aftersalesWorkOrder) { + return page.setRecords(baseMapper.selectAftersalesWorkOrderPage(page, aftersalesWorkOrder)); + } + + + @Override + public List exportAftersalesWorkOrder(Wrapper queryWrapper) { + List aftersalesWorkOrderList = baseMapper.exportAftersalesWorkOrder(queryWrapper); + //aftersalesWorkOrderList.forEach(aftersalesWorkOrder -> { + // aftersalesWorkOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesWorkOrder.getType())); + //}); + return aftersalesWorkOrderList; + } + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesAbnormalPackageWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesAbnormalPackageWrapper.java new file mode 100644 index 000000000..432e8f22a --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesAbnormalPackageWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; +import java.util.Objects; + +/** + * 异常处理包件记录 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesAbnormalPackageWrapper extends BaseEntityWrapper { + + public static AftersalesAbnormalPackageWrapper build() { + return new AftersalesAbnormalPackageWrapper(); + } + + @Override + public AftersalesAbnormalPackageVO entityVO(AftersalesAbnormalPackageEntity aftersalesAbnormalPackage) { + AftersalesAbnormalPackageVO aftersalesAbnormalPackageVO = Objects.requireNonNull(BeanUtil.copy(aftersalesAbnormalPackage, AftersalesAbnormalPackageVO.class)); + + //User createUser = UserCache.getUser(aftersalesAbnormalPackage.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesAbnormalPackage.getUpdateUser()); + //aftersalesAbnormalPackageVO.setCreateUserName(createUser.getName()); + //aftersalesAbnormalPackageVO.setUpdateUserName(updateUser.getName()); + + return aftersalesAbnormalPackageVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesArbitrationOrderWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesArbitrationOrderWrapper.java new file mode 100644 index 000000000..cc40770a0 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesArbitrationOrderWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesArbitrationOrderEntity; +import com.logpm.aftersales.vo.AftersalesArbitrationOrderVO; +import java.util.Objects; + +/** + * 异常工单仲裁申请单 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesArbitrationOrderWrapper extends BaseEntityWrapper { + + public static AftersalesArbitrationOrderWrapper build() { + return new AftersalesArbitrationOrderWrapper(); + } + + @Override + public AftersalesArbitrationOrderVO entityVO(AftersalesArbitrationOrderEntity aftersalesArbitrationOrder) { + AftersalesArbitrationOrderVO aftersalesArbitrationOrderVO = Objects.requireNonNull(BeanUtil.copy(aftersalesArbitrationOrder, AftersalesArbitrationOrderVO.class)); + + //User createUser = UserCache.getUser(aftersalesArbitrationOrder.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesArbitrationOrder.getUpdateUser()); + //aftersalesArbitrationOrderVO.setCreateUserName(createUser.getName()); + //aftersalesArbitrationOrderVO.setUpdateUserName(updateUser.getName()); + + return aftersalesArbitrationOrderVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCargoRecordsWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCargoRecordsWrapper.java new file mode 100644 index 000000000..e5cf1f75e --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCargoRecordsWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesCargoRecordsEntity; +import com.logpm.aftersales.vo.AftersalesCargoRecordsVO; +import java.util.Objects; + +/** + * 货物催 — 查记录表 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesCargoRecordsWrapper extends BaseEntityWrapper { + + public static AftersalesCargoRecordsWrapper build() { + return new AftersalesCargoRecordsWrapper(); + } + + @Override + public AftersalesCargoRecordsVO entityVO(AftersalesCargoRecordsEntity aftersalesCargoRecords) { + AftersalesCargoRecordsVO aftersalesCargoRecordsVO = Objects.requireNonNull(BeanUtil.copy(aftersalesCargoRecords, AftersalesCargoRecordsVO.class)); + + //User createUser = UserCache.getUser(aftersalesCargoRecords.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesCargoRecords.getUpdateUser()); + //aftersalesCargoRecordsVO.setCreateUserName(createUser.getName()); + //aftersalesCargoRecordsVO.setUpdateUserName(updateUser.getName()); + + return aftersalesCargoRecordsVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecipientWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecipientWrapper.java new file mode 100644 index 000000000..452e2184b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecipientWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecipientVO; +import java.util.Objects; + +/** + * 异常工单完结处理结果受款方 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesCompletionRecipientWrapper extends BaseEntityWrapper { + + public static AftersalesCompletionRecipientWrapper build() { + return new AftersalesCompletionRecipientWrapper(); + } + + @Override + public AftersalesCompletionRecipientVO entityVO(AftersalesCompletionRecipientEntity aftersalesCompletionRecipient) { + AftersalesCompletionRecipientVO aftersalesCompletionRecipientVO = Objects.requireNonNull(BeanUtil.copy(aftersalesCompletionRecipient, AftersalesCompletionRecipientVO.class)); + + //User createUser = UserCache.getUser(aftersalesCompletionRecipient.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesCompletionRecipient.getUpdateUser()); + //aftersalesCompletionRecipientVO.setCreateUserName(createUser.getName()); + //aftersalesCompletionRecipientVO.setUpdateUserName(updateUser.getName()); + + return aftersalesCompletionRecipientVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecordWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecordWrapper.java new file mode 100644 index 000000000..77601c79b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesCompletionRecordWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesCompletionRecordEntity; +import com.logpm.aftersales.vo.AftersalesCompletionRecordVO; +import java.util.Objects; + +/** + * 异常工单完结处理结果赔款方 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesCompletionRecordWrapper extends BaseEntityWrapper { + + public static AftersalesCompletionRecordWrapper build() { + return new AftersalesCompletionRecordWrapper(); + } + + @Override + public AftersalesCompletionRecordVO entityVO(AftersalesCompletionRecordEntity aftersalesCompletionRecord) { + AftersalesCompletionRecordVO aftersalesCompletionRecordVO = Objects.requireNonNull(BeanUtil.copy(aftersalesCompletionRecord, AftersalesCompletionRecordVO.class)); + + //User createUser = UserCache.getUser(aftersalesCompletionRecord.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesCompletionRecord.getUpdateUser()); + //aftersalesCompletionRecordVO.setCreateUserName(createUser.getName()); + //aftersalesCompletionRecordVO.setUpdateUserName(updateUser.getName()); + + return aftersalesCompletionRecordVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesDecreaseImageWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesDecreaseImageWrapper.java new file mode 100644 index 000000000..fdd8d435b --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesDecreaseImageWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.vo.AftersalesDecreaseImageVO; +import java.util.Objects; + +/** + * 异常运损图片（最少两张） 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesDecreaseImageWrapper extends BaseEntityWrapper { + + public static AftersalesDecreaseImageWrapper build() { + return new AftersalesDecreaseImageWrapper(); + } + + @Override + public AftersalesDecreaseImageVO entityVO(AftersalesDecreaseImageEntity aftersalesDecreaseImage) { + AftersalesDecreaseImageVO aftersalesDecreaseImageVO = Objects.requireNonNull(BeanUtil.copy(aftersalesDecreaseImage, AftersalesDecreaseImageVO.class)); + + //User createUser = UserCache.getUser(aftersalesDecreaseImage.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesDecreaseImage.getUpdateUser()); + //aftersalesDecreaseImageVO.setCreateUserName(createUser.getName()); + //aftersalesDecreaseImageVO.setUpdateUserName(updateUser.getName()); + + return aftersalesDecreaseImageVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesExchangeWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesExchangeWrapper.java new file mode 100644 index 000000000..d6710318f --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesExchangeWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesExchangeEntity; +import com.logpm.aftersales.vo.AftersalesExchangeVO; +import java.util.Objects; + +/** + * 工单交流处理数据记录 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesExchangeWrapper extends BaseEntityWrapper { + + public static AftersalesExchangeWrapper build() { + return new AftersalesExchangeWrapper(); + } + + @Override + public AftersalesExchangeVO entityVO(AftersalesExchangeEntity aftersalesExchange) { + AftersalesExchangeVO aftersalesExchangeVO = Objects.requireNonNull(BeanUtil.copy(aftersalesExchange, AftersalesExchangeVO.class)); + + //User createUser = UserCache.getUser(aftersalesExchange.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesExchange.getUpdateUser()); + //aftersalesExchangeVO.setCreateUserName(createUser.getName()); + //aftersalesExchangeVO.setUpdateUserName(updateUser.getName()); + + return aftersalesExchangeVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesOvertimeFineWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesOvertimeFineWrapper.java new file mode 100644 index 000000000..c3d555bd6 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesOvertimeFineWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesOvertimeFineEntity; +import com.logpm.aftersales.vo.AftersalesOvertimeFineVO; +import java.util.Objects; + +/** + * 异常工单超时记录表 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesOvertimeFineWrapper extends BaseEntityWrapper { + + public static AftersalesOvertimeFineWrapper build() { + return new AftersalesOvertimeFineWrapper(); + } + + @Override + public AftersalesOvertimeFineVO entityVO(AftersalesOvertimeFineEntity aftersalesOvertimeFine) { + AftersalesOvertimeFineVO aftersalesOvertimeFineVO = Objects.requireNonNull(BeanUtil.copy(aftersalesOvertimeFine, AftersalesOvertimeFineVO.class)); + + //User createUser = UserCache.getUser(aftersalesOvertimeFine.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesOvertimeFine.getUpdateUser()); + //aftersalesOvertimeFineVO.setCreateUserName(createUser.getName()); + //aftersalesOvertimeFineVO.setUpdateUserName(updateUser.getName()); + + return aftersalesOvertimeFineVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessingResultsWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessingResultsWrapper.java new file mode 100644 index 000000000..74718fbf9 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessingResultsWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity; +import com.logpm.aftersales.vo.AftersalesProcessingResultsVO; +import java.util.Objects; + +/** + * 异常工单处理结果 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesProcessingResultsWrapper extends BaseEntityWrapper { + + public static AftersalesProcessingResultsWrapper build() { + return new AftersalesProcessingResultsWrapper(); + } + + @Override + public AftersalesProcessingResultsVO entityVO(AftersalesProcessingResultsEntity aftersalesProcessingResults) { + AftersalesProcessingResultsVO aftersalesProcessingResultsVO = Objects.requireNonNull(BeanUtil.copy(aftersalesProcessingResults, AftersalesProcessingResultsVO.class)); + + //User createUser = UserCache.getUser(aftersalesProcessingResults.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesProcessingResults.getUpdateUser()); + //aftersalesProcessingResultsVO.setCreateUserName(createUser.getName()); + //aftersalesProcessingResultsVO.setUpdateUserName(updateUser.getName()); + + return aftersalesProcessingResultsVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessorWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessorWrapper.java new file mode 100644 index 000000000..2d7f0f832 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesProcessorWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesProcessorEntity; +import com.logpm.aftersales.vo.AftersalesProcessorVO; +import java.util.Objects; + +/** + * 异常责任方和处理方 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesProcessorWrapper extends BaseEntityWrapper { + + public static AftersalesProcessorWrapper build() { + return new AftersalesProcessorWrapper(); + } + + @Override + public AftersalesProcessorVO entityVO(AftersalesProcessorEntity aftersalesProcessor) { + AftersalesProcessorVO aftersalesProcessorVO = Objects.requireNonNull(BeanUtil.copy(aftersalesProcessor, AftersalesProcessorVO.class)); + + //User createUser = UserCache.getUser(aftersalesProcessor.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesProcessor.getUpdateUser()); + //aftersalesProcessorVO.setCreateUserName(createUser.getName()); + //aftersalesProcessorVO.setUpdateUserName(updateUser.getName()); + + return aftersalesProcessorVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesReturnRecordWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesReturnRecordWrapper.java new file mode 100644 index 000000000..45fd60d9c --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesReturnRecordWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesReturnRecordEntity; +import com.logpm.aftersales.vo.AftersalesReturnRecordVO; +import java.util.Objects; + +/** + * 异常 工单打回记录 包装类,返回视图层所需的字段 + * + * @author cyz + * @since 2023-11-17 + */ +public class AftersalesReturnRecordWrapper extends BaseEntityWrapper { + + public static AftersalesReturnRecordWrapper build() { + return new AftersalesReturnRecordWrapper(); + } + + @Override + public AftersalesReturnRecordVO entityVO(AftersalesReturnRecordEntity aftersalesReturnRecord) { + AftersalesReturnRecordVO aftersalesReturnRecordVO = Objects.requireNonNull(BeanUtil.copy(aftersalesReturnRecord, AftersalesReturnRecordVO.class)); + + //User createUser = UserCache.getUser(aftersalesReturnRecord.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesReturnRecord.getUpdateUser()); + //aftersalesReturnRecordVO.setCreateUserName(createUser.getName()); + //aftersalesReturnRecordVO.setUpdateUserName(updateUser.getName()); + + return aftersalesReturnRecordVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesWorkOrderWrapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesWorkOrderWrapper.java new file mode 100644 index 000000000..15d4cc7b0 --- /dev/null +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesWorkOrderWrapper.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.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; +import com.logpm.aftersales.vo.AftersalesWorkOrderVO; +import java.util.Objects; + +/** + * 客服异常工单 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2023-11-17 + */ +public class AftersalesWorkOrderWrapper extends BaseEntityWrapper { + + public static AftersalesWorkOrderWrapper build() { + return new AftersalesWorkOrderWrapper(); + } + + @Override + public AftersalesWorkOrderVO entityVO(AftersalesWorkOrderEntity aftersalesWorkOrder) { + AftersalesWorkOrderVO aftersalesWorkOrderVO = Objects.requireNonNull(BeanUtil.copy(aftersalesWorkOrder, AftersalesWorkOrderVO.class)); + + //User createUser = UserCache.getUser(aftersalesWorkOrder.getCreateUser()); + //User updateUser = UserCache.getUser(aftersalesWorkOrder.getUpdateUser()); + //aftersalesWorkOrderVO.setCreateUserName(createUser.getName()); + //aftersalesWorkOrderVO.setUpdateUserName(updateUser.getName()); + + return aftersalesWorkOrderVO; + } + + +} diff --git a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml b/blade-service/logpm-aftersales/src/main/resources/application-dev.yml index ffd7f1130..320f33260 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-dev.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 8200 + port: 8799 #数据源配置 #spring: @@ -30,15 +30,15 @@ spring: validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} + url: ${blade.datasource.aftersales.master.url} + username: ${blade.datasource.aftersales.master.username} + password: ${blade.datasource.aftersales.master.password} slave: druid: #独立校验配置 validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} + url: ${blade.datasource.aftersales.slave.url} + username: ${blade.datasource.aftersales.slave.username} + password: ${blade.datasource.aftersales.slave.password} diff --git a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml index a0ca7ca85..872b681ac 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml @@ -22,10 +22,10 @@ spring: primary: master datasource: master: - url: ${blade.datasource.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} + url: ${blade.datasource.aftersales.master.url} + username: ${blade.datasource.aftersales.master.username} + password: ${blade.datasource.aftersales.master.password} slave: - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} + url: ${blade.datasource.aftersales.slave.url} + username: ${blade.datasource.aftersales.slave.username} + password: ${blade.datasource.aftersales.slave.password} diff --git a/blade-service/logpm-aftersales/src/main/resources/application-test.yml b/blade-service/logpm-aftersales/src/main/resources/application-test.yml index 81ad99d0b..73bda02e0 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml @@ -22,10 +22,10 @@ spring: primary: master datasource: master: - url: ${blade.datasource.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} + url: ${blade.datasource.aftersales.master.url} + username: ${blade.datasource.aftersales.master.username} + password: ${blade.datasource.aftersales.master.password} slave: - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} + url: ${blade.datasource.aftersales.slave.url} + username: ${blade.datasource.aftersales.slave.username} + password: ${blade.datasource.aftersales.slave.password} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCategoryClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCategoryClient.java index e8638b933..b14a31554 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCategoryClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCategoryClient.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.feign; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataCategoryEntity; import com.logpm.basicdata.service.IBasicdataCategoryService; @@ -50,4 +51,22 @@ public class BasicdataCategoryClient implements IBasicdataCategoryClient { return BladePage.of(page); } + @Override + public BasicdataCategoryEntity findByName(String goodsName) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("name",goodsName) + .eq("is_deleted",0); + return basicdataCategoryService.getOne(queryWrapper); + } + + @Override + public Long addReturnId(BasicdataCategoryEntity basicdataCategoryEntity) { + boolean save = basicdataCategoryService.save(basicdataCategoryEntity); + if(save){ + return basicdataCategoryEntity.getId(); + }else{ + return null; + } + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java index 7ae241a60..e7355e3f6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java @@ -29,6 +29,7 @@ import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -60,6 +61,7 @@ public class BasicdataClientClient implements IBasicdataClientClient { } @Override + @GetMapping(API_PREFIX+"/findByName") public BasicdataClientEntity findByName(String customerName) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("client_name",customerName); @@ -73,6 +75,7 @@ public class BasicdataClientClient implements IBasicdataClientClient { * @return */ @Override + @GetMapping(GETCUSTOMER) public BasicdataClientEntity getCustomer(String customerName, String customerCode) { return basicdataClientService.getOne(Wrappers.query().lambda() .eq(StringUtils.isNotEmpty(customerName),BasicdataClientEntity::getClientName,customerName) @@ -86,8 +89,20 @@ public class BasicdataClientClient implements IBasicdataClientClient { } @Override + @GetMapping(API_PREFIX+"/findEntityById") public BasicdataClientEntity findEntityById(Long id) { return basicdataClientService.getById(id); } + @Override + @PostMapping(API_PREFIX+"/addReturnId") + public Long addReturnId(BasicdataClientEntity basicdataClientEntity) { + boolean save = basicdataClientService.save(basicdataClientEntity); + if(save){ + return basicdataClientEntity.getId(); + }else{ + return null; + } + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java index f68fdc20a..d7a29cc66 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.feign; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; import com.logpm.basicdata.service.IBasicdataStorageServicesService; @@ -27,6 +28,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 门店服务仓库表 Feign实现类 * @@ -50,4 +53,14 @@ public class BasicdataStorageServicesClient implements IBasicdataStorageServices return BladePage.of(page); } + @Override + public List findBySendWarehouseIdAndClientId(Long warehouseId, Long clientId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("send_warehouse_id",warehouseId) + .eq("client_id",clientId) + .eq("is_deleted",0); + + return basicdataStorageServicesService.list(queryWrapper); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTripartiteMallClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTripartiteMallClient.java index 468b174dd..09c3a9190 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTripartiteMallClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTripartiteMallClient.java @@ -50,4 +50,9 @@ public class BasicdataTripartiteMallClient implements IBasicdataTripartiteMallCl return BladePage.of(page); } + @Override + public Long getClientIdByNameAndBrand(String name, String brand) { + return basicdataTripartiteMallService.getClientIdByNameAndBrand(name,brand); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java index 9e1b74f39..9fcccf841 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java @@ -52,4 +52,5 @@ public interface BasicdataTripartiteMallMapper extends BaseMapper exportBasicdataTripartiteMall(@Param("ew") Wrapper queryWrapper); + Long getClientIdByNameAndBrand(@Param("name") String name, @Param("brand") String brand); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml index b2ee5e851..4d7c0f6b7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml @@ -33,4 +33,14 @@ SELECT * FROM logpm_basicdata_tripartite_mall ${ew.customSqlSegment} + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java index f7b67920e..1040b9387 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java @@ -50,4 +50,5 @@ public interface IBasicdataTripartiteMallService extends BaseService exportBasicdataTripartiteMall(Wrapper queryWrapper); + Long getClientIdByNameAndBrand(String name, String brand); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java index 20cdcfb0f..ba0885ce1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java @@ -52,4 +52,9 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index df8faf4d7..fda7358cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -16,10 +16,9 @@ */ package com.logpm.distribution.mapper; -import com.logpm.distribution.dto.DistributionParcelListDTO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.excel.DistributionParcelListExcel; @@ -112,4 +111,6 @@ public interface DistributionParcelListMapper extends BaseMapper getParcelListInfo(@Param("param")DistributionParcelListVO parcelListVO); List exportDistributionParcelList(@Param("paramMap")Map paramMap, @Param("idArr") List idArr); + + void freezeByOrderCode(@Param("orderCode") String orderCode,@Param("freezeStatus") String freezeStatus); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index d541df24e..598b45c5b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -835,4 +835,10 @@ + + update logpm_distribution_parcel_list + set order_package_freeze_status = #{freezeStatus} + where order_code = #{orderCode} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 430a6dd82..95ff6f745 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -25,6 +25,7 @@ import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.vo.*; +import com.logpm.oldproject.dto.SignPushDataContactDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -265,4 +266,12 @@ public interface DistributionReservationMapper extends BaseMapper selectPushOldCustomer(@Param("reservationId") Long reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 65c3fa0b9..34dbf8a00 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1120,6 +1120,24 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 906fafde8..0addf16c9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -29,6 +29,7 @@ import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; import com.logpm.distribution.vo.app.DistributionAppParcelListVO; import com.logpm.distribution.vo.app.DistributionAppSignforVO; import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; +import com.logpm.oldproject.dto.SignPushDataUnitDTO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -249,4 +250,20 @@ public interface DistributionSignforMapper extends BaseMapper + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index 47899bf53..dd66d09d1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockArticleOweDTO; @@ -117,4 +116,8 @@ public interface DistributionStockArticleMapper extends BaseMapper + + update logpm_distribution_stock_article + set customer_name = #{customerName}, + customer_telephone = #{customerPhone}, + customer_address = #{customerRoad} + where order_code = #{orderCode} + + + + update logpm_distribution_stock_article + set freeze_status = #{freezeStatus} + where order_code = #{orderCode} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 7c44b5173..b62293000 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -107,7 +107,7 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.incoming_batch = ldsl.incoming_batch and lwug.market_id = ldsl.market_id - ldsl.warehouse_id = #{par.warehouseId} and ldsl.quantity_stock > 0 and ldsa.source_type = 2 + ldsl.warehouse_id = #{par.warehouseId} and ldsl.quantity_stock > 0 and ldsl.source_type = 2 and ldsl.market_id = #{par.marketId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index aca69294e..d44ee6bd6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -27,11 +27,12 @@ + select ltad.waybill_no waybillNo, + ltad.order_code orderCode, + lta.train_number trainNumber, + ltad.package_status packageStatus, + ltad.first_pack_name firstPackName, + ltad.second_pack_name secondPackName, + ltad.third_pack_name thirdPackName, + ltad.material_code materialCode, + ltad.material_name materialName, + ltad.order_package_code orderPackageCode, + ltad.brand brand, + ltad.service_num serviceNum, + ltad.quantity quantity, + lwtg.tray_code trayCode, + lwt.pallet_name trayName + from logpm_trunkline_advance_detail ltad + left join logpm_trunkline_advance lta on lta.id = ltad.advance_id + left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ltad.order_package_code + left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id + where advance_id = #{advanceId} + + + + + + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java index fedf2713f..463b90406 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java @@ -1,12 +1,24 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +import com.logpm.trunkline.vo.OpenOrderVO; +import com.logpm.trunkline.vo.TrunklineAdvanceVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface TrunklineAdvanceMapper extends BaseMapper { int getAllTotalNum(@Param("orderCode") String orderCode); + + IPage advancePageList(IPage page, @Param("param") AdvanceDTO advanceDTO); + + List findListByIds(@Param("list") List advanceIds); + + OpenOrderVO selectInfoByIds(@Param("list") List advanceIds); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index ad550b797..83e91c460 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -11,4 +11,52 @@ + + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java index f2a777f11..06e66fa7a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java @@ -1,13 +1,19 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface TrunklineWaybillOrderMapper extends BaseMapper { Integer getTotalNumByWaybillId(@Param("waybillId") Long waybillId); + Integer getOrderPackageNumByWaybillId(@Param("waybillId") Long waybillId); + + List findListByWaybillId(@Param("waybillId") Long waybillId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml index 347aae719..66e38c977 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml @@ -8,4 +8,19 @@ where ltwo.waybill_id = #{waybillId} + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java new file mode 100644 index 000000000..1b0511a14 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TrunklineWaybillTrackMapper extends BaseMapper { + + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml new file mode 100644 index 000000000..7d7955ce8 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java new file mode 100644 index 000000000..f0c4e05be --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java @@ -0,0 +1,31 @@ +package com.logpm.trunkline.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.OpenOrderDTO; +import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; +import com.logpm.trunkline.vo.TrunklineAdvanceVO; +import org.springblade.core.tool.api.R; + +import java.util.List; + +public interface IOpenOrderService { + IPage advancePageList(AdvanceDTO advanceDTO); + + List findAdvanceDetailList(Long advanceId); + + R advanceToWaybillInfo(List advanceIds, Long warehouseId); + + R advanceToWaybillBefore(List advanceIds, Long warehouseId); + + R openWaybill(OpenOrderDTO openOrderDTO); + + R openZeroWaybill(OpenOrderDTO openOrderDTO); + + void updateCustomerInfo(AdvanceDTO advanceDTO); + + void freezeByAdvanceIds(AdvanceDTO advanceDTO); + + void deletedAdvance(AdvanceDTO advanceDTO); + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 9b4ab0f6e..8bf3628cf 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -1,12 +1,30 @@ package com.logpm.trunkline.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.vo.AdvanceDetailGoodsVO; +import com.logpm.trunkline.vo.AdvanceDetailStockNumVO; +import com.logpm.trunkline.vo.BillladingPackageVO; +import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; import org.springblade.core.mp.base.BaseService; +import java.util.List; + public interface ITrunklineAdvanceDetailService extends BaseService { void updatePackageStatusById(String packageStatus, Long advanceDetailId); TrunklineAdvanceDetailEntity findEntityByOrderPackageCodeAndWarehouseId(String orderPackageCode, Long warehouseId); + List findList(Long advanceId); + + List findGoodsListByAdvanceIds(List advanceIds); + + AdvanceDetailStockNumVO findStockNumByAdvanceIds(List advanceIds); + + List findBillladingPackageByAdvanceIdsAnd(List advanceIds); + + IPage advanceDetailPageList(AdvanceDetailDTO advanceDetailDTO); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java index 1ad777d03..e83273472 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java @@ -1,10 +1,22 @@ package com.logpm.trunkline.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +import com.logpm.trunkline.vo.OpenOrderVO; +import com.logpm.trunkline.vo.TrunklineAdvanceVO; import org.springblade.core.mp.base.BaseService; +import java.util.List; + public interface ITrunklineAdvanceService extends BaseService { void saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId); + + IPage advancePageList(IPage page, AdvanceDTO advanceDTO); + + List findListByIds(List advanceIds); + + OpenOrderVO selectInfoByIds(List advanceIds); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java index 3394219b5..ffc5e6a39 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java @@ -28,4 +28,6 @@ public interface ITrunklineBillladingWaybillService extends BaseService { + + List findListByOrderPackageCode(String orderPackageCode); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java index 45a6b1b6e..6715f8324 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java @@ -1,11 +1,18 @@ package com.logpm.trunkline.service; +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; import org.springblade.core.mp.base.BaseService; +import java.util.List; + public interface ITrunklineWaybillOrderService extends BaseService { Integer getTotalNumByWaybillId(Long waybillId); + Integer getOrderPackageNumByWaybillId(Long waybillId); + + List findListByWaybillId(Long waybillId); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java new file mode 100644 index 000000000..d78dce830 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java @@ -0,0 +1,7 @@ +package com.logpm.trunkline.service; + +import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITrunklineWaybillTrackService extends BaseService { +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index d2a4ceaca..5ee587a9a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -8,11 +8,15 @@ import com.logpm.trunkline.service.IInComingService; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; import com.logpm.trunkline.service.ITrunklineAdvanceService; import com.logpm.trunkline.service.ITrunklineBillladingPackageServicie; +import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; import java.util.Objects; @Slf4j @@ -23,6 +27,7 @@ public class InComingServiceImpl implements IInComingService { private final ITrunklineBillladingPackageServicie billladingPackageServicie; private final ITrunklineAdvanceDetailService advanceDetailService; private final ITrunklineAdvanceService advanceService; + private final IWarehouseTrayTypeClient warehouseTrayTypeClient; @Override public R incomingPackage(InComingDTO inComingDTO) { @@ -30,6 +35,8 @@ public class InComingServiceImpl implements IInComingService { Long warehouseId = inComingDTO.getWarehouseId();//仓库id Long billladingId = inComingDTO.getBillladingId();//提货单id Integer incomingType = inComingDTO.getIncomingType();//入库类型 + String trayCode = inComingDTO.getTrayCode();//托盘码 + String trayType = inComingDTO.getTrayType();//打托方式 log.info("############incomingPackage: 包件入库开始 orderPackageCode={} billladingId={} warehouseId={}",orderPackageCode,billladingId,warehouseId); //包件入库开始 @@ -60,6 +67,16 @@ public class InComingServiceImpl implements IInComingService { billladingPackageServicie.saveEntity(orderPackageCode,billladingId,warehouseId,incomingType); } + //4.如果有托盘码 + if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){ + Map map = new HashMap<>(); + map.put("trayType",trayType); + map.put("trayCode",trayCode); + map.put("warehouseId",warehouseId); + map.put("orderPackageCode",orderPackageCode); + warehouseTrayTypeClient.orderScanOrderPackageCode(map); + } + return R.success("入库成功"); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java new file mode 100644 index 000000000..6b1ac52c7 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -0,0 +1,745 @@ +package com.logpm.trunkline.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.basicdata.entity.*; +import com.logpm.basicdata.feign.*; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.entity.DistributionParcelNumberEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.feign.IDistributionParcelListClient; +import com.logpm.distribution.feign.IDistributionParcelNumberClient; +import com.logpm.distribution.feign.IDistributionStockArticleClient; +import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.OpenOrderDTO; +import com.logpm.trunkline.dto.WaybillDetailDTO; +import com.logpm.trunkline.entity.*; +import com.logpm.trunkline.service.*; +import com.logpm.trunkline.vo.*; +import com.logpm.warehouse.entity.WarehouseWayBillDetail; +import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import com.logpm.warehouse.feign.IWarehouseWaybillClient; +import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.CodeNumConstant; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.order.*; +import org.springblade.common.exception.CustomerException; +import org.springblade.common.utils.CommonUtil; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.cache.DictBizCache; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +@Slf4j +@AllArgsConstructor +@Service +public class OpenOrderServiceImpl implements IOpenOrderService { + + private final ITrunklineAdvanceService advanceService; + private final ITrunklineAdvanceDetailService advanceDetailService; + private final IBasicdataWarehouseClient basicdataWarehouseClient; + private final IBasicdataTripartiteMallClient basicdataTripartiteMallClient; + private final IBasicdataClientClient basicdataClientClient; + private final IBasicdataStorageServicesClient basicdataStorageServicesClient; + private final IBasicdataCodeClient basicdataCodeClient; + private final IWarehouseWaybillClient warehouseWaybillClient; + private final IWarehouseWaybillDetailClient warehouseWaybillDetailClient; + private final IBasicdataCategoryClient basicdataCategoryClient; + private final ITrunklineWaybillOrderService trunklineWaybillOrderService; + private final ITrunklineBillladingWaybillService trunklineBillladingWaybillService; + private final ITrunklineBillladingService trunklineBillladingService; + private final ITrunklineWaybillTrackService trunklineWaybillTrackService; + private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient; + private final IDistributionStockArticleClient distributionStockArticleClient; + private final IDistributionParcelListClient distributionParcelListClient; + private final IDistributionParcelNumberClient distributionParcelNumberClient; + + @Override + public IPage advancePageList(AdvanceDTO advanceDTO) { + IPage page = new Page<>(); + page.setCurrent(advanceDTO.getPageNum()); + page.setSize(advanceDTO.getPageSize()); + + IPage pageList = advanceService.advancePageList(page,advanceDTO); + + return pageList; + } + + @Override + public List findAdvanceDetailList(Long advanceId) { + return advanceDetailService.findList(advanceId); + } + + @Override + public R advanceToWaybillInfo(List advanceIds, Long warehouseId) { + log.info("##################advanceToWaybill: 暂存单转运单"); + + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); + if(Objects.isNull(basicdataWarehouseEntity)){ + log.warn("##############advanceToWaybill: 仓库信息不存在 warehouseId={}",warehouseId); + return R.fail(405,"仓库信息不存在"); + } + + //先查询出所有的暂存单 + List list = advanceService.findListByIds(advanceIds); + + if(list.isEmpty()){ + log.warn("##############advanceToWaybill: 暂存单数据不存在 advanceIds={}",advanceIds); + return R.fail(405,"暂存单数据不存在"); + } + String dealerName = null; + String brand = null; + for (TrunklineAdvanceEntity advanceEntity:list){ + if(StringUtil.isBlank(dealerName)){ + dealerName = advanceEntity.getDealerName(); + } + if(StringUtil.isBlank(brand)){ + brand = advanceEntity.getBrand(); + } + + + + } + OpenOrderVO openOrderVO = new OpenOrderVO(); + //查询品牌 客户车次号 订单自编码 + OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds); + BeanUtil.copy(infoByIds,openOrderVO); + openOrderVO.setAdvanceIds(advanceIds); + //发站仓-----目前登录人的仓库 + openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName()); + openOrderVO.setDepartureWarehouseId(warehouseId); + + //收货单位-----根据三方商场找到对应的clientId + Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); + if(!Objects.isNull(basicdataClientEntity)){ + openOrderVO.setConsigneeClientId(clientId); + openOrderVO.setConsignee(basicdataClientEntity.getClientName()); + openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman()); + openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone()); + openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly()); + + //查询目的仓数据 + List storageServicesEntities = basicdataStorageServicesClient.findBySendWarehouseIdAndClientId(warehouseId,clientId); + if(!storageServicesEntities.isEmpty()){ + BasicdataStorageServicesEntity basicdataStorageServicesEntity = storageServicesEntities.get(0); + openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); + openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); + } + } + + //组装货物数据 + List goodsList = advanceDetailService.findGoodsListByAdvanceIds(advanceIds); + //因为这个时候还没有到站信息，所有无法去匹配一个该商场的货物单价 +// for (AdvanceDetailGoodsVO advanceDetailGoodsVO:goodsList){ +// String goodsName = advanceDetailGoodsVO.getGoodsName(); +// if(!Objects.isNull(basicdataClientEntity)){ +// //TODO 这里要根据商场信息和物品名称去匹配一个预设单价 +// advanceDetailGoodsVO.setPrice(BigDecimal.ZERO); +// }else{ +// //因为没有 +// } +// } + openOrderVO.setGoodsList(goodsList); + + //查询支付方式 + openOrderVO.setPayTypeList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE)); + //查询付款方式 + openOrderVO.setPayWayList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY)); + //查询送货方式 + openOrderVO.setDeliveryWayList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY)); + //查询紧急度 + openOrderVO.setUrgencyList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_URGENCY)); + //查询回单方式 + openOrderVO.setReceiptList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_RECEIPT)); + //查询回单方式 + openOrderVO.setTransportTypeList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE)); + + openOrderVO.setOpenOrderUserName(AuthUtil.getUserName()); + + return R.data(openOrderVO); + } + + @Override + public R advanceToWaybillBefore(List advanceIds, Long warehouseId) { + log.info("##################advanceToWaybillBefore: 判断暂存单是否能转运单"); + //先查询出所有的暂存单 + List list = advanceService.findListByIds(advanceIds); + String dealerName = null; + String brand = null; + for (TrunklineAdvanceEntity advanceEntity:list){ + if(StringUtil.isBlank(dealerName)){ + dealerName = advanceEntity.getDealerName(); + }else{ + String dealer = advanceEntity.getDealerName(); + if(!dealerName.equals(dealer)){ + log.info("###########advanceToWaybillBefore: 商场不同 dealerName={} dealer={}",dealerName,dealer); + return R.fail(405,"请选择同一商场开单"); + } + } + if(StringUtil.isBlank(brand)){ + brand = advanceEntity.getBrand(); + }else{ + String brand1 = advanceEntity.getBrand(); + if(!brand.equals(brand1)){ + log.info("###########advanceToWaybillBefore: 品牌不同 brand={} brand1={}",brand,brand1); + return R.fail(405,"请选择同一品牌开单"); + } + } + + } + return R.success("验证成功"); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public R openWaybill(OpenOrderDTO openOrderDTO) { + log.info("############openWaybill: 开单开始 openOrderDTO={}",openOrderDTO); + String waybillNo = openOrderDTO.getWaybillNo();//运单号 + Long warehouseId = openOrderDTO.getWarehouseId(); + + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); + if(Objects.isNull(basicdataWarehouseEntity)){ + log.warn("#############openWaybill: 仓库信息不存在 warehouseId={}",warehouseId); + return R.fail(405,"仓库信息不存在"); + } + String warehouseCode = basicdataWarehouseEntity.getCode(); + + //如果运单号为空则自动生成运单号 + if(StringUtil.isBlank(waybillNo)){ + waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, null); + } + + WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); + waybillEntity.setWaybillNo(waybillNo); + waybillEntity.setBrand(openOrderDTO.getBrand()); + waybillEntity.setOrderNo(openOrderDTO.getOrderNo()); + waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId()); + waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); + waybillEntity.setCustomerTrain(openOrderDTO.getCustomerTrain()); + Long shipperId = openOrderDTO.getShipperId(); + if(Objects.isNull(shipperId)){ + //如果发货单位没有id值，则把发货单位信息自动添加到client中 + shipperId = saveNewClient(openOrderDTO.getShipper(),openOrderDTO.getShipperName(),openOrderDTO.getShipperMobile(),openOrderDTO.getShipperAddress(),"6"); + } + waybillEntity.setShipperId(shipperId); + waybillEntity.setShipper(openOrderDTO.getShipper()); + waybillEntity.setShipperName(openOrderDTO.getShipperName()); + waybillEntity.setShipperMobile(openOrderDTO.getShipperMobile()); + waybillEntity.setShipperAddress(openOrderDTO.getShipperAddress()); + + Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id + if(Objects.isNull(consigneeId)){ + //如果收货单位没有id值，则把收货单位信息自动添加到client中 + consigneeId = saveNewClient(openOrderDTO.getConsignee(),openOrderDTO.getConsigneeName(),openOrderDTO.getConsigneeMobile(),openOrderDTO.getConsigneeAddress(),"2"); + } + waybillEntity.setConsigneeId(consigneeId); + waybillEntity.setConsignee(openOrderDTO.getConsignee()); + waybillEntity.setConsigneeName(openOrderDTO.getConsigneeName()); + waybillEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile()); + waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); + + waybillEntity.setDestination(openOrderDTO.getDestination()); + waybillEntity.setGoodsName(openOrderDTO.getGoodsName()); + waybillEntity.setTotalCount(openOrderDTO.getTotalCount()); + waybillEntity.setTotalVolume(openOrderDTO.getTotalVolume()); + waybillEntity.setTotalWeight(openOrderDTO.getTotalWeghit()); + //统计当前订单的在库数 + List advanceIds = openOrderDTO.getAdvanceIds(); + AdvanceDetailStockNumVO advanceDetailStockNumVO = advanceDetailService.findStockNumByAdvanceIds(advanceIds); + waybillEntity.setStockCount(advanceDetailStockNumVO.getStockNum()); + waybillEntity.setStockWeight(advanceDetailStockNumVO.getStockWeight()); + waybillEntity.setStockVolume(advanceDetailStockNumVO.getStockVolume()); + + waybillEntity.setTotalFreight(openOrderDTO.getTotalFreight()); + waybillEntity.setDeliveryFee(openOrderDTO.getDeliveryFee()); + waybillEntity.setPickupFee(openOrderDTO.getPickupFee()); + waybillEntity.setWarehouseManagementFee(openOrderDTO.getWarehouseManagementFee()); + waybillEntity.setStorageFee(openOrderDTO.getStorageFee()); + waybillEntity.setHandlingFee(openOrderDTO.getHandlingFee()); + waybillEntity.setOtherFee(openOrderDTO.getOtherFee()); + waybillEntity.setInsuranceFee(openOrderDTO.getInsuranceFee()); + waybillEntity.setClaimingValue(openOrderDTO.getClaimingValue()); + + waybillEntity.setPayType(openOrderDTO.getPayType()); + waybillEntity.setPayWay(openOrderDTO.getPayWay()); + waybillEntity.setXPay(openOrderDTO.getXPay()); + waybillEntity.setDPay(openOrderDTO.getDPay()); + waybillEntity.setYPay(openOrderDTO.getYPay()); + waybillEntity.setHPay(openOrderDTO.getHPay()); + waybillEntity.setThirdOperationFee(openOrderDTO.getThirdOperationFee()); + + waybillEntity.setDeliveryWay(openOrderDTO.getDeliveryWay()); + waybillEntity.setUrgency(openOrderDTO.getUrgency()); + waybillEntity.setReceipt(openOrderDTO.getReceipt()); + waybillEntity.setRemark(openOrderDTO.getRemark()); + waybillEntity.setWaybillType(openOrderDTO.getWaybillType()); + + Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity); + if(!Objects.isNull(waybillId)){ + log.info("#################openWaybill: 运单保存成功"); + //保存运单货物明细 + List waybillDetailList = openOrderDTO.getWaybillDetailList(); + List details = new ArrayList<>(); + for (WaybillDetailDTO waybillDetailDTO:waybillDetailList){ + WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); + warehouseWayBillDetail.setWaybillId(waybillId); + warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo()); + Long goodsId = waybillDetailDTO.getGoodsId(); + String goodsName = waybillDetailDTO.getGoodsName(); + if(Objects.isNull(goodsId)){ + //如果品名id没有就先通过goodsName查寻，没有就新增 + BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); + if(Objects.isNull(basicdataCategoryEntity)){ + basicdataCategoryEntity = new BasicdataCategoryEntity(); + basicdataCategoryEntity.setName(goodsName); + basicdataCategoryEntity.setType(1); + goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); + }else{ + goodsId = basicdataCategoryEntity.getId(); + } + } + warehouseWayBillDetail.setProductId(goodsId); + warehouseWayBillDetail.setProductName(goodsName); + warehouseWayBillDetail.setNum(waybillDetailDTO.getNum()); + warehouseWayBillDetail.setVolume(waybillDetailDTO.getVolume()); + warehouseWayBillDetail.setWeight(waybillDetailDTO.getWeight()); + warehouseWayBillDetail.setPrice(waybillDetailDTO.getPrice()); + warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight()); + warehouseWayBillDetail.setChargeType(waybillDetailDTO.getChargeType()); + details.add(warehouseWayBillDetail); + } + warehouseWaybillDetailClient.addList(details); + }else{ + log.info("#################openWaybill: 运单保存失败"); + return R.fail(405,"运单保存失败"); + } + + //绑定订单和运单的关系 + List advanceEntityList = advanceService.findListByIds(advanceIds); + List waybillOrderEntities = new ArrayList<>(); + for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){ + TrunklineWaybillOrderEntity waybillOrderEntity = new TrunklineWaybillOrderEntity(); + waybillOrderEntity.setWarehouseId(warehouseId); + waybillOrderEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + waybillOrderEntity.setWaybillId(waybillId); + waybillOrderEntity.setWaybillNo(waybillNo); + waybillOrderEntity.setAdvanceId(advanceEntity.getId()); + waybillOrderEntity.setOrderCode(advanceEntity.getOrderCode()); + waybillOrderEntity.setTotalNumber(advanceEntity.getTotalNum()); + waybillOrderEntities.add(waybillOrderEntity); + + advanceEntity.setWaybillStatus("1"); + } + trunklineWaybillOrderService.saveBatch(waybillOrderEntities); + //修改暂存单的状态为已开单 + advanceService.updateBatchById(advanceEntityList); + + //计算扫码入库的包件是否需要把运单和提货单挂上 + List billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds); + List billladingWaybillEntities = new ArrayList<>(); + + List updateFeeBilllading = new ArrayList<>(); + + for (BillladingPackageVO billladingPackageVO:billladingPackageList){ + Long billladingId = billladingPackageVO.getBillladingId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",billladingId) + .eq("is_deleted",0) + .eq("billlading_status","2"); + TrunklineBillladingEntity billladingEntity = trunklineBillladingService.getOne(queryWrapper); + if(Objects.isNull(billladingEntity)){ + log.info("#################openWaybill: 提货单信息不存在 billladingId={}",billladingId); + continue; + } + Integer num = billladingPackageVO.getNum(); + TrunklineBillladingWaybillEntity trunklineBillladingWaybillEntity = trunklineBillladingWaybillService.getNoDataWaybillByBillladingId(billladingId); + + if(!Objects.isNull(trunklineBillladingWaybillEntity)){ + Integer realNum = trunklineBillladingWaybillEntity.getRealNum(); + if(realNum > num){ + trunklineBillladingWaybillEntity.setRealNum(realNum-num); + }else if(realNum == num){ + trunklineBillladingWaybillEntity.setRealNum(0); + trunklineBillladingWaybillEntity.setIsDeleted(1); + } + trunklineBillladingWaybillService.updateById(trunklineBillladingWaybillEntity); + TrunklineBillladingWaybillEntity billladingWaybillEntity = new TrunklineBillladingWaybillEntity(); + billladingWaybillEntity.setWarehouseId(warehouseId); + billladingWaybillEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + billladingWaybillEntity.setBillladingId(billladingId); + billladingWaybillEntity.setBilladingCode(billladingEntity.getBillladingCode()); + billladingWaybillEntity.setWaybillId(waybillId); + billladingWaybillEntity.setWaybillNo(waybillNo); + billladingWaybillEntity.setRealNum(num); + billladingWaybillEntities.add(billladingWaybillEntity); + updateFeeBilllading.add(billladingEntity); + } + } + trunklineBillladingWaybillService.saveBatch(billladingWaybillEntities); + + //更新提货单对应的运单的提货费用 + for (TrunklineBillladingEntity billladingEntity:updateFeeBilllading){ + trunklineBillladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity); + } + + try{ + TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity(); + waybillTrackEntity.setWarehouseId(warehouseId); + waybillTrackEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + waybillTrackEntity.setWaybillId(waybillId); + waybillTrackEntity.setWaybillNo(waybillNo); + waybillTrackEntity.setTrackType("10"); + waybillTrackEntity.setDescribe("创建运单"); + waybillTrackEntity.setOperationRemark("创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())); + trunklineWaybillTrackService.save(waybillTrackEntity); + + Integer totalCount = waybillEntity.getTotalCount(); + Integer stockCount = waybillEntity.getStockCount(); + if(totalCount.equals(stockCount)){ + waybillTrackEntity.setId(null); + waybillTrackEntity.setTrackType("20"); + waybillTrackEntity.setDescribe("已入库"); + waybillTrackEntity.setOperationRemark("运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())); + trunklineWaybillTrackService.save(waybillTrackEntity); + } + }catch (Exception e){ + log.warn("###############openWaybill: 存入日志失败"); + } + + return R.success("开单成功"); + } + + @Override + public R openZeroWaybill(OpenOrderDTO openOrderDTO) { + log.info("############openZeroWaybill: 开零担单开始 openOrderDTO={}",openOrderDTO); + String waybillNo = openOrderDTO.getWaybillNo();//运单号 + Long warehouseId = openOrderDTO.getWarehouseId(); + + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); + if(Objects.isNull(basicdataWarehouseEntity)){ + log.warn("#############openZeroWaybill: 仓库信息不存在 warehouseId={}",warehouseId); + return R.fail(405,"仓库信息不存在"); + } + String warehouseCode = basicdataWarehouseEntity.getCode(); + + //如果运单号为空则自动生成运单号 + if(StringUtil.isBlank(waybillNo)){ + waybillNo = basicdataCodeClient.getCodeByType(CodeNumConstant.WAYBILL, warehouseCode, null); + } + + WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); + waybillEntity.setWaybillNo(waybillNo); + waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId()); + waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); + waybillEntity.setCustomerTrain(openOrderDTO.getCustomerTrain()); + Long shipperId = openOrderDTO.getShipperId(); + if(Objects.isNull(shipperId)){ + //如果发货单位没有id值，则把发货单位信息自动添加到client中 + shipperId = saveNewClient(openOrderDTO.getShipper(),openOrderDTO.getShipperName(),openOrderDTO.getShipperMobile(),openOrderDTO.getShipperAddress(),"6"); + } + waybillEntity.setShipperId(shipperId); + waybillEntity.setShipper(openOrderDTO.getShipper()); + waybillEntity.setShipperName(openOrderDTO.getShipperName()); + waybillEntity.setShipperMobile(openOrderDTO.getShipperMobile()); + waybillEntity.setShipperAddress(openOrderDTO.getShipperAddress()); + + Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id + if(Objects.isNull(consigneeId)){ + //如果收货单位没有id值，则把收货单位信息自动添加到client中 + consigneeId = saveNewClient(openOrderDTO.getConsignee(),openOrderDTO.getConsigneeName(),openOrderDTO.getConsigneeMobile(),openOrderDTO.getConsigneeAddress(),"2"); + } + waybillEntity.setConsigneeId(consigneeId); + waybillEntity.setConsignee(openOrderDTO.getConsignee()); + waybillEntity.setConsigneeName(openOrderDTO.getConsigneeName()); + waybillEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile()); + waybillEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); + + waybillEntity.setDestination(openOrderDTO.getDestination()); + waybillEntity.setGoodsName(openOrderDTO.getGoodsName()); + waybillEntity.setTotalCount(openOrderDTO.getTotalCount()); + waybillEntity.setTotalVolume(openOrderDTO.getTotalVolume()); + waybillEntity.setTotalWeight(openOrderDTO.getTotalWeghit()); + //零担单开单即入库 + waybillEntity.setStockCount(openOrderDTO.getTotalCount()); + waybillEntity.setStockWeight(openOrderDTO.getTotalWeghit()); + waybillEntity.setStockVolume(openOrderDTO.getTotalVolume()); + + waybillEntity.setTotalFreight(openOrderDTO.getTotalFreight()); + waybillEntity.setDeliveryFee(openOrderDTO.getDeliveryFee()); + waybillEntity.setPickupFee(openOrderDTO.getPickupFee()); + waybillEntity.setWarehouseManagementFee(openOrderDTO.getWarehouseManagementFee()); + waybillEntity.setStorageFee(openOrderDTO.getStorageFee()); + waybillEntity.setHandlingFee(openOrderDTO.getHandlingFee()); + waybillEntity.setOtherFee(openOrderDTO.getOtherFee()); + waybillEntity.setInsuranceFee(openOrderDTO.getInsuranceFee()); + waybillEntity.setClaimingValue(openOrderDTO.getClaimingValue()); + + waybillEntity.setPayType(openOrderDTO.getPayType()); + waybillEntity.setPayWay(openOrderDTO.getPayWay()); + waybillEntity.setXPay(openOrderDTO.getXPay()); + waybillEntity.setDPay(openOrderDTO.getDPay()); + waybillEntity.setYPay(openOrderDTO.getYPay()); + waybillEntity.setHPay(openOrderDTO.getHPay()); + waybillEntity.setThirdOperationFee(openOrderDTO.getThirdOperationFee()); + + waybillEntity.setDeliveryWay(openOrderDTO.getDeliveryWay()); + waybillEntity.setUrgency(openOrderDTO.getUrgency()); + waybillEntity.setReceipt(openOrderDTO.getReceipt()); + waybillEntity.setRemark(openOrderDTO.getRemark()); + waybillEntity.setWaybillType(openOrderDTO.getWaybillType()); + waybillEntity.setWaybillStatus("20"); + + Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity); + if(!Objects.isNull(waybillId)){ + log.info("#################openZeroWaybill: 运单保存成功"); + //保存运单货物明细 + List waybillDetailList = openOrderDTO.getWaybillDetailList(); + List details = new ArrayList<>(); + for (WaybillDetailDTO waybillDetailDTO:waybillDetailList){ + WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); + warehouseWayBillDetail.setWaybillId(waybillId); + warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo()); + Long goodsId = waybillDetailDTO.getGoodsId(); + String goodsName = waybillDetailDTO.getGoodsName(); + if(Objects.isNull(goodsId)){ + //如果品名id没有就先通过goodsName查寻，没有就新增 + BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); + if(Objects.isNull(basicdataCategoryEntity)){ + basicdataCategoryEntity = new BasicdataCategoryEntity(); + basicdataCategoryEntity.setName(goodsName); + basicdataCategoryEntity.setType(1); + goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); + }else{ + goodsId = basicdataCategoryEntity.getId(); + } + } + warehouseWayBillDetail.setProductId(goodsId); + warehouseWayBillDetail.setProductName(goodsName); + warehouseWayBillDetail.setNum(waybillDetailDTO.getNum()); + warehouseWayBillDetail.setVolume(waybillDetailDTO.getVolume()); + warehouseWayBillDetail.setWeight(waybillDetailDTO.getWeight()); + warehouseWayBillDetail.setPrice(waybillDetailDTO.getPrice()); + warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight()); + warehouseWayBillDetail.setChargeType(waybillDetailDTO.getChargeType()); + details.add(warehouseWayBillDetail); + } + warehouseWaybillDetailClient.addList(details); + }else{ + log.info("#################openZeroWaybill: 运单保存失败"); + return R.fail(405,"运单保存失败"); + } + + try{ + TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity(); + waybillTrackEntity.setWarehouseId(warehouseId); + waybillTrackEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + waybillTrackEntity.setWaybillId(waybillId); + waybillTrackEntity.setWaybillNo(waybillNo); + waybillTrackEntity.setTrackType("10"); + waybillTrackEntity.setDescribe("创建运单"); + waybillTrackEntity.setOperationRemark("创建运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())); + trunklineWaybillTrackService.save(waybillTrackEntity); + + Integer totalCount = waybillEntity.getTotalCount(); + Integer stockCount = waybillEntity.getStockCount(); + if(totalCount.equals(stockCount)){ + waybillTrackEntity.setId(null); + waybillTrackEntity.setTrackType("20"); + waybillTrackEntity.setDescribe("已入库"); + waybillTrackEntity.setOperationRemark("运单入库："+stockCount+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())); + trunklineWaybillTrackService.save(waybillTrackEntity); + } + }catch (Exception e){ + log.warn("###############openZeroWaybill: 存入日志失败"); + } + + //创建零担订单 + createStockArticle(waybillEntity); + + return R.success("开单成功"); + } + + @Override + public void updateCustomerInfo(AdvanceDTO advanceDTO) { + List advanceIds = advanceDTO.getAdvanceIds(); + String customerName = advanceDTO.getCustomerName(); + String customerPhone = advanceDTO.getCustomerPhone(); + String customerRoad = advanceDTO.getCustomerRoad(); + + List listByIds = advanceService.findListByIds(advanceIds); + for (TrunklineAdvanceEntity advanceEntity:listByIds){ + String orderCode = advanceEntity.getOrderCode(); + advanceEntity.setCustomerName(customerName); + advanceEntity.setCustomerPhone(customerPhone); + advanceEntity.setCustomerAddress(customerRoad); + + distributionStockArticleClient.updateCustomerInfoByOrderCode(customerName,customerPhone,customerRoad,orderCode); + + } + advanceService.updateBatchById(listByIds); + } + + @Override + public void freezeByAdvanceIds(AdvanceDTO advanceDTO) { + List advanceIds = advanceDTO.getAdvanceIds(); + String freezeStatus = advanceDTO.getFreezeStatus(); + + List listByIds = advanceService.findListByIds(advanceIds); + for (TrunklineAdvanceEntity advanceEntity:listByIds){ + String orderCode = advanceEntity.getOrderCode(); + advanceEntity.setFreezeStatus(freezeStatus); + + distributionStockArticleClient.freezeByOrderCode(orderCode,freezeStatus); + + } + advanceService.updateBatchById(listByIds); + } + + @Override + public void deletedAdvance(AdvanceDTO advanceDTO) { + List advanceIds = advanceDTO.getAdvanceIds(); + + List listByIds = advanceService.findListByIds(advanceIds); + for (TrunklineAdvanceEntity advanceEntity:listByIds){ + advanceEntity.setIsDeleted(1); + } + advanceService.updateBatchById(listByIds); + } + + + private void createStockArticle(WarehouseWaybillEntity warehouseWaybill) { + Date date = new Date(); + DistributionStockArticleEntity distributionStockArticleEntity = new DistributionStockArticleEntity(); + distributionStockArticleEntity.setOrderCode(warehouseWaybill.getWaybillNo()); + distributionStockArticleEntity.setServiceNumber(warehouseWaybill.getServiceNo()); + distributionStockArticleEntity.setWaybillNumber(warehouseWaybill.getWaybillNo()); + distributionStockArticleEntity.setWaybillId(warehouseWaybill.getId()); + distributionStockArticleEntity.setWarehouseId(warehouseWaybill.getDepartureWarehouseId()); + distributionStockArticleEntity.setMallName(warehouseWaybill.getConsignee()); + Long consigneeId = warehouseWaybill.getConsigneeId(); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); + distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId()); + distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName()); + distributionStockArticleEntity.setWarehouse(warehouseWaybill.getDepartureWarehouseName()); + distributionStockArticleEntity.setWarehouseEntryTime(date); + distributionStockArticleEntity.setTotalNumber(warehouseWaybill.getTotalCount()); + distributionStockArticleEntity.setHandQuantity(warehouseWaybill.getStockCount()); + //零担订单默认齐套 + distributionStockArticleEntity.setCompleteSet(1); + + distributionStockArticleEntity.setBrand(warehouseWaybill.getBrand()); + distributionStockArticleEntity.setResource("零担"); + + String customerName = warehouseWaybill.getConsignee();//客户名称 + //通过客户名称去查询客户的服务类型、 + distributionStockArticleEntity.setTypeService("1");//默认商配 + if (!Objects.isNull(basicdataClientEntity)) { + Long clientEntityId = basicdataClientEntity.getId();//基础客户 + BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3); + if (!Objects.isNull(basicdataStoreBusinessEntity)) { + distributionStockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold()); + } + } + distributionStockArticleEntity.setCustomerName(warehouseWaybill.getConsigneeName()); + distributionStockArticleEntity.setCustomerTelephone(warehouseWaybill.getConsigneeMobile()); + distributionStockArticleEntity.setCustomerAddress(warehouseWaybill.getConsigneeAddress()); + distributionStockArticleEntity.setGenre(1); + distributionStockArticleEntity.setSortingQuantity(0); //分拣件数 + distributionStockArticleEntity.setDeliveryQuantity(0); //配送件数 + distributionStockArticleEntity.setTransferQuantity(0); //中转件数 + distributionStockArticleEntity.setSigninQuantity(0); //签收件数 + distributionStockArticleEntity.setFreezeStatus(OrderFreezeStatusConstant.weidongjie.getValue()); //冻结状态 + distributionStockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); //预约状态 + distributionStockArticleEntity.setStockupStatus(OrderStockupStatusConstant.daibeihuo.getValue()); //备货状态 + distributionStockArticleEntity.setGroundingStatus(OrderGroundingStatusConstant.daishangjia.getValue()); //上架状态 + distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue()); + distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue()); + + distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位（经销商） + distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人 + distributionStockArticleEntity.setConsigneeMobile(warehouseWaybill.getConsigneeMobile()); + distributionStockArticleEntity.setConsigneeAddress(warehouseWaybill.getConsigneeAddress()); + distributionStockArticleEntity.setWarehouseEntryTimeEnd(date); + distributionStockArticleEntity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId()); + distributionStockArticleEntity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName()); + distributionStockArticleEntity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId()); + distributionStockArticleEntity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName()); + distributionStockArticleEntity.setIsZero("1"); + + Long orderId = distributionStockArticleClient.addData(distributionStockArticleEntity); + if (orderId == 0) { + log.warn("#################createStockArticle: 保存订单信息失败 orderCode={}", distributionStockArticleEntity.getOrderCode()); + throw new CustomerException(405, "保存订单信息失败"); + } + + List wayBillDetailList = warehouseWaybillDetailClient.findByWaybillId(warehouseWaybill.getId()); + + //第一次生成订单也要生成包件信息 + List parcelNumberList = new ArrayList<>(); + for (WarehouseWayBillDetail warehouseWayBillDetail : wayBillDetailList) { + DistributionParcelListEntity entity = new DistributionParcelListEntity(); + entity.setFirsts(warehouseWayBillDetail.getProductName()); + entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); + entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); + entity.setQuantity(warehouseWayBillDetail.getNum()); + entity.setConditions(1); + entity.setStockArticleId(orderId); + entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); + entity.setOrderPackageStatus("20"); + entity.setOrderPackageFreezeStatus("10"); + entity.setOrderPackageGroundingStatus("10"); + entity.setOrderPackageStockupStatus("10"); + entity.setOrderPackageReservationStatus("10"); + entity.setOrderPackageLoadingStatus("10"); + entity.setWaybillNumber(distributionStockArticleEntity.getWaybillNumber()); + entity.setWarehouseEntryTimeEnd(date); + entity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId()); + entity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName()); + entity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId()); + entity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName()); + Long aLong = distributionParcelListClient.addReturnId(entity); + + DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); + parcelNumberEntity.setStockArticleId(orderId); + parcelNumberEntity.setWarehouseId(entity.getWarehouseId()); + parcelNumberEntity.setParcelListId(aLong); + parcelNumberEntity.setHandQuantity(entity.getQuantity()); + parcelNumberEntity.setQuantity(entity.getQuantity()); + parcelNumberEntity.setDeliveryQuantity(0); + parcelNumberEntity.setSigninQuantity(0); + parcelNumberEntity.setOutboundQuantity(0); + parcelNumberList.add(parcelNumberEntity); + + } + //存入零担订单包件数量 + distributionParcelNumberClient.addBatch(parcelNumberList); + + } + + private Long saveNewClient(String unit, String linkman, String linkPhone, String linkAddress, String type) { + BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity(); + basicdataClientEntity.setClientName(unit); + basicdataClientEntity.setTypeService(2); + basicdataClientEntity.setCargoControl(false); + basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位 + basicdataClientEntity.setLinkman(linkman); + basicdataClientEntity.setPhone(linkPhone); + basicdataClientEntity.setDetailedly(linkAddress); + return basicdataClientClient.addReturnId(basicdataClientEntity); + } + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 188563aa5..35d790404 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -1,14 +1,20 @@ package com.logpm.trunkline.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceDetailMapper; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; +import com.logpm.trunkline.vo.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service @AllArgsConstructor @@ -26,4 +32,36 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findList(Long advanceId) { + return baseMapper.findList(advanceId); + } + + @Override + public List findGoodsListByAdvanceIds(List advanceIds) { + return baseMapper.findGoodsListByAdvanceIds(advanceIds); + } + + @Override + public AdvanceDetailStockNumVO findStockNumByAdvanceIds(List advanceIds) { + return baseMapper.findStockNumByAdvanceIds(advanceIds); + } + + @Override + public List findBillladingPackageByAdvanceIdsAnd(List advanceIds) { + return baseMapper.findBillladingPackageByAdvanceIdsAnd(advanceIds); + } + + @Override + public IPage advanceDetailPageList(AdvanceDetailDTO advanceDetailDTO) { + + IPage page = new Page<>(); + page.setCurrent(advanceDetailDTO.getPageNum()); + page.setSize(advanceDetailDTO.getPageSize()); + + IPage pageList = baseMapper.advanceDetailPageList(page,advanceDetailDTO); + + return pageList; + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 556023917..4431a1082 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -1,19 +1,25 @@ package com.logpm.trunkline.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient; +import com.logpm.basicdata.feign.IBasicdataTripartiteMallClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceMapper; import com.logpm.trunkline.service.ITrunklineAdvanceService; +import com.logpm.trunkline.vo.OpenOrderVO; +import com.logpm.trunkline.vo.TrunklineAdvanceVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.TenantNum; @@ -37,6 +43,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl advancePageList(IPage page, AdvanceDTO advanceDTO) { + IPage trunklineAdvanceVOIPage = baseMapper.advancePageList(page, advanceDTO); + + List records = trunklineAdvanceVOIPage.getRecords(); + for (TrunklineAdvanceVO trunklineAdvanceVO:records){ + String dealerName = trunklineAdvanceVO.getDealerName(); + String brand = trunklineAdvanceVO.getBrand(); + Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); + trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName()); + } + trunklineAdvanceVOIPage.setRecords(records); + return trunklineAdvanceVOIPage; + } + + @Override + public List findListByIds(List advanceIds) { + return baseMapper.findListByIds(advanceIds); + } + + @Override + public OpenOrderVO selectInfoByIds(List advanceIds) { + return baseMapper.selectInfoByIds(advanceIds); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java index 320351677..9ebc6dd20 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java @@ -14,11 +14,13 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; +import org.springblade.common.utils.CommonUtil; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -33,6 +35,7 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl pageList(BillladingDTO billladingDTO) { @@ -388,12 +386,9 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl totalCount){ @@ -408,6 +403,30 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("waybill_no","————") + .eq("is_deleted",0); + return baseMapper.selectOne(queryWrapper); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineDetailProductServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineDetailProductServiceImpl.java index ff3578623..19e1c5222 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineDetailProductServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineDetailProductServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.trunkline.entity.TrunklineDetailProductEntity; import com.logpm.trunkline.mapper.TrunklineDetailProductMapper; import com.logpm.trunkline.service.ITrunklineDetailProductService; @@ -8,8 +9,21 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service @AllArgsConstructor public class TrunklineDetailProductServiceImpl extends BaseServiceImpl implements ITrunklineDetailProductService { + + + @Override + public List findListByOrderPackageCode(String orderPackageCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("unit_no",orderPackageCode); + + return baseMapper.selectList(queryWrapper); + } + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java index d1629ccf5..324a2732c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.service.impl; +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; import com.logpm.trunkline.mapper.TrunklineWaybillOrderMapper; import com.logpm.trunkline.service.ITrunklineWaybillOrderService; @@ -8,6 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service @AllArgsConstructor @@ -16,4 +19,14 @@ public class TrunklineWaybillOrderServiceImpl extends BaseServiceImpl findListByWaybillId(Long waybillId) { + return baseMapper.findListByWaybillId(waybillId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java new file mode 100644 index 000000000..9b4153a7c --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.service.impl; + +import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper; +import com.logpm.trunkline.service.ITrunklineWaybillTrackService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl implements ITrunklineWaybillTrackService { +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java index 7399108d9..2c0073d46 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java @@ -164,7 +164,7 @@ public class WarehouseTaskApiController { /** * 合同号方式添加查询 */ - @PostMapping("/queryContract") +/* @PostMapping("/queryContract") @ApiOperationSupport(order = 1) @ApiOperation(value = "合同号列表", notes = "code,type") public R queryContract(@RequestBody TaskSearchDTO taskSearchDTO,Query query) { @@ -177,7 +177,7 @@ public class WarehouseTaskApiController { taskSearchDTO.setWarehouseId(myCurrentWarehouse.getId()); R r= taskQuestService.queryContractGai(Condition.getPage(query), taskSearchDTO); return r; - } + }*/ @@ -249,7 +249,7 @@ public class WarehouseTaskApiController { /** * 库位明细(定制品) */ - @GetMapping("/allocationDetailByPackage") +/* @GetMapping("/allocationDetailByPackage") @ApiOperationSupport(order = 1) @ApiOperation(value = "库位明细(定制品)", notes = "code,type") public R allocationDetailByPackage(Query query,TaskSearchDTO taskSearchDTO) { @@ -306,13 +306,13 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ /** * 库位明细(零担) */ - @GetMapping("/allocationDetailByZero") +/* @GetMapping("/allocationDetailByZero") @ApiOperationSupport(order = 1) @ApiOperation(value = "库位明细(零担)", notes = "code,type") public R allocationDetailByZero(Query query,TaskSearchDTO taskSearchDTO) { @@ -369,12 +369,12 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ /** * 库位明细(库存品) */ - @GetMapping("/allocationDetailByStock") + /*@GetMapping("/allocationDetailByStock") @ApiOperationSupport(order = 1) @ApiOperation(value = "库位明细(库存品)", notes = "code,type") public R allocationDetailByStock(Query query,TaskSearchDTO taskSearchDTO) { @@ -431,9 +431,9 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ - @PostMapping("/updateQuestDetail") +/* @PostMapping("/updateQuestDetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "更新盘点数据（处理）", notes = "code,type") public R updateQuestDetail(@RequestBody TaskSearchDTO taskSearchDTO) { @@ -464,10 +464,10 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ - @PostMapping("/updateQuestDetailAllocation") + /*@PostMapping("/updateQuestDetailAllocation") @ApiOperationSupport(order = 1) @ApiOperation(value = "更新盘点数据（库位）", notes = "code,type") public R updateQuestDetailAllocation(@RequestBody TaskSearchDTO taskSearchDTO) { @@ -498,10 +498,10 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ - @PostMapping("/deleteQuestDetail") +/* @PostMapping("/deleteQuestDetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "排除盘点数据", notes = "code,type") public R deleteQuestDetail(@RequestBody TaskSearchDTO taskSearchDTO) { @@ -532,7 +532,7 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ @PostMapping("/selectPackageInfo") @ApiOperationSupport(order = 1) @@ -540,7 +540,17 @@ public class WarehouseTaskApiController { public R selectPackageInfo(@RequestBody TaskSearchDTO taskSearchDTO) { String method = "###########selectPackageInfo: "; log.info(method+"查询包件信息 参数：{}",taskSearchDTO); - String orderPackageCode = taskSearchDTO.getOrderPackageCode();//包件码 + String orderPackageCode = taskSearchDTO.getCode();//包件码 + Long questId = taskSearchDTO.getQuestId();//包件码 + String questNum = taskSearchDTO.getQuestNum();//包件码 + if(ObjectUtils.isNull(questId)){ + log.warn(method+"任务Id为空 questId={}",questId); + return R.fail(403,"任务Id为空"); + } + if(StringUtil.isBlank(questNum)){ + log.warn(method+"任务编号为空 questNum={}",questNum); + return R.fail(403,"任务编号为空"); + } try{ //当前登录人选择的仓库 @@ -569,7 +579,7 @@ public class WarehouseTaskApiController { - @PostMapping("/saveNewQuestDetail") +/* @PostMapping("/saveNewQuestDetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "保存新的盘点数据", notes = "code,type") public R saveNewQuestDetail(@RequestBody TaskSearchDTO taskSearchDTO) { @@ -632,7 +642,7 @@ public class WarehouseTaskApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } - } + }*/ @PostMapping("/findMaterialList") diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java index 8de7a3da2..4181d1a47 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java @@ -129,7 +129,7 @@ public class TaskSearchDTO { */ private Long warehouseId; - private List questDetailList = new ArrayList<>(); + private List questDetailList; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index f910b0d5c..1d911260b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -93,7 +93,7 @@ `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单ID', `quest_type` int(11) NULL DEFAULT NULL COMMENT '盘点方式;1. 随机 2 库位3 订单 4 托盘', `quest_target` int(11) NULL DEFAULT NULL COMMENT '盘点对象;1.定制品 2零担 3 库存品', - `orde_package_code` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '包条码;对应定制品', + `order_package_code` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '包条码;对应定制品', `order_package_id` bigint(20) NULL DEFAULT NULL COMMENT '包条ID;对应定制品', `category_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品类名称;对应零担', `stock_id` bigint(20) NULL DEFAULT NULL COMMENT '库存品ID;对应库存品', @@ -121,13 +121,13 @@ INSERT INTO ${questNum}(`id`, `tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, `create_dept`, `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `order_code`, `quest_id`, `order_id`, `quest_type`, `quest_target`, - `orde_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`, + `order_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`, `allocation_id`, `grounding_allocation_id`, `is_new`, `grounding_position_code`, `material_code`, `market_name`, `incoming_batch`, `material_name`, `waybill_number`) VALUES (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted} , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, #{item.orderCode}, #{item.questId}, #{item.orderId} - , #{item.questType}, #{item.questTarget}, #{item.ordePackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus}, + , #{item.questType}, #{item.questTarget}, #{item.orderPackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus}, #{item.stockNum}, #{item.warehouseId} , #{item.positionCode}, #{item.trayCode}, #{item.trayId}, #{item.allocationId}, #{item.groundingAllocationId}, #{item.isNew}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.incomingBatch}, #{item.materialName}, #{item.waybillNumber} ) @@ -146,7 +146,7 @@ and allocation_id =#{param.allocationId } and tray_id =#{param.trayId } and order_code =#{param.orderCode } - and orde_package_code =#{param.ordePackageCode } + and order_package_code =#{param.orderPackageCode }