[add]销售管理:

新增售后通知单
完成数据填充，页面展示，条件查询操作

ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesAftersalesNoticeController.java

@@ -0,0 +1,151 @@
+package com.ruoyi.sales.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+import com.ruoyi.sales.service.ISalesAftersalesNoticeService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 售后通知单Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+@Controller
+@RequestMapping("/sales/afterSalesNotice")
+public class SalesAftersalesNoticeController extends BaseController
+{
+    private String prefix = "sales/afterSalesNotice";
+
+    @Autowired
+    private ISalesAftersalesNoticeService salesAftersalesNoticeService;
+
+    @RequiresPermissions("sales:afterSalesNotice:view")
+    @GetMapping()
+    public String afterSalesNotice()
+    {
+        return prefix + "/afterSalesNotice";
+    }
+
+    /**
+     * 查询售后通知单列表
+     */
+    @RequiresPermissions("sales:afterSalesNotice:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        startPage();
+        List<SalesAftersalesNotice> list = salesAftersalesNoticeService.selectSalesAftersalesNoticeList(salesAftersalesNotice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出售后通知单列表
+     */
+    @RequiresPermissions("sales:afterSalesNotice:export")
+    @Log(title = "售后通知单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        List<SalesAftersalesNotice> list = salesAftersalesNoticeService.selectSalesAftersalesNoticeList(salesAftersalesNotice);
+        ExcelUtil<SalesAftersalesNotice> util = new ExcelUtil<SalesAftersalesNotice>(SalesAftersalesNotice.class);
+        return util.exportExcel(list, "售后通知单数据");
+    }
+
+    /**
+     * 新增售后通知单
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存售后通知单
+     */
+    @RequiresPermissions("sales:afterSalesNotice:add")
+    @Log(title = "售后通知单", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        return toAjax(salesAftersalesNoticeService.insertSalesAftersalesNotice(salesAftersalesNotice));
+    }
+
+    /**
+     * 修改售后通知单
+     */
+    @GetMapping("/edit/{aftersalesNoticeId}")
+    public String edit(@PathVariable("aftersalesNoticeId") Long aftersalesNoticeId, ModelMap mmap)
+    {
+        SalesAftersalesNotice salesAftersalesNotice = salesAftersalesNoticeService.selectSalesAftersalesNoticeById(aftersalesNoticeId);
+        mmap.put("salesAftersalesNotice", salesAftersalesNotice);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存售后通知单
+     */
+    @RequiresPermissions("sales:afterSalesNotice:edit")
+    @Log(title = "售后通知单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        return toAjax(salesAftersalesNoticeService.updateSalesAftersalesNotice(salesAftersalesNotice));
+    }
+
+    /**
+     * 删除售后通知单
+     */
+    @RequiresPermissions("sales:afterSalesNotice:remove")
+    @Log(title = "售后通知单", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(salesAftersalesNoticeService.deleteSalesAftersalesNoticeByIds(ids));
+    }
+
+    /**
+     * 作废售后通知单
+     */
+    @RequiresPermissions("sales:afterSalesNotice:cancel")
+    @Log(title = "售后通知单", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(salesAftersalesNoticeService.cancelSalesAftersalesNoticeById(id));
+    }
+
+    /**
+     * 恢复售后通知单
+     */
+    @RequiresPermissions("sales:afterSalesNotice:restore")
+    @Log(title = "售后通知单", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(salesAftersalesNoticeService.restoreSalesAftersalesNoticeById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesAftersalesNotice.java

@@ -0,0 +1,367 @@
+package com.ruoyi.sales.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 售后通知单对象 sales_aftersales_notice
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public class SalesAftersalesNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 售后通知单ID */
+    private Long aftersalesNoticeId;
+
+    /** 售后单号 */
+    @Excel(name = "售后单号")
+    private String aftersalesNoticeCode;
+
+    /** 关联销售订单编号 */
+    @Excel(name = "关联销售订单编号")
+    private String salesOrderCode;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String auditStatus;
+
+    /** 售后状态 */
+    @Excel(name = "售后状态")
+    private String aftersalesStatus;
+
+    /** 业务人员 */
+    @Excel(name = "业务人员")
+    private String businessMembers;
+
+    /** 售后人员 */
+    @Excel(name = "售后人员")
+    private String aftersalesMembers;
+
+    /** 客户代码 */
+    @Excel(name = "客户代码")
+    private String enterpriseCode;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String enterpriseName;
+
+    /** 物料数合计 */
+    @Excel(name = "物料数合计")
+    private String materialSum;
+
+    /** 数量合计 */
+    @Excel(name = "数量合计")
+    private String enterpriseSum;
+
+    /** 客户要求出发日期 */
+    @Excel(name = "客户要求出发日期")
+    private String startTime;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String customerContact;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactNumber;
+
+    /** 公司地址 */
+    @Excel(name = "公司地址")
+    private String companyAddress;
+
+    /** 流程实例ID */
+    @Excel(name = "流程实例ID")
+    private String instanceId;
+
+    /** 流程实例类型 */
+    @Excel(name = "流程实例类型")
+    private String instanceType;
+
+    /** 流程提交实例ID */
+    @Excel(name = "流程提交实例ID")
+    private String submitInstanceId;
+
+    /** 申请标题 */
+    @Excel(name = "申请标题")
+    private String applyTitle;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyUser;
+
+    /** 流程作废实例ID */
+    @Excel(name = "流程作废实例ID")
+    private String cancelInstanceId;
+
+    /** 流程恢复实例ID */
+    @Excel(name = "流程恢复实例ID")
+    private String restoreInstanceId;
+
+    public void setAftersalesNoticeId(Long aftersalesNoticeId) 
+    {
+        this.aftersalesNoticeId = aftersalesNoticeId;
+    }
+
+    public Long getAftersalesNoticeId() 
+    {
+        return aftersalesNoticeId;
+    }
+    public void setAftersalesNoticeCode(String aftersalesNoticeCode) 
+    {
+        this.aftersalesNoticeCode = aftersalesNoticeCode;
+    }
+
+    public String getAftersalesNoticeCode() 
+    {
+        return aftersalesNoticeCode;
+    }
+    public void setSalesOrderCode(String salesOrderCode) 
+    {
+        this.salesOrderCode = salesOrderCode;
+    }
+
+    public String getSalesOrderCode() 
+    {
+        return salesOrderCode;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAuditStatus(String auditStatus) 
+    {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() 
+    {
+        return auditStatus;
+    }
+    public void setAftersalesStatus(String aftersalesStatus) 
+    {
+        this.aftersalesStatus = aftersalesStatus;
+    }
+
+    public String getAftersalesStatus() 
+    {
+        return aftersalesStatus;
+    }
+    public void setBusinessMembers(String businessMembers) 
+    {
+        this.businessMembers = businessMembers;
+    }
+
+    public String getBusinessMembers() 
+    {
+        return businessMembers;
+    }
+    public void setAftersalesMembers(String aftersalesMembers) 
+    {
+        this.aftersalesMembers = aftersalesMembers;
+    }
+
+    public String getAftersalesMembers() 
+    {
+        return aftersalesMembers;
+    }
+    public void setEnterpriseCode(String enterpriseCode) 
+    {
+        this.enterpriseCode = enterpriseCode;
+    }
+
+    public String getEnterpriseCode() 
+    {
+        return enterpriseCode;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setMaterialSum(String materialSum) 
+    {
+        this.materialSum = materialSum;
+    }
+
+    public String getMaterialSum() 
+    {
+        return materialSum;
+    }
+    public void setEnterpriseSum(String enterpriseSum) 
+    {
+        this.enterpriseSum = enterpriseSum;
+    }
+
+    public String getEnterpriseSum() 
+    {
+        return enterpriseSum;
+    }
+    public void setStartTime(String startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public String getStartTime() 
+    {
+        return startTime;
+    }
+    public void setCustomerContact(String customerContact) 
+    {
+        this.customerContact = customerContact;
+    }
+
+    public String getCustomerContact() 
+    {
+        return customerContact;
+    }
+    public void setContactNumber(String contactNumber) 
+    {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getContactNumber() 
+    {
+        return contactNumber;
+    }
+    public void setCompanyAddress(String companyAddress) 
+    {
+        this.companyAddress = companyAddress;
+    }
+
+    public String getCompanyAddress() 
+    {
+        return companyAddress;
+    }
+    public void setInstanceId(String instanceId) 
+    {
+        this.instanceId = instanceId;
+    }
+
+    public String getInstanceId() 
+    {
+        return instanceId;
+    }
+    public void setInstanceType(String instanceType) 
+    {
+        this.instanceType = instanceType;
+    }
+
+    public String getInstanceType() 
+    {
+        return instanceType;
+    }
+    public void setSubmitInstanceId(String submitInstanceId) 
+    {
+        this.submitInstanceId = submitInstanceId;
+    }
+
+    public String getSubmitInstanceId() 
+    {
+        return submitInstanceId;
+    }
+    public void setApplyTitle(String applyTitle) 
+    {
+        this.applyTitle = applyTitle;
+    }
+
+    public String getApplyTitle() 
+    {
+        return applyTitle;
+    }
+    public void setApplyTime(Date applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setApplyUser(String applyUser) 
+    {
+        this.applyUser = applyUser;
+    }
+
+    public String getApplyUser() 
+    {
+        return applyUser;
+    }
+    public void setCancelInstanceId(String cancelInstanceId) 
+    {
+        this.cancelInstanceId = cancelInstanceId;
+    }
+
+    public String getCancelInstanceId() 
+    {
+        return cancelInstanceId;
+    }
+    public void setRestoreInstanceId(String restoreInstanceId) 
+    {
+        this.restoreInstanceId = restoreInstanceId;
+    }
+
+    public String getRestoreInstanceId() 
+    {
+        return restoreInstanceId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("aftersalesNoticeId", getAftersalesNoticeId())
+            .append("aftersalesNoticeCode", getAftersalesNoticeCode())
+            .append("salesOrderCode", getSalesOrderCode())
+            .append("userId", getUserId())
+            .append("auditStatus", getAuditStatus())
+            .append("aftersalesStatus", getAftersalesStatus())
+            .append("businessMembers", getBusinessMembers())
+            .append("aftersalesMembers", getAftersalesMembers())
+            .append("enterpriseCode", getEnterpriseCode())
+            .append("enterpriseName", getEnterpriseName())
+            .append("materialSum", getMaterialSum())
+            .append("enterpriseSum", getEnterpriseSum())
+            .append("startTime", getStartTime())
+            .append("customerContact", getCustomerContact())
+            .append("contactNumber", getContactNumber())
+            .append("companyAddress", getCompanyAddress())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("instanceId", getInstanceId())
+            .append("instanceType", getInstanceType())
+            .append("submitInstanceId", getSubmitInstanceId())
+            .append("applyTitle", getApplyTitle())
+            .append("applyTime", getApplyTime())
+            .append("applyUser", getApplyUser())
+            .append("cancelInstanceId", getCancelInstanceId())
+            .append("restoreInstanceId", getRestoreInstanceId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesAftersalesNoticeMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.sales.mapper;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+
+/**
+ * 售后通知单Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public interface SalesAftersalesNoticeMapper 
+{
+    /**
+     * 查询售后通知单
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 售后通知单
+     */
+    public SalesAftersalesNotice selectSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 查询售后通知单列表
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 售后通知单集合
+     */
+    public List<SalesAftersalesNotice> selectSalesAftersalesNoticeList(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 新增售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    public int insertSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 修改售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    public int updateSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 删除售后通知单
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    public int deleteSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 批量删除售后通知单
+     * 
+     * @param aftersalesNoticeIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesAftersalesNoticeByIds(String[] aftersalesNoticeIds);
+
+    /**
+     * 作废售后通知单
+     *
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    public int cancelSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 恢复售后通知单
+     *
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    public int restoreSalesAftersalesNoticeById(Long aftersalesNoticeId);
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesAftersalesNoticeService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.sales.service;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+
+/**
+ * 售后通知单Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+public interface ISalesAftersalesNoticeService 
+{
+    /**
+     * 查询售后通知单
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 售后通知单
+     */
+    public SalesAftersalesNotice selectSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 查询售后通知单列表
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 售后通知单集合
+     */
+    public List<SalesAftersalesNotice> selectSalesAftersalesNoticeList(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 新增售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    public int insertSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 修改售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    public int updateSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice);
+
+    /**
+     * 批量删除售后通知单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesAftersalesNoticeByIds(String ids);
+
+    /**
+     * 删除售后通知单信息
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    public int deleteSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 作废售后通知单
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return
+     */
+    int cancelSalesAftersalesNoticeById(Long aftersalesNoticeId);
+
+    /**
+     * 恢复售后通知单
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return
+     */
+    int restoreSalesAftersalesNoticeById(Long aftersalesNoticeId);
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesAftersalesNoticeServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.sales.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.sales.mapper.SalesAftersalesNoticeMapper;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+import com.ruoyi.sales.service.ISalesAftersalesNoticeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 售后通知单Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-15
+ */
+@Service
+public class SalesAftersalesNoticeServiceImpl implements ISalesAftersalesNoticeService 
+{
+    @Autowired
+    private SalesAftersalesNoticeMapper salesAftersalesNoticeMapper;
+
+    /**
+     * 查询售后通知单
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 售后通知单
+     */
+    @Override
+    public SalesAftersalesNotice selectSalesAftersalesNoticeById(Long aftersalesNoticeId)
+    {
+        return salesAftersalesNoticeMapper.selectSalesAftersalesNoticeById(aftersalesNoticeId);
+    }
+
+    /**
+     * 查询售后通知单列表
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 售后通知单
+     */
+    @Override
+    public List<SalesAftersalesNotice> selectSalesAftersalesNoticeList(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        return salesAftersalesNoticeMapper.selectSalesAftersalesNoticeList(salesAftersalesNotice);
+    }
+
+    /**
+     * 新增售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    @Override
+    public int insertSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        salesAftersalesNotice.setCreateBy(loginName);
+        salesAftersalesNotice.setCreateTime(DateUtils.getNowDate());
+        return salesAftersalesNoticeMapper.insertSalesAftersalesNotice(salesAftersalesNotice);
+    }
+
+    /**
+     * 修改售后通知单
+     * 
+     * @param salesAftersalesNotice 售后通知单
+     * @return 结果
+     */
+    @Override
+    public int updateSalesAftersalesNotice(SalesAftersalesNotice salesAftersalesNotice)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        salesAftersalesNotice.setUpdateBy(loginName);
+        salesAftersalesNotice.setUpdateTime(DateUtils.getNowDate());
+        return salesAftersalesNoticeMapper.updateSalesAftersalesNotice(salesAftersalesNotice);
+    }
+
+    /**
+     * 删除售后通知单对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesAftersalesNoticeByIds(String ids)
+    {
+        return salesAftersalesNoticeMapper.deleteSalesAftersalesNoticeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除售后通知单信息
+     * 
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesAftersalesNoticeById(Long aftersalesNoticeId)
+    {
+        return salesAftersalesNoticeMapper.deleteSalesAftersalesNoticeById(aftersalesNoticeId);
+    }
+
+    /**
+     * 作废售后通知单
+     *
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    @Override
+    public int cancelSalesAftersalesNoticeById(Long aftersalesNoticeId)
+    {
+        return salesAftersalesNoticeMapper.cancelSalesAftersalesNoticeById(aftersalesNoticeId);
+    }
+
+    /**
+     * 恢复售后通知单信息
+     *
+     * @param aftersalesNoticeId 售后通知单ID
+     * @return 结果
+     */
+    @Override
+    public int restoreSalesAftersalesNoticeById(Long aftersalesNoticeId)
+    {
+        return salesAftersalesNoticeMapper.restoreSalesAftersalesNoticeById(aftersalesNoticeId);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java

@@ -20,7 +20,7 @@ public class SysCustomer extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 客户id */
+    /** 客户表索引id */
     private Long id;
 
     private Long customerId;

ruoyi-admin/src/main/resources/mapper/sales/SalesAftersalesNoticeMapper.xml

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sales.mapper.SalesAftersalesNoticeMapper">
+    
+    <resultMap type="SalesAftersalesNotice" id="SalesAftersalesNoticeResult">
+        <result property="aftersalesNoticeId"    column="aftersales_notice_id"    />
+        <result property="aftersalesNoticeCode"    column="aftersales_notice_code"    />
+        <result property="salesOrderCode"    column="sales_order_code"    />
+        <result property="userId"    column="user_id"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="aftersalesStatus"    column="aftersales_status"    />
+        <result property="businessMembers"    column="business_members"    />
+        <result property="aftersalesMembers"    column="aftersales_members"    />
+        <result property="enterpriseCode"    column="enterprise_code"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="materialSum"    column="material_sum"    />
+        <result property="enterpriseSum"    column="enterprise_sum"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="customerContact"    column="customer_contact"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="companyAddress"    column="company_address"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="instanceType"    column="instance_type"    />
+        <result property="submitInstanceId"    column="submit_instance_id"    />
+        <result property="applyTitle"    column="apply_title"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="applyUser"    column="apply_user"    />
+        <result property="cancelInstanceId"    column="cancel_instance_id"    />
+        <result property="restoreInstanceId"    column="restore_instance_id"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSalesAftersalesNoticeVo">
+        select aftersales_notice_id, aftersales_notice_code, sales_order_code, user_id, audit_status, aftersales_status, business_members, aftersales_members, enterprise_code, enterprise_name, material_sum, enterprise_sum, start_time, customer_contact, contact_number, company_address, create_by, create_time, update_by, update_time, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id, remark from sales_aftersales_notice
+    </sql>
+
+    <select id="selectSalesAftersalesNoticeList" parameterType="SalesAftersalesNotice" resultMap="SalesAftersalesNoticeResult">
+        <include refid="selectSalesAftersalesNoticeVo"/>
+        <where>  
+            <if test="aftersalesNoticeCode != null  and aftersalesNoticeCode != ''"> and aftersales_notice_code = #{aftersalesNoticeCode}</if>
+            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="aftersalesStatus != null  and aftersalesStatus != ''"> and aftersales_status = #{aftersalesStatus}</if>
+            <if test="businessMembers != null  and businessMembers != ''"> and business_members like concat('%', #{businessMembers}, '%')</if>
+            <if test="aftersalesMembers != null  and aftersalesMembers != ''"> and aftersales_members like concat('%', #{aftersalesMembers}, '%')</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="materialSum != null  and materialSum != ''"> and material_sum = #{materialSum}</if>
+            <if test="enterpriseSum != null  and enterpriseSum != ''"> and enterprise_sum = #{enterpriseSum}</if>
+            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
+            <if test="customerContact != null  and customerContact != ''"> and customer_contact = #{customerContact}</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = #{contactNumber}</if>
+            <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="instanceId != null  and instanceId != ''"> and instance_id = #{instanceId}</if>
+            <if test="instanceType != null  and instanceType != ''"> and instance_type = #{instanceType}</if>
+            <if test="submitInstanceId != null  and submitInstanceId != ''"> and submit_instance_id = #{submitInstanceId}</if>
+            <if test="applyTitle != null  and applyTitle != ''"> and apply_title = #{applyTitle}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="applyUser != null  and applyUser != ''"> and apply_user = #{applyUser}</if>
+            <if test="cancelInstanceId != null  and cancelInstanceId != ''"> and cancel_instance_id = #{cancelInstanceId}</if>
+            <if test="restoreInstanceId != null  and restoreInstanceId != ''"> and restore_instance_id = #{restoreInstanceId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSalesAftersalesNoticeById" parameterType="Long" resultMap="SalesAftersalesNoticeResult">
+        <include refid="selectSalesAftersalesNoticeVo"/>
+        where aftersales_notice_id = #{aftersalesNoticeId}
+    </select>
+        
+    <insert id="insertSalesAftersalesNotice" parameterType="SalesAftersalesNotice" useGeneratedKeys="true" keyProperty="aftersalesNoticeId">
+        insert into sales_aftersales_notice
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="aftersalesNoticeCode != null">aftersales_notice_code,</if>
+            <if test="salesOrderCode != null">sales_order_code,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="aftersalesStatus != null">aftersales_status,</if>
+            <if test="businessMembers != null">business_members,</if>
+            <if test="aftersalesMembers != null">aftersales_members,</if>
+            <if test="enterpriseCode != null">enterprise_code,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="enterpriseSum != null">enterprise_sum,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="customerContact != null">customer_contact,</if>
+            <if test="contactNumber != null">contact_number,</if>
+            <if test="companyAddress != null">company_address,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="instanceId != null">instance_id,</if>
+            <if test="instanceType != null">instance_type,</if>
+            <if test="submitInstanceId != null">submit_instance_id,</if>
+            <if test="applyTitle != null">apply_title,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="applyUser != null">apply_user,</if>
+            <if test="cancelInstanceId != null">cancel_instance_id,</if>
+            <if test="restoreInstanceId != null">restore_instance_id,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="aftersalesNoticeCode != null">#{aftersalesNoticeCode},</if>
+            <if test="salesOrderCode != null">#{salesOrderCode},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="aftersalesStatus != null">#{aftersalesStatus},</if>
+            <if test="businessMembers != null">#{businessMembers},</if>
+            <if test="aftersalesMembers != null">#{aftersalesMembers},</if>
+            <if test="enterpriseCode != null">#{enterpriseCode},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="enterpriseSum != null">#{enterpriseSum},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="customerContact != null">#{customerContact},</if>
+            <if test="contactNumber != null">#{contactNumber},</if>
+            <if test="companyAddress != null">#{companyAddress},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="instanceType != null">#{instanceType},</if>
+            <if test="submitInstanceId != null">#{submitInstanceId},</if>
+            <if test="applyTitle != null">#{applyTitle},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="applyUser != null">#{applyUser},</if>
+            <if test="cancelInstanceId != null">#{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">#{restoreInstanceId},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSalesAftersalesNotice" parameterType="SalesAftersalesNotice">
+        update sales_aftersales_notice
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="aftersalesNoticeCode != null">aftersales_notice_code = #{aftersalesNoticeCode},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="aftersalesStatus != null">aftersales_status = #{aftersalesStatus},</if>
+            <if test="businessMembers != null">business_members = #{businessMembers},</if>
+            <if test="aftersalesMembers != null">aftersales_members = #{aftersalesMembers},</if>
+            <if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="customerContact != null">customer_contact = #{customerContact},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
+            <if test="companyAddress != null">company_address = #{companyAddress},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="instanceType != null">instance_type = #{instanceType},</if>
+            <if test="submitInstanceId != null">submit_instance_id = #{submitInstanceId},</if>
+            <if test="applyTitle != null">apply_title = #{applyTitle},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="applyUser != null">apply_user = #{applyUser},</if>
+            <if test="cancelInstanceId != null">cancel_instance_id = #{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">restore_instance_id = #{restoreInstanceId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where aftersales_notice_id = #{aftersalesNoticeId}
+    </update>
+
+    <delete id="deleteSalesAftersalesNoticeById" parameterType="Long">
+        delete from sales_aftersales_notice where aftersales_notice_id = #{aftersalesNoticeId}
+    </delete>
+
+    <delete id="deleteSalesAftersalesNoticeByIds" parameterType="String">
+        delete from sales_aftersales_notice where aftersales_notice_id in 
+        <foreach item="aftersalesNoticeId" collection="array" open="(" separator="," close=")">
+            #{aftersalesNoticeId}
+        </foreach>
+    </delete>
+
+    <update id="cancelSalesAftersalesNoticeById" parameterType="Long">
+        update sales_aftersales_notice set del_flag = '1' where aftersales_notice_id = #{aftersalesNoticeId}
+    </update>
+
+    <update id="restoreSalesAftersalesNoticeById" parameterType="Long">
+        update sales_aftersales_notice set del_flag = '0' where aftersales_notice_id = #{aftersalesNoticeId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/add.html

@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增售后通知单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-afterSalesNotice-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后单号：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesNoticeCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联销售订单编号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户ID：</label>
+                <div class="col-sm-8">
+                    <input name="userId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('auditStatus')}">
+                        <input type="radio" th:id="${'auditStatus_' + dict.dictCode}" name="auditStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'auditStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sales_aftersales_status')}">
+                        <input type="radio" th:id="${'aftersalesStatus_' + dict.dictCode}" name="aftersalesStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'aftersalesStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务人员：</label>
+                <div class="col-sm-8">
+                    <input name="businessMembers" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后人员：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesMembers" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户代码：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料数合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户要求出发日期：</label>
+                <div class="col-sm-8">
+                    <input name="startTime" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系人：</label>
+                <div class="col-sm-8">
+                    <input name="customerContact" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">公司地址：</label>
+                <div class="col-sm-8">
+                    <input name="companyAddress" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="instanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例类型：</label>
+                <div class="col-sm-8">
+                    <select name="instanceType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程提交实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="submitInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请标题：</label>
+                <div class="col-sm-8">
+                    <input name="applyTitle" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="applyTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人：</label>
+                <div class="col-sm-8">
+                    <input name="applyUser" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程作废实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="cancelInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程恢复实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="restoreInstanceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/afterSalesNotice"
+        $("#form-afterSalesNotice-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-afterSalesNotice-add').serialize());
+            }
+        }
+
+        $("input[name='applyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html

@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('售后通知单列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>售后单号：</label>
+                                <input type="text" name="aftersalesNoticeCode"/>
+                            </li>
+                            <li>
+                                <label>审核状态：</label>
+                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>关联订单号：</label>
+                                <input type="text" name="salesOrderCode"/>
+                            </li>
+                            <li>
+                                <label>业务员：</label>
+                                <input type="text" name="businessMembers"/>
+                            </li>
+                            <li>
+                                <label>售后员：</label>
+                                <input type="text" name="aftersalesMembers"/>
+                            </li>
+                            <li>
+                                <label>售后状态：</label>
+                                <select name="aftersalesStatus" th:with="type=${@dict.getType('sales_aftersales_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sales:afterSalesNotice:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="sales:afterSalesNotice:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sales:afterSalesNotice:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="sales:afterSalesNotice:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('sales:afterSalesNotice:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('sales:afterSalesNotice:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('sales:afterSalesNotice:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('sales:afterSalesNotice:restore')}]];
+        var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+        var aftersalesStatusDatas = [[${@dict.getType('sales_aftersales_status')}]];
+        var prefix = ctx + "sales/afterSalesNotice";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "售后通知单",
+                columns: [{
+                    checkbox: true
+                },
+                    {
+                        title: '售后通知单ID',
+                        field: 'aftersalesNoticeId',
+                        visible: false
+                    },
+                    {
+                        title: '审核状态',
+                        field: 'auditStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(auditStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '售后状态',
+                        field: 'aftersalesStatus',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(aftersalesStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '售后单号',
+                        field: 'aftersalesNoticeCode',
+                    },
+                    {
+                        title: '业务员',
+                        field: 'businessMembers',
+                    },
+                    {
+                        title: '关联销售单号',
+                        field: 'salesOrderCode',
+                    },
+                    {
+                        title: '客户ID',
+                        field: 'enterpriseCode',
+                    },
+                    {
+                        title: '客户公司名称',
+                        field: 'enterpriseName',
+                    },
+                    {
+                        title: '物料数合计',
+                        field: 'materialSum',
+                    },
+                    {
+                        title: '数量合计',
+                        field: 'enterpriseSum',
+                    },
+                    {
+                        title: '联系人',
+                        field: 'customerContact',
+                    },
+                    {
+                        title: '联系电话',
+                        field: 'contactNumber',
+                    },
+                    {
+                        title: '客户要求出发日期',
+                        field: 'startTime',
+                    },
+                    {
+                        title: '公司地址',
+                        field: 'companyAddress',
+                    },
+                    {
+                        title: '售后员',
+                        field: 'aftersalesMembers',
+                    },
+                    {
+                        title: '录入时间',
+                        field: 'createTime',
+                    },
+                    {
+                        title: '更新人',
+                        field: 'updateBy',
+                    },
+                    {
+                        title: '上次更新时间',
+                        field: 'updateTime',
+                    },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.aftersalesNoticeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.aftersalesNoticeId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/edit.html

@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改售后通知单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-afterSalesNotice-edit" th:object="${salesAftersalesNotice}">
+            <input name="aftersalesNoticeId" th:field="*{aftersalesNoticeId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后单号：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesNoticeCode" th:field="*{aftersalesNoticeCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联销售订单编号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户ID：</label>
+                <div class="col-sm-8">
+                    <input name="userId" th:field="*{userId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('auditStatus')}">
+                        <input type="radio" th:id="${'auditStatus_' + dict.dictCode}" name="auditStatus" th:value="${dict.dictValue}" th:field="*{auditStatus}">
+                        <label th:for="${'auditStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sales_aftersales_status')}">
+                        <input type="radio" th:id="${'aftersalesStatus_' + dict.dictCode}" name="aftersalesStatus" th:value="${dict.dictValue}" th:field="*{aftersalesStatus}">
+                        <label th:for="${'aftersalesStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务人员：</label>
+                <div class="col-sm-8">
+                    <input name="businessMembers" th:field="*{businessMembers}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后人员：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesMembers" th:field="*{aftersalesMembers}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户代码：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料数合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" th:field="*{materialSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseSum" th:field="*{enterpriseSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户要求出发日期：</label>
+                <div class="col-sm-8">
+                    <input name="startTime" th:field="*{startTime}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系人：</label>
+                <div class="col-sm-8">
+                    <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">公司地址：</label>
+                <div class="col-sm-8">
+                    <input name="companyAddress" th:field="*{companyAddress}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="instanceId" th:field="*{instanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程实例类型：</label>
+                <div class="col-sm-8">
+                    <select name="instanceType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程提交实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="submitInstanceId" th:field="*{submitInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请标题：</label>
+                <div class="col-sm-8">
+                    <input name="applyTitle" th:field="*{applyTitle}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="applyTime" th:value="${#dates.format(salesAftersalesNotice.applyTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人：</label>
+                <div class="col-sm-8">
+                    <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程作废实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="cancelInstanceId" th:field="*{cancelInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流程恢复实例ID：</label>
+                <div class="col-sm-8">
+                    <input name="restoreInstanceId" th:field="*{restoreInstanceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/afterSalesNotice";
+        $("#form-afterSalesNotice-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-afterSalesNotice-edit').serialize());
+            }
+        }
+
+        $("input[name='applyTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>