From 10546cc2e7dfe922d05aa3b513fbf6eeaf641a55 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 24 Apr 2024 15:24:26 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=94=AE=E5=90=8E=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AftersalesOrderController.java | 151 +++++++ .../aftersales/domain/AftersalesOrder.java | 422 ++++++++++++++++++ .../mapper/AftersalesOrderMapper.java | 77 ++++ .../service/IAftersalesOrderService.java | 75 ++++ .../impl/AftersalesOrderServiceImpl.java | 126 ++++++ .../aftersales/AftersalesOrderMapper.xml | 198 ++++++++ .../aftersales/aftersalesOrder/add.html | 266 +++++++++++ .../aftersalesOrder/aftersalesOrder.html | 185 ++++++++ .../aftersales/aftersalesOrder/edit.html | 271 +++++++++++ 9 files changed, 1771 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java new file mode 100644 index 00000000..7db083ba --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java @@ -0,0 +1,151 @@ +package com.ruoyi.aftersales.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.aftersales.domain.AftersalesOrder; +import com.ruoyi.aftersales.service.IAftersalesOrderService; +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-24 + */ +@Controller +@RequestMapping("/aftersales/aftersalesOrder") +public class AftersalesOrderController extends BaseController +{ + private String prefix = "aftersales/aftersalesOrder"; + + @Autowired + private IAftersalesOrderService aftersalesOrderService; + + @RequiresPermissions("aftersales:aftersalesOrder:view") + @GetMapping() + public String aftersalesOrder() + { + return prefix + "/aftersalesOrder"; + } + + /** + * 查询售后单列表 + */ + @RequiresPermissions("aftersales:aftersalesOrder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(AftersalesOrder aftersalesOrder) + { + startPage(); + List list = aftersalesOrderService.selectAftersalesOrderList(aftersalesOrder); + return getDataTable(list); + } + + /** + * 导出售后单列表 + */ + @RequiresPermissions("aftersales:aftersalesOrder:export") + @Log(title = "售后单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(AftersalesOrder aftersalesOrder) + { + List list = aftersalesOrderService.selectAftersalesOrderList(aftersalesOrder); + ExcelUtil util = new ExcelUtil(AftersalesOrder.class); + return util.exportExcel(list, "售后单数据"); + } + + /** + * 新增售后单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存售后单 + */ + @RequiresPermissions("aftersales:aftersalesOrder:add") + @Log(title = "售后单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(AftersalesOrder aftersalesOrder) + { + return toAjax(aftersalesOrderService.insertAftersalesOrder(aftersalesOrder)); + } + + /** + * 修改售后单 + */ + @GetMapping("/edit/{aftersalesOrderId}") + public String edit(@PathVariable("aftersalesOrderId") Long aftersalesOrderId, ModelMap mmap) + { + AftersalesOrder aftersalesOrder = aftersalesOrderService.selectAftersalesOrderById(aftersalesOrderId); + mmap.put("aftersalesOrder", aftersalesOrder); + return prefix + "/edit"; + } + + /** + * 修改保存售后单 + */ + @RequiresPermissions("aftersales:aftersalesOrder:edit") + @Log(title = "售后单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(AftersalesOrder aftersalesOrder) + { + return toAjax(aftersalesOrderService.updateAftersalesOrder(aftersalesOrder)); + } + + /** + * 删除售后单 + */ + @RequiresPermissions("aftersales:aftersalesOrder:remove") + @Log(title = "售后单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(aftersalesOrderService.deleteAftersalesOrderByIds(ids)); + } + + /** + * 作废售后单 + */ + @RequiresPermissions("aftersales:aftersalesOrder:cancel") + @Log(title = "售后单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(aftersalesOrderService.cancelAftersalesOrderById(id)); + } + + /** + * 恢复售后单 + */ + @RequiresPermissions("aftersales:aftersalesOrder:restore") + @Log(title = "售后单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(aftersalesOrderService.restoreAftersalesOrderById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java new file mode 100644 index 00000000..ad33766e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java @@ -0,0 +1,422 @@ +package com.ruoyi.aftersales.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; + +/** + * 售后单对象 aftersales_order + * + * @author 刘晓旭 + * @date 2024-04-24 + */ +public class AftersalesOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 售后单ID */ + private Long aftersalesOrderId; + + /** 售后单号 */ + @Excel(name = "售后单号") + private String aftersalesOrderCode; + + /** 关联销售订单号 */ + @Excel(name = "关联销售订单号") + private String salesOrderCode; + + /** 关联生产订单号 */ + private String makeNo; + + /** 用户ID */ + private Long userId; + + /** 审核状态 */ + private String auditStatus; + + /** 售后状态 */ + @Excel(name = "售后状态") + private String aftersalesStatus; + + /** 业务员 */ + @Excel(name = "业务员") + private String businessName; + + /** 售后员 */ + @Excel(name = "售后员") + private String aftersalesName; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 料号 */ + private String materialNo; + + /** 物料名称 */ + private String materialName; + + /** 物料数合计 */ + @Excel(name = "物料数合计") + private String materialSum; + + /** 数量合计 */ + @Excel(name = "数量合计") + private String enterpriseSum; + + /** 客户要求出发日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "客户要求出发日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date startDate; + + /** 收货联系人 */ + @Excel(name = "收货联系人") + private String deliveryName; + + /** 收货电话 */ + @Excel(name = "收货电话") + private String deliveryNumber; + + /** 公司地址 */ + @Excel(name = "公司地址") + private String companyAddress; + + /** 服务内容 */ + private String serviceContent; + + /** 用户评价 */ + private String userCommentAttachment; + + /** 流程实例ID */ + private String instanceId; + + /** 流程实例类型 */ + private String instanceType; + + /** 流程提交实例ID */ + private String submitInstanceId; + + /** 申请标题 */ + private String applyTitle; + + /** 申请时间 */ + private Date applyTime; + + /** 申请人 */ + private String applyUser; + + /** 流程作废实例ID */ + private String cancelInstanceId; + + /** 流程恢复实例ID */ + private String restoreInstanceId; + + public void setAftersalesOrderId(Long aftersalesOrderId) + { + this.aftersalesOrderId = aftersalesOrderId; + } + + public Long getAftersalesOrderId() + { + return aftersalesOrderId; + } + public void setAftersalesOrderCode(String aftersalesOrderCode) + { + this.aftersalesOrderCode = aftersalesOrderCode; + } + + public String getAftersalesOrderCode() + { + return aftersalesOrderCode; + } + public void setSalesOrderCode(String salesOrderCode) + { + this.salesOrderCode = salesOrderCode; + } + + public String getSalesOrderCode() + { + return salesOrderCode; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + 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 setBusinessName(String businessName) + { + this.businessName = businessName; + } + + public String getBusinessName() + { + return businessName; + } + public void setAftersalesName(String aftersalesName) + { + this.aftersalesName = aftersalesName; + } + + public String getAftersalesName() + { + return aftersalesName; + } + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + public void setMaterialNo(String materialNo) + { + this.materialNo = materialNo; + } + + public String getMaterialNo() + { + return materialNo; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + 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 setStartDate(Date startDate) + { + this.startDate = startDate; + } + + public Date getStartDate() + { + return startDate; + } + public void setDeliveryName(String deliveryName) + { + this.deliveryName = deliveryName; + } + + public String getDeliveryName() + { + return deliveryName; + } + public void setDeliveryNumber(String deliveryNumber) + { + this.deliveryNumber = deliveryNumber; + } + + public String getDeliveryNumber() + { + return deliveryNumber; + } + public void setCompanyAddress(String companyAddress) + { + this.companyAddress = companyAddress; + } + + public String getCompanyAddress() + { + return companyAddress; + } + public void setServiceContent(String serviceContent) + { + this.serviceContent = serviceContent; + } + + public String getServiceContent() + { + return serviceContent; + } + public void setUserCommentAttachment(String userCommentAttachment) + { + this.userCommentAttachment = userCommentAttachment; + } + + public String getUserCommentAttachment() + { + return userCommentAttachment; + } + 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("aftersalesOrderId", getAftersalesOrderId()) + .append("aftersalesOrderCode", getAftersalesOrderCode()) + .append("salesOrderCode", getSalesOrderCode()) + .append("makeNo", getMakeNo()) + .append("userId", getUserId()) + .append("auditStatus", getAuditStatus()) + .append("aftersalesStatus", getAftersalesStatus()) + .append("businessName", getBusinessName()) + .append("aftersalesName", getAftersalesName()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) + .append("startDate", getStartDate()) + .append("deliveryName", getDeliveryName()) + .append("deliveryNumber", getDeliveryNumber()) + .append("companyAddress", getCompanyAddress()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("serviceContent", getServiceContent()) + .append("userCommentAttachment", getUserCommentAttachment()) + .append("instanceId", getInstanceId()) + .append("instanceType", getInstanceType()) + .append("submitInstanceId", getSubmitInstanceId()) + .append("applyTitle", getApplyTitle()) + .append("applyTime", getApplyTime()) + .append("applyUser", getApplyUser()) + .append("cancelInstanceId", getCancelInstanceId()) + .append("restoreInstanceId", getRestoreInstanceId()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java new file mode 100644 index 00000000..b3095daf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.aftersales.mapper; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOrder; + +/** + * 售后单Mapper接口 + * + * @author 刘晓旭 + * @date 2024-04-24 + */ +public interface AftersalesOrderMapper +{ + /** + * 查询售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + public AftersalesOrder selectAftersalesOrderById(Long aftersalesOrderId); + + /** + * 查询售后单列表 + * + * @param aftersalesOrder 售后单 + * @return 售后单集合 + */ + public List selectAftersalesOrderList(AftersalesOrder aftersalesOrder); + + /** + * 新增售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + public int insertAftersalesOrder(AftersalesOrder aftersalesOrder); + + /** + * 修改售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + public int updateAftersalesOrder(AftersalesOrder aftersalesOrder); + + /** + * 删除售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + public int deleteAftersalesOrderById(Long aftersalesOrderId); + + /** + * 批量删除售后单 + * + * @param aftersalesOrderIds 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOrderByIds(String[] aftersalesOrderIds); + + /** + * 作废售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + public int cancelAftersalesOrderById(Long aftersalesOrderId); + + /** + * 恢复售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + public int restoreAftersalesOrderById(Long aftersalesOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java new file mode 100644 index 00000000..6d1c9e77 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java @@ -0,0 +1,75 @@ +package com.ruoyi.aftersales.service; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOrder; + +/** + * 售后单Service接口 + * + * @author 刘晓旭 + * @date 2024-04-24 + */ +public interface IAftersalesOrderService +{ + /** + * 查询售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + public AftersalesOrder selectAftersalesOrderById(Long aftersalesOrderId); + + /** + * 查询售后单列表 + * + * @param aftersalesOrder 售后单 + * @return 售后单集合 + */ + public List selectAftersalesOrderList(AftersalesOrder aftersalesOrder); + + /** + * 新增售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + public int insertAftersalesOrder(AftersalesOrder aftersalesOrder); + + /** + * 修改售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + public int updateAftersalesOrder(AftersalesOrder aftersalesOrder); + + /** + * 批量删除售后单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOrderByIds(String ids); + + /** + * 删除售后单信息 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + public int deleteAftersalesOrderById(Long aftersalesOrderId); + + /** + * 作废售后单 + * @param aftersalesOrderId 售后单ID + * @return + */ + int cancelAftersalesOrderById(Long aftersalesOrderId); + + /** + * 恢复售后单 + * @param aftersalesOrderId 售后单ID + * @return + */ + int restoreAftersalesOrderById(Long aftersalesOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java new file mode 100644 index 00000000..90ce098d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.aftersales.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.aftersales.mapper.AftersalesOrderMapper; +import com.ruoyi.aftersales.domain.AftersalesOrder; +import com.ruoyi.aftersales.service.IAftersalesOrderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 售后单Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-04-24 + */ +@Service +public class AftersalesOrderServiceImpl implements IAftersalesOrderService +{ + @Autowired + private AftersalesOrderMapper aftersalesOrderMapper; + + /** + * 查询售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + @Override + public AftersalesOrder selectAftersalesOrderById(Long aftersalesOrderId) + { + return aftersalesOrderMapper.selectAftersalesOrderById(aftersalesOrderId); + } + + /** + * 查询售后单列表 + * + * @param aftersalesOrder 售后单 + * @return 售后单 + */ + @Override + public List selectAftersalesOrderList(AftersalesOrder aftersalesOrder) + { + return aftersalesOrderMapper.selectAftersalesOrderList(aftersalesOrder); + } + + /** + * 新增售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + @Override + public int insertAftersalesOrder(AftersalesOrder aftersalesOrder) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOrder.setCreateBy(loginName); + aftersalesOrder.setCreateTime(DateUtils.getNowDate()); + return aftersalesOrderMapper.insertAftersalesOrder(aftersalesOrder); + } + + /** + * 修改售后单 + * + * @param aftersalesOrder 售后单 + * @return 结果 + */ + @Override + public int updateAftersalesOrder(AftersalesOrder aftersalesOrder) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOrder.setUpdateBy(loginName); + aftersalesOrder.setUpdateTime(DateUtils.getNowDate()); + return aftersalesOrderMapper.updateAftersalesOrder(aftersalesOrder); + } + + /** + * 删除售后单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteAftersalesOrderByIds(String ids) + { + return aftersalesOrderMapper.deleteAftersalesOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除售后单信息 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + @Override + public int deleteAftersalesOrderById(Long aftersalesOrderId) + { + return aftersalesOrderMapper.deleteAftersalesOrderById(aftersalesOrderId); + } + + /** + * 作废售后单 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + @Override + public int cancelAftersalesOrderById(Long aftersalesOrderId) + { + return aftersalesOrderMapper.cancelAftersalesOrderById(aftersalesOrderId); + } + + /** + * 恢复售后单信息 + * + * @param aftersalesOrderId 售后单ID + * @return 结果 + */ + @Override + public int restoreAftersalesOrderById(Long aftersalesOrderId) + { + return aftersalesOrderMapper.restoreAftersalesOrderById(aftersalesOrderId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml new file mode 100644 index 00000000..9e023d89 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select aftersales_order_id, aftersales_order_code, sales_order_code, make_no, user_id, audit_status, aftersales_status, business_name, aftersales_name, customer_id, customer_name, material_no, material_name, material_sum, enterprise_sum, start_date, delivery_name, delivery_number, company_address, create_by, create_time, update_by, update_time, remark, service_content, user_comment_attachment, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id from aftersales_order + + + + + + + + insert into aftersales_order + + aftersales_order_code, + sales_order_code, + make_no, + user_id, + audit_status, + aftersales_status, + business_name, + aftersales_name, + customer_id, + customer_name, + material_no, + material_name, + material_sum, + enterprise_sum, + start_date, + delivery_name, + delivery_number, + company_address, + create_by, + create_time, + update_by, + update_time, + remark, + service_content, + user_comment_attachment, + instance_id, + instance_type, + submit_instance_id, + apply_title, + apply_time, + apply_user, + cancel_instance_id, + restore_instance_id, + + + #{aftersalesOrderCode}, + #{salesOrderCode}, + #{makeNo}, + #{userId}, + #{auditStatus}, + #{aftersalesStatus}, + #{businessName}, + #{aftersalesName}, + #{customerId}, + #{customerName}, + #{materialNo}, + #{materialName}, + #{materialSum}, + #{enterpriseSum}, + #{startDate}, + #{deliveryName}, + #{deliveryNumber}, + #{companyAddress}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{serviceContent}, + #{userCommentAttachment}, + #{instanceId}, + #{instanceType}, + #{submitInstanceId}, + #{applyTitle}, + #{applyTime}, + #{applyUser}, + #{cancelInstanceId}, + #{restoreInstanceId}, + + + + + update aftersales_order + + aftersales_order_code = #{aftersalesOrderCode}, + sales_order_code = #{salesOrderCode}, + make_no = #{makeNo}, + user_id = #{userId}, + audit_status = #{auditStatus}, + aftersales_status = #{aftersalesStatus}, + business_name = #{businessName}, + aftersales_name = #{aftersalesName}, + customer_id = #{customerId}, + customer_name = #{customerName}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_sum = #{materialSum}, + enterprise_sum = #{enterpriseSum}, + start_date = #{startDate}, + delivery_name = #{deliveryName}, + delivery_number = #{deliveryNumber}, + company_address = #{companyAddress}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + service_content = #{serviceContent}, + user_comment_attachment = #{userCommentAttachment}, + instance_id = #{instanceId}, + instance_type = #{instanceType}, + submit_instance_id = #{submitInstanceId}, + apply_title = #{applyTitle}, + apply_time = #{applyTime}, + apply_user = #{applyUser}, + cancel_instance_id = #{cancelInstanceId}, + restore_instance_id = #{restoreInstanceId}, + + where aftersales_order_id = #{aftersalesOrderId} + + + + delete from aftersales_order where aftersales_order_id = #{aftersalesOrderId} + + + + delete from aftersales_order where aftersales_order_id in + + #{aftersalesOrderId} + + + + + update aftersales_order set del_flag = '1' where aftersales_order_id = #{aftersalesOrderId} + + + + update aftersales_order set del_flag = '0' where aftersales_order_id = #{aftersalesOrderId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/add.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/add.html new file mode 100644 index 00000000..038c5b86 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/add.html @@ -0,0 +1,266 @@ + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html new file mode 100644 index 00000000..a24a4bb9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html @@ -0,0 +1,185 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/edit.html new file mode 100644 index 00000000..25ce82bf --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/edit.html @@ -0,0 +1,271 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + \ No newline at end of file