diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java new file mode 100644 index 00000000..7f539730 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.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.AftersalesOutOrder; +import com.ruoyi.aftersales.service.IAftersalesOutOrderService; +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-11-06 + */ +@Controller +@RequestMapping("/aftersales/aftersalesOutOrder") +public class AftersalesOutOrderController extends BaseController +{ + private String prefix = "aftersales/aftersalesOutOrder"; + + @Autowired + private IAftersalesOutOrderService aftersalesOutOrderService; + + @RequiresPermissions("aftersales:aftersalesOutOrder:view") + @GetMapping() + public String aftersalesOutOrder() + { + return prefix + "/aftersalesOutOrder"; + } + + /** + * 查询售后维护设备出库列表 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(AftersalesOutOrder aftersalesOutOrder) + { + startPage(); + List list = aftersalesOutOrderService.selectAftersalesOutOrderList(aftersalesOutOrder); + return getDataTable(list); + } + + /** + * 导出售后维护设备出库列表 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:export") + @Log(title = "售后维护设备出库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(AftersalesOutOrder aftersalesOutOrder) + { + List list = aftersalesOutOrderService.selectAftersalesOutOrderList(aftersalesOutOrder); + ExcelUtil util = new ExcelUtil(AftersalesOutOrder.class); + return util.exportExcel(list, "售后维护设备出库数据"); + } + + /** + * 新增售后维护设备出库 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存售后维护设备出库 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:add") + @Log(title = "售后维护设备出库", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(AftersalesOutOrder aftersalesOutOrder) + { + return toAjax(aftersalesOutOrderService.insertAftersalesOutOrder(aftersalesOutOrder)); + } + + /** + * 修改售后维护设备出库 + */ + @GetMapping("/edit/{outOrderId}") + public String edit(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + AftersalesOutOrder aftersalesOutOrder = aftersalesOutOrderService.selectAftersalesOutOrderById(outOrderId); + mmap.put("aftersalesOutOrder", aftersalesOutOrder); + return prefix + "/edit"; + } + + /** + * 修改保存售后维护设备出库 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:edit") + @Log(title = "售后维护设备出库", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(AftersalesOutOrder aftersalesOutOrder) + { + return toAjax(aftersalesOutOrderService.updateAftersalesOutOrder(aftersalesOutOrder)); + } + + /** + * 删除售后维护设备出库 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:remove") + @Log(title = "售后维护设备出库", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(aftersalesOutOrderService.deleteAftersalesOutOrderByIds(ids)); + } + + /** + * 作废售后维护设备出库 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:cancel") + @Log(title = "售后维护设备出库", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(aftersalesOutOrderService.cancelAftersalesOutOrderById(id)); + } + + /** + * 恢复售后维护设备出库 + */ + @RequiresPermissions("aftersales:aftersalesOutOrder:restore") + @Log(title = "售后维护设备出库", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(aftersalesOutOrderService.restoreAftersalesOutOrderById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java new file mode 100644 index 00000000..92adf0ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java @@ -0,0 +1,466 @@ +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_out_order + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public class AftersalesOutOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 售后维护设备出库单Id */ + private Long outOrderId; + + /** 出库单号 */ + @Excel(name = "出库单号") + private String outOrderCode; + + /** 关联生产订单号 */ + private String makeNo; + + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收） */ + @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收") + private String warehouseOutStatus; + + /** 关联订单号（多种订单类型） */ + @Excel(name = "关联订单号", readConverterExp = "多=种订单类型") + private String relatedOrderCode; + + /** 关联销售订单编号 */ + private String salesOrderCode; + + /** 出库订单类型（0销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单） */ + @Excel(name = "出库订单类型", readConverterExp = "0=销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单") + private String warehouseOrderType; + + /** 委外单号 */ + private String outMakeCode; + + /** 请购单号 */ + private String requisitioningCode; + + /** 出库类型（0销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料） */ + @Excel(name = "出库类型", readConverterExp = "0=销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料") + private String warehouseOutType; + + /** 业务人员 */ + @Excel(name = "业务人员") + private String businessName; + + /** 售后人员 */ + @Excel(name = "售后人员") + private String aftersalesName; + + /** 仓库人员 */ + @Excel(name = "仓库人员") + private String warehouseName; + + /** 出货设备id */ + private String shippingDeviceId; + + /** 料号 */ + private String materialNo; + + /** 物料名称 */ + private String materialName; + + /** 物料数合计 */ + @Excel(name = "物料数合计") + private Integer materialSum; + + /** 数量合计 */ + @Excel(name = "数量合计") + private Integer enterpriseSum; + + /** 出库数 */ + private Integer outOrderSum; + + /** 出库对象 */ + private String outOrderName; + + /** 出库时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date outOrderTime; + + /** 供应商ID */ + private String supplierCode; + + /** 供应商名称 */ + private String supplierName; + + /** 客户ID */ + private String customerId; + + /** 客户名称 */ + private String customerName; + + /** 计划交付时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planDeliveryTime; + + /** 送货日期 */ + private Date deliveryDate; + + /** 交付条件 */ + @Excel(name = "交付条件") + private String deliveryCondition; + + /** 申请人 */ + @Excel(name = "申请人") + private String applyName; + + /** 收货地址 */ + @Excel(name = "收货地址") + private String deliveryAddress; + + /** 收货联系人 */ + @Excel(name = "收货联系人") + private String deliveryName; + + /** 收货电话 */ + @Excel(name = "收货电话") + private String deliveryNumber; + + public void setOutOrderId(Long outOrderId) + { + this.outOrderId = outOrderId; + } + + public Long getOutOrderId() + { + return outOrderId; + } + public void setOutOrderCode(String outOrderCode) + { + this.outOrderCode = outOrderCode; + } + + public String getOutOrderCode() + { + return outOrderCode; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + public void setWarehouseOutStatus(String warehouseOutStatus) + { + this.warehouseOutStatus = warehouseOutStatus; + } + + public String getWarehouseOutStatus() + { + return warehouseOutStatus; + } + public void setRelatedOrderCode(String relatedOrderCode) + { + this.relatedOrderCode = relatedOrderCode; + } + + public String getRelatedOrderCode() + { + return relatedOrderCode; + } + public void setSalesOrderCode(String salesOrderCode) + { + this.salesOrderCode = salesOrderCode; + } + + public String getSalesOrderCode() + { + return salesOrderCode; + } + public void setWarehouseOrderType(String warehouseOrderType) + { + this.warehouseOrderType = warehouseOrderType; + } + + public String getWarehouseOrderType() + { + return warehouseOrderType; + } + public void setOutMakeCode(String outMakeCode) + { + this.outMakeCode = outMakeCode; + } + + public String getOutMakeCode() + { + return outMakeCode; + } + public void setRequisitioningCode(String requisitioningCode) + { + this.requisitioningCode = requisitioningCode; + } + + public String getRequisitioningCode() + { + return requisitioningCode; + } + public void setWarehouseOutType(String warehouseOutType) + { + this.warehouseOutType = warehouseOutType; + } + + public String getWarehouseOutType() + { + return warehouseOutType; + } + 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 setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setShippingDeviceId(String shippingDeviceId) + { + this.shippingDeviceId = shippingDeviceId; + } + + public String getShippingDeviceId() + { + return shippingDeviceId; + } + 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(Integer materialSum) + { + this.materialSum = materialSum; + } + + public Integer getMaterialSum() + { + return materialSum; + } + public void setEnterpriseSum(Integer enterpriseSum) + { + this.enterpriseSum = enterpriseSum; + } + + public Integer getEnterpriseSum() + { + return enterpriseSum; + } + public void setOutOrderSum(Integer outOrderSum) + { + this.outOrderSum = outOrderSum; + } + + public Integer getOutOrderSum() + { + return outOrderSum; + } + public void setOutOrderName(String outOrderName) + { + this.outOrderName = outOrderName; + } + + public String getOutOrderName() + { + return outOrderName; + } + public void setOutOrderTime(Date outOrderTime) + { + this.outOrderTime = outOrderTime; + } + + public Date getOutOrderTime() + { + return outOrderTime; + } + public void setSupplierCode(String supplierCode) + { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() + { + return supplierCode; + } + public void setSupplierName(String supplierName) + { + this.supplierName = supplierName; + } + + public String getSupplierName() + { + return supplierName; + } + 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 setPlanDeliveryTime(Date planDeliveryTime) + { + this.planDeliveryTime = planDeliveryTime; + } + + public Date getPlanDeliveryTime() + { + return planDeliveryTime; + } + public void setDeliveryDate(Date deliveryDate) + { + this.deliveryDate = deliveryDate; + } + + public Date getDeliveryDate() + { + return deliveryDate; + } + public void setDeliveryCondition(String deliveryCondition) + { + this.deliveryCondition = deliveryCondition; + } + + public String getDeliveryCondition() + { + return deliveryCondition; + } + public void setApplyName(String applyName) + { + this.applyName = applyName; + } + + public String getApplyName() + { + return applyName; + } + public void setDeliveryAddress(String deliveryAddress) + { + this.deliveryAddress = deliveryAddress; + } + + public String getDeliveryAddress() + { + return deliveryAddress; + } + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("outOrderId", getOutOrderId()) + .append("outOrderCode", getOutOrderCode()) + .append("makeNo", getMakeNo()) + .append("warehouseOutStatus", getWarehouseOutStatus()) + .append("relatedOrderCode", getRelatedOrderCode()) + .append("salesOrderCode", getSalesOrderCode()) + .append("warehouseOrderType", getWarehouseOrderType()) + .append("outMakeCode", getOutMakeCode()) + .append("requisitioningCode", getRequisitioningCode()) + .append("warehouseOutType", getWarehouseOutType()) + .append("businessName", getBusinessName()) + .append("aftersalesName", getAftersalesName()) + .append("warehouseName", getWarehouseName()) + .append("shippingDeviceId", getShippingDeviceId()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) + .append("outOrderSum", getOutOrderSum()) + .append("outOrderName", getOutOrderName()) + .append("outOrderTime", getOutOrderTime()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("planDeliveryTime", getPlanDeliveryTime()) + .append("deliveryDate", getDeliveryDate()) + .append("deliveryCondition", getDeliveryCondition()) + .append("applyName", getApplyName()) + .append("deliveryAddress", getDeliveryAddress()) + .append("deliveryName", getDeliveryName()) + .append("deliveryNumber", getDeliveryNumber()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrderDetail.java new file mode 100644 index 00000000..7afed303 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrderDetail.java @@ -0,0 +1,626 @@ +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_out_order_detail + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public class AftersalesOutOrderDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 售后维护设备出库详情Id */ + private Long outOrderDetailId; + + /** 出库单号 */ + @Excel(name = "出库单号") + private String outOrderCode; + + /** 关联生产订单号 */ + private String makeNo; + + /** 出库状态 */ + private String warehouseOutStatus; + + /** 关联订单号（多种订单类型） */ + private String relatedOrderCode; + + /** 关联销售订单编号 */ + private String salesOrderCode; + + /** 出库订单类型 */ + private String warehouseOrderType; + + /** 委外单号 */ + private String outMakeCode; + + /** 请购单号 */ + private String requisitioningCode; + + /** 出库类型 */ + private String warehouseOutType; + + /** 业务人员 */ + private String businessName; + + /** 售后人员 */ + private String aftersalesName; + + /** 仓库人员 */ + private String warehouseName; + + /** 出货设备id */ + private String shippingDeviceId; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 物料图片地址 */ + @Excel(name = "物料图片地址") + private String materialPhotourl; + + /** 物料品牌 */ + @Excel(name = "物料品牌") + private String materialBrand; + + /** 物料单位 */ + @Excel(name = "物料单位") + private String materialUnit; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDescribe; + + /** 物料加工方式 */ + @Excel(name = "物料加工方式") + private String materialProcessMethod; + + /** 物料型号 */ + @Excel(name = "物料型号") + private String materialModel; + + /** 物料规格 */ + private String materialSpecification; + + /** 物料数合计 */ + private Integer materialSum; + + /** 数量合计 */ + private Integer enterpriseSum; + + /** 生产订单数 */ + private Integer makeNum; + + /** 出库数 */ + private Integer outOrderSum; + + /** 已出库数 */ + private Integer hasOutOrderSum; + + /** 申请出库数 */ + private Integer applyOutOrderSum; + + /** 准备出库数 */ + private Integer prepareOutOrderSum; + + /** 实际出库数 */ + private Integer actualOutOrderSum; + + /** 出库对象 */ + private String outOrderName; + + /** 出库时间 */ + private Date outOrderTime; + + /** 供应商ID */ + private String supplierCode; + + /** 供应商名称 */ + private String supplierName; + + /** 客户ID */ + private String customerId; + + /** 客户名称 */ + private String customerName; + + /** 计划交付时间 */ + private Date planDeliveryTime; + + /** 送货日期 */ + private Date deliveryDate; + + /** 交付条件 */ + private String deliveryCondition; + + /** 申请人 */ + private String applyName; + + /** 收货地址 */ + private String deliveryAddress; + + /** 收货联系人 */ + private String deliveryName; + + /** 收货电话 */ + private String deliveryNumber; + + public void setOutOrderDetailId(Long outOrderDetailId) + { + this.outOrderDetailId = outOrderDetailId; + } + + public Long getOutOrderDetailId() + { + return outOrderDetailId; + } + public void setOutOrderCode(String outOrderCode) + { + this.outOrderCode = outOrderCode; + } + + public String getOutOrderCode() + { + return outOrderCode; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + public void setWarehouseOutStatus(String warehouseOutStatus) + { + this.warehouseOutStatus = warehouseOutStatus; + } + + public String getWarehouseOutStatus() + { + return warehouseOutStatus; + } + public void setRelatedOrderCode(String relatedOrderCode) + { + this.relatedOrderCode = relatedOrderCode; + } + + public String getRelatedOrderCode() + { + return relatedOrderCode; + } + public void setSalesOrderCode(String salesOrderCode) + { + this.salesOrderCode = salesOrderCode; + } + + public String getSalesOrderCode() + { + return salesOrderCode; + } + public void setWarehouseOrderType(String warehouseOrderType) + { + this.warehouseOrderType = warehouseOrderType; + } + + public String getWarehouseOrderType() + { + return warehouseOrderType; + } + public void setOutMakeCode(String outMakeCode) + { + this.outMakeCode = outMakeCode; + } + + public String getOutMakeCode() + { + return outMakeCode; + } + public void setRequisitioningCode(String requisitioningCode) + { + this.requisitioningCode = requisitioningCode; + } + + public String getRequisitioningCode() + { + return requisitioningCode; + } + public void setWarehouseOutType(String warehouseOutType) + { + this.warehouseOutType = warehouseOutType; + } + + public String getWarehouseOutType() + { + return warehouseOutType; + } + 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 setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setShippingDeviceId(String shippingDeviceId) + { + this.shippingDeviceId = shippingDeviceId; + } + + public String getShippingDeviceId() + { + return shippingDeviceId; + } + 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 setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setMaterialPhotourl(String materialPhotourl) + { + this.materialPhotourl = materialPhotourl; + } + + public String getMaterialPhotourl() + { + return materialPhotourl; + } + public void setMaterialBrand(String materialBrand) + { + this.materialBrand = materialBrand; + } + + public String getMaterialBrand() + { + return materialBrand; + } + public void setMaterialUnit(String materialUnit) + { + this.materialUnit = materialUnit; + } + + public String getMaterialUnit() + { + return materialUnit; + } + public void setMaterialDescribe(String materialDescribe) + { + this.materialDescribe = materialDescribe; + } + + public String getMaterialDescribe() + { + return materialDescribe; + } + public void setMaterialProcessMethod(String materialProcessMethod) + { + this.materialProcessMethod = materialProcessMethod; + } + + public String getMaterialProcessMethod() + { + return materialProcessMethod; + } + public void setMaterialModel(String materialModel) + { + this.materialModel = materialModel; + } + + public String getMaterialModel() + { + return materialModel; + } + public void setMaterialSpecification(String materialSpecification) + { + this.materialSpecification = materialSpecification; + } + + public String getMaterialSpecification() + { + return materialSpecification; + } + public void setMaterialSum(Integer materialSum) + { + this.materialSum = materialSum; + } + + public Integer getMaterialSum() + { + return materialSum; + } + public void setEnterpriseSum(Integer enterpriseSum) + { + this.enterpriseSum = enterpriseSum; + } + + public Integer getEnterpriseSum() + { + return enterpriseSum; + } + public void setMakeNum(Integer makeNum) + { + this.makeNum = makeNum; + } + + public Integer getMakeNum() + { + return makeNum; + } + public void setOutOrderSum(Integer outOrderSum) + { + this.outOrderSum = outOrderSum; + } + + public Integer getOutOrderSum() + { + return outOrderSum; + } + public void setHasOutOrderSum(Integer hasOutOrderSum) + { + this.hasOutOrderSum = hasOutOrderSum; + } + + public Integer getHasOutOrderSum() + { + return hasOutOrderSum; + } + public void setApplyOutOrderSum(Integer applyOutOrderSum) + { + this.applyOutOrderSum = applyOutOrderSum; + } + + public Integer getApplyOutOrderSum() + { + return applyOutOrderSum; + } + public void setPrepareOutOrderSum(Integer prepareOutOrderSum) + { + this.prepareOutOrderSum = prepareOutOrderSum; + } + + public Integer getPrepareOutOrderSum() + { + return prepareOutOrderSum; + } + public void setActualOutOrderSum(Integer actualOutOrderSum) + { + this.actualOutOrderSum = actualOutOrderSum; + } + + public Integer getActualOutOrderSum() + { + return actualOutOrderSum; + } + public void setOutOrderName(String outOrderName) + { + this.outOrderName = outOrderName; + } + + public String getOutOrderName() + { + return outOrderName; + } + public void setOutOrderTime(Date outOrderTime) + { + this.outOrderTime = outOrderTime; + } + + public Date getOutOrderTime() + { + return outOrderTime; + } + public void setSupplierCode(String supplierCode) + { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() + { + return supplierCode; + } + public void setSupplierName(String supplierName) + { + this.supplierName = supplierName; + } + + public String getSupplierName() + { + return supplierName; + } + 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 setPlanDeliveryTime(Date planDeliveryTime) + { + this.planDeliveryTime = planDeliveryTime; + } + + public Date getPlanDeliveryTime() + { + return planDeliveryTime; + } + public void setDeliveryDate(Date deliveryDate) + { + this.deliveryDate = deliveryDate; + } + + public Date getDeliveryDate() + { + return deliveryDate; + } + public void setDeliveryCondition(String deliveryCondition) + { + this.deliveryCondition = deliveryCondition; + } + + public String getDeliveryCondition() + { + return deliveryCondition; + } + public void setApplyName(String applyName) + { + this.applyName = applyName; + } + + public String getApplyName() + { + return applyName; + } + public void setDeliveryAddress(String deliveryAddress) + { + this.deliveryAddress = deliveryAddress; + } + + public String getDeliveryAddress() + { + return deliveryAddress; + } + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("outOrderDetailId", getOutOrderDetailId()) + .append("outOrderCode", getOutOrderCode()) + .append("makeNo", getMakeNo()) + .append("warehouseOutStatus", getWarehouseOutStatus()) + .append("relatedOrderCode", getRelatedOrderCode()) + .append("salesOrderCode", getSalesOrderCode()) + .append("warehouseOrderType", getWarehouseOrderType()) + .append("outMakeCode", getOutMakeCode()) + .append("requisitioningCode", getRequisitioningCode()) + .append("warehouseOutType", getWarehouseOutType()) + .append("businessName", getBusinessName()) + .append("aftersalesName", getAftersalesName()) + .append("warehouseName", getWarehouseName()) + .append("shippingDeviceId", getShippingDeviceId()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("materialPhotourl", getMaterialPhotourl()) + .append("materialBrand", getMaterialBrand()) + .append("materialUnit", getMaterialUnit()) + .append("materialDescribe", getMaterialDescribe()) + .append("materialProcessMethod", getMaterialProcessMethod()) + .append("materialModel", getMaterialModel()) + .append("materialSpecification", getMaterialSpecification()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) + .append("makeNum", getMakeNum()) + .append("outOrderSum", getOutOrderSum()) + .append("hasOutOrderSum", getHasOutOrderSum()) + .append("applyOutOrderSum", getApplyOutOrderSum()) + .append("prepareOutOrderSum", getPrepareOutOrderSum()) + .append("actualOutOrderSum", getActualOutOrderSum()) + .append("outOrderName", getOutOrderName()) + .append("outOrderTime", getOutOrderTime()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("planDeliveryTime", getPlanDeliveryTime()) + .append("deliveryDate", getDeliveryDate()) + .append("deliveryCondition", getDeliveryCondition()) + .append("applyName", getApplyName()) + .append("deliveryAddress", getDeliveryAddress()) + .append("deliveryName", getDeliveryName()) + .append("deliveryNumber", getDeliveryNumber()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderDetailMapper.java new file mode 100644 index 00000000..660374cd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderDetailMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.aftersales.mapper; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOutOrderDetail; + +/** + * 售后维护设备出库详情Mapper接口 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public interface AftersalesOutOrderDetailMapper +{ + /** + * 查询售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 售后维护设备出库详情 + */ + public AftersalesOutOrderDetail selectAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 查询售后维护设备出库详情列表 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 售后维护设备出库详情集合 + */ + public List selectAftersalesOutOrderDetailList(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 新增售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + public int insertAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 修改售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + public int updateAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 删除售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + public int deleteAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 批量删除售后维护设备出库详情 + * + * @param outOrderDetailIds 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOutOrderDetailByIds(String[] outOrderDetailIds); + + /** + * 作废售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + public int cancelAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 恢复售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + public int restoreAftersalesOutOrderDetailById(Long outOrderDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java new file mode 100644 index 00000000..703d8d25 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.aftersales.mapper; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOutOrder; + +/** + * 售后维护设备出库Mapper接口 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public interface AftersalesOutOrderMapper +{ + /** + * 查询售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 售后维护设备出库 + */ + public AftersalesOutOrder selectAftersalesOutOrderById(Long outOrderId); + + /** + * 查询售后维护设备出库列表 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 售后维护设备出库集合 + */ + public List selectAftersalesOutOrderList(AftersalesOutOrder aftersalesOutOrder); + + /** + * 新增售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + public int insertAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); + + /** + * 修改售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + public int updateAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); + + /** + * 删除售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + public int deleteAftersalesOutOrderById(Long outOrderId); + + /** + * 批量删除售后维护设备出库 + * + * @param outOrderIds 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOutOrderByIds(String[] outOrderIds); + + /** + * 作废售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + public int cancelAftersalesOutOrderById(Long outOrderId); + + /** + * 恢复售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + public int restoreAftersalesOutOrderById(Long outOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderDetailService.java new file mode 100644 index 00000000..0e96921e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderDetailService.java @@ -0,0 +1,75 @@ +package com.ruoyi.aftersales.service; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOutOrderDetail; + +/** + * 售后维护设备出库详情Service接口 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public interface IAftersalesOutOrderDetailService +{ + /** + * 查询售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 售后维护设备出库详情 + */ + public AftersalesOutOrderDetail selectAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 查询售后维护设备出库详情列表 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 售后维护设备出库详情集合 + */ + public List selectAftersalesOutOrderDetailList(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 新增售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + public int insertAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 修改售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + public int updateAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail); + + /** + * 批量删除售后维护设备出库详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOutOrderDetailByIds(String ids); + + /** + * 删除售后维护设备出库详情信息 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + public int deleteAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 作废售后维护设备出库详情 + * @param outOrderDetailId 售后维护设备出库详情ID + * @return + */ + int cancelAftersalesOutOrderDetailById(Long outOrderDetailId); + + /** + * 恢复售后维护设备出库详情 + * @param outOrderDetailId 售后维护设备出库详情ID + * @return + */ + int restoreAftersalesOutOrderDetailById(Long outOrderDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java new file mode 100644 index 00000000..05ca9a82 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java @@ -0,0 +1,75 @@ +package com.ruoyi.aftersales.service; + +import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOutOrder; + +/** + * 售后维护设备出库Service接口 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +public interface IAftersalesOutOrderService +{ + /** + * 查询售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 售后维护设备出库 + */ + public AftersalesOutOrder selectAftersalesOutOrderById(Long outOrderId); + + /** + * 查询售后维护设备出库列表 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 售后维护设备出库集合 + */ + public List selectAftersalesOutOrderList(AftersalesOutOrder aftersalesOutOrder); + + /** + * 新增售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + public int insertAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); + + /** + * 修改售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + public int updateAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); + + /** + * 批量删除售后维护设备出库 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteAftersalesOutOrderByIds(String ids); + + /** + * 删除售后维护设备出库信息 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + public int deleteAftersalesOutOrderById(Long outOrderId); + + /** + * 作废售后维护设备出库 + * @param outOrderId 售后维护设备出库ID + * @return + */ + int cancelAftersalesOutOrderById(Long outOrderId); + + /** + * 恢复售后维护设备出库 + * @param outOrderId 售后维护设备出库ID + * @return + */ + int restoreAftersalesOutOrderById(Long outOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderDetailServiceImpl.java new file mode 100644 index 00000000..7dff7ce3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderDetailServiceImpl.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.AftersalesOutOrderDetailMapper; +import com.ruoyi.aftersales.domain.AftersalesOutOrderDetail; +import com.ruoyi.aftersales.service.IAftersalesOutOrderDetailService; +import com.ruoyi.common.core.text.Convert; + +/** + * 售后维护设备出库详情Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +@Service +public class AftersalesOutOrderDetailServiceImpl implements IAftersalesOutOrderDetailService +{ + @Autowired + private AftersalesOutOrderDetailMapper aftersalesOutOrderDetailMapper; + + /** + * 查询售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 售后维护设备出库详情 + */ + @Override + public AftersalesOutOrderDetail selectAftersalesOutOrderDetailById(Long outOrderDetailId) + { + return aftersalesOutOrderDetailMapper.selectAftersalesOutOrderDetailById(outOrderDetailId); + } + + /** + * 查询售后维护设备出库详情列表 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 售后维护设备出库详情 + */ + @Override + public List selectAftersalesOutOrderDetailList(AftersalesOutOrderDetail aftersalesOutOrderDetail) + { + return aftersalesOutOrderDetailMapper.selectAftersalesOutOrderDetailList(aftersalesOutOrderDetail); + } + + /** + * 新增售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + @Override + public int insertAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOutOrderDetail.setCreateBy(loginName); + aftersalesOutOrderDetail.setCreateTime(DateUtils.getNowDate()); + return aftersalesOutOrderDetailMapper.insertAftersalesOutOrderDetail(aftersalesOutOrderDetail); + } + + /** + * 修改售后维护设备出库详情 + * + * @param aftersalesOutOrderDetail 售后维护设备出库详情 + * @return 结果 + */ + @Override + public int updateAftersalesOutOrderDetail(AftersalesOutOrderDetail aftersalesOutOrderDetail) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOutOrderDetail.setUpdateBy(loginName); + aftersalesOutOrderDetail.setUpdateTime(DateUtils.getNowDate()); + return aftersalesOutOrderDetailMapper.updateAftersalesOutOrderDetail(aftersalesOutOrderDetail); + } + + /** + * 删除售后维护设备出库详情对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteAftersalesOutOrderDetailByIds(String ids) + { + return aftersalesOutOrderDetailMapper.deleteAftersalesOutOrderDetailByIds(Convert.toStrArray(ids)); + } + + /** + * 删除售后维护设备出库详情信息 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + @Override + public int deleteAftersalesOutOrderDetailById(Long outOrderDetailId) + { + return aftersalesOutOrderDetailMapper.deleteAftersalesOutOrderDetailById(outOrderDetailId); + } + + /** + * 作废售后维护设备出库详情 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + @Override + public int cancelAftersalesOutOrderDetailById(Long outOrderDetailId) + { + return aftersalesOutOrderDetailMapper.cancelAftersalesOutOrderDetailById(outOrderDetailId); + } + + /** + * 恢复售后维护设备出库详情信息 + * + * @param outOrderDetailId 售后维护设备出库详情ID + * @return 结果 + */ + @Override + public int restoreAftersalesOutOrderDetailById(Long outOrderDetailId) + { + return aftersalesOutOrderDetailMapper.restoreAftersalesOutOrderDetailById(outOrderDetailId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java new file mode 100644 index 00000000..212db251 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.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.AftersalesOutOrderMapper; +import com.ruoyi.aftersales.domain.AftersalesOutOrder; +import com.ruoyi.aftersales.service.IAftersalesOutOrderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 售后维护设备出库Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-11-06 + */ +@Service +public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService +{ + @Autowired + private AftersalesOutOrderMapper aftersalesOutOrderMapper; + + /** + * 查询售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 售后维护设备出库 + */ + @Override + public AftersalesOutOrder selectAftersalesOutOrderById(Long outOrderId) + { + return aftersalesOutOrderMapper.selectAftersalesOutOrderById(outOrderId); + } + + /** + * 查询售后维护设备出库列表 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 售后维护设备出库 + */ + @Override + public List selectAftersalesOutOrderList(AftersalesOutOrder aftersalesOutOrder) + { + return aftersalesOutOrderMapper.selectAftersalesOutOrderList(aftersalesOutOrder); + } + + /** + * 新增售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + @Override + public int insertAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOutOrder.setCreateBy(loginName); + aftersalesOutOrder.setCreateTime(DateUtils.getNowDate()); + return aftersalesOutOrderMapper.insertAftersalesOutOrder(aftersalesOutOrder); + } + + /** + * 修改售后维护设备出库 + * + * @param aftersalesOutOrder 售后维护设备出库 + * @return 结果 + */ + @Override + public int updateAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder) + { + String loginName = ShiroUtils.getLoginName(); + aftersalesOutOrder.setUpdateBy(loginName); + aftersalesOutOrder.setUpdateTime(DateUtils.getNowDate()); + return aftersalesOutOrderMapper.updateAftersalesOutOrder(aftersalesOutOrder); + } + + /** + * 删除售后维护设备出库对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteAftersalesOutOrderByIds(String ids) + { + return aftersalesOutOrderMapper.deleteAftersalesOutOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除售后维护设备出库信息 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + @Override + public int deleteAftersalesOutOrderById(Long outOrderId) + { + return aftersalesOutOrderMapper.deleteAftersalesOutOrderById(outOrderId); + } + + /** + * 作废售后维护设备出库 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + @Override + public int cancelAftersalesOutOrderById(Long outOrderId) + { + return aftersalesOutOrderMapper.cancelAftersalesOutOrderById(outOrderId); + } + + /** + * 恢复售后维护设备出库信息 + * + * @param outOrderId 售后维护设备出库ID + * @return 结果 + */ + @Override + public int restoreAftersalesOutOrderById(Long outOrderId) + { + return aftersalesOutOrderMapper.restoreAftersalesOutOrderById(outOrderId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderDetailMapper.xml new file mode 100644 index 00000000..5277b8f7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderDetailMapper.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select out_order_detail_id, out_order_code, make_no, warehouse_out_status, related_order_code, sales_order_code, warehouse_order_type, out_make_code, requisitioning_code, warehouse_out_type, business_name, aftersales_name, warehouse_name, shipping_device_id, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, material_sum, enterprise_sum, make_num, out_order_sum, has_out_order_sum, apply_out_order_sum, prepare_out_order_sum, actual_out_order_sum, out_order_name, out_order_time, supplier_code, supplier_name, customer_id, customer_name, plan_delivery_time, delivery_date, delivery_condition, apply_name, delivery_address, delivery_name, delivery_number, remark, create_by, create_time, update_by, update_time from aftersales_out_order_detail + + + + + + + + insert into aftersales_out_order_detail + + out_order_code, + make_no, + warehouse_out_status, + related_order_code, + sales_order_code, + warehouse_order_type, + out_make_code, + requisitioning_code, + warehouse_out_type, + business_name, + aftersales_name, + warehouse_name, + shipping_device_id, + material_no, + material_name, + material_type, + material_photoUrl, + material_brand, + material_unit, + material_describe, + material_process_method, + material_model, + material_specification, + material_sum, + enterprise_sum, + make_num, + out_order_sum, + has_out_order_sum, + apply_out_order_sum, + prepare_out_order_sum, + actual_out_order_sum, + out_order_name, + out_order_time, + supplier_code, + supplier_name, + customer_id, + customer_name, + plan_delivery_time, + delivery_date, + delivery_condition, + apply_name, + delivery_address, + delivery_name, + delivery_number, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{outOrderCode}, + #{makeNo}, + #{warehouseOutStatus}, + #{relatedOrderCode}, + #{salesOrderCode}, + #{warehouseOrderType}, + #{outMakeCode}, + #{requisitioningCode}, + #{warehouseOutType}, + #{businessName}, + #{aftersalesName}, + #{warehouseName}, + #{shippingDeviceId}, + #{materialNo}, + #{materialName}, + #{materialType}, + #{materialPhotourl}, + #{materialBrand}, + #{materialUnit}, + #{materialDescribe}, + #{materialProcessMethod}, + #{materialModel}, + #{materialSpecification}, + #{materialSum}, + #{enterpriseSum}, + #{makeNum}, + #{outOrderSum}, + #{hasOutOrderSum}, + #{applyOutOrderSum}, + #{prepareOutOrderSum}, + #{actualOutOrderSum}, + #{outOrderName}, + #{outOrderTime}, + #{supplierCode}, + #{supplierName}, + #{customerId}, + #{customerName}, + #{planDeliveryTime}, + #{deliveryDate}, + #{deliveryCondition}, + #{applyName}, + #{deliveryAddress}, + #{deliveryName}, + #{deliveryNumber}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update aftersales_out_order_detail + + out_order_code = #{outOrderCode}, + make_no = #{makeNo}, + warehouse_out_status = #{warehouseOutStatus}, + related_order_code = #{relatedOrderCode}, + sales_order_code = #{salesOrderCode}, + warehouse_order_type = #{warehouseOrderType}, + out_make_code = #{outMakeCode}, + requisitioning_code = #{requisitioningCode}, + warehouse_out_type = #{warehouseOutType}, + business_name = #{businessName}, + aftersales_name = #{aftersalesName}, + warehouse_name = #{warehouseName}, + shipping_device_id = #{shippingDeviceId}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_type = #{materialType}, + material_photoUrl = #{materialPhotourl}, + material_brand = #{materialBrand}, + material_unit = #{materialUnit}, + material_describe = #{materialDescribe}, + material_process_method = #{materialProcessMethod}, + material_model = #{materialModel}, + material_specification = #{materialSpecification}, + material_sum = #{materialSum}, + enterprise_sum = #{enterpriseSum}, + make_num = #{makeNum}, + out_order_sum = #{outOrderSum}, + has_out_order_sum = #{hasOutOrderSum}, + apply_out_order_sum = #{applyOutOrderSum}, + prepare_out_order_sum = #{prepareOutOrderSum}, + actual_out_order_sum = #{actualOutOrderSum}, + out_order_name = #{outOrderName}, + out_order_time = #{outOrderTime}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + customer_id = #{customerId}, + customer_name = #{customerName}, + plan_delivery_time = #{planDeliveryTime}, + delivery_date = #{deliveryDate}, + delivery_condition = #{deliveryCondition}, + apply_name = #{applyName}, + delivery_address = #{deliveryAddress}, + delivery_name = #{deliveryName}, + delivery_number = #{deliveryNumber}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where out_order_detail_id = #{outOrderDetailId} + + + + delete from aftersales_out_order_detail where out_order_detail_id = #{outOrderDetailId} + + + + delete from aftersales_out_order_detail where out_order_detail_id in + + #{outOrderDetailId} + + + + + update aftersales_out_order_detail set del_flag = '1' where out_order_detail_id = #{outOrderDetailId} + + + + update aftersales_out_order_detail set del_flag = '0' where out_order_detail_id = #{outOrderDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml new file mode 100644 index 00000000..ebe762cb --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select out_order_id, out_order_code, make_no, warehouse_out_status, related_order_code, sales_order_code, warehouse_order_type, out_make_code, requisitioning_code, warehouse_out_type, business_name, aftersales_name, warehouse_name, shipping_device_id, material_no, material_name, material_sum, enterprise_sum, out_order_sum, out_order_name, out_order_time, supplier_code, supplier_name, customer_id, customer_name, plan_delivery_time, delivery_date, delivery_condition, apply_name, delivery_address, delivery_name, delivery_number, remark, create_by, create_time, update_by, update_time from aftersales_out_order + + + + + + + + insert into aftersales_out_order + + out_order_code, + make_no, + warehouse_out_status, + related_order_code, + sales_order_code, + warehouse_order_type, + out_make_code, + requisitioning_code, + warehouse_out_type, + business_name, + aftersales_name, + warehouse_name, + shipping_device_id, + material_no, + material_name, + material_sum, + enterprise_sum, + out_order_sum, + out_order_name, + out_order_time, + supplier_code, + supplier_name, + customer_id, + customer_name, + plan_delivery_time, + delivery_date, + delivery_condition, + apply_name, + delivery_address, + delivery_name, + delivery_number, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{outOrderCode}, + #{makeNo}, + #{warehouseOutStatus}, + #{relatedOrderCode}, + #{salesOrderCode}, + #{warehouseOrderType}, + #{outMakeCode}, + #{requisitioningCode}, + #{warehouseOutType}, + #{businessName}, + #{aftersalesName}, + #{warehouseName}, + #{shippingDeviceId}, + #{materialNo}, + #{materialName}, + #{materialSum}, + #{enterpriseSum}, + #{outOrderSum}, + #{outOrderName}, + #{outOrderTime}, + #{supplierCode}, + #{supplierName}, + #{customerId}, + #{customerName}, + #{planDeliveryTime}, + #{deliveryDate}, + #{deliveryCondition}, + #{applyName}, + #{deliveryAddress}, + #{deliveryName}, + #{deliveryNumber}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update aftersales_out_order + + out_order_code = #{outOrderCode}, + make_no = #{makeNo}, + warehouse_out_status = #{warehouseOutStatus}, + related_order_code = #{relatedOrderCode}, + sales_order_code = #{salesOrderCode}, + warehouse_order_type = #{warehouseOrderType}, + out_make_code = #{outMakeCode}, + requisitioning_code = #{requisitioningCode}, + warehouse_out_type = #{warehouseOutType}, + business_name = #{businessName}, + aftersales_name = #{aftersalesName}, + warehouse_name = #{warehouseName}, + shipping_device_id = #{shippingDeviceId}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_sum = #{materialSum}, + enterprise_sum = #{enterpriseSum}, + out_order_sum = #{outOrderSum}, + out_order_name = #{outOrderName}, + out_order_time = #{outOrderTime}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + customer_id = #{customerId}, + customer_name = #{customerName}, + plan_delivery_time = #{planDeliveryTime}, + delivery_date = #{deliveryDate}, + delivery_condition = #{deliveryCondition}, + apply_name = #{applyName}, + delivery_address = #{deliveryAddress}, + delivery_name = #{deliveryName}, + delivery_number = #{deliveryNumber}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where out_order_id = #{outOrderId} + + + + delete from aftersales_out_order where out_order_id = #{outOrderId} + + + + delete from aftersales_out_order where out_order_id in + + #{outOrderId} + + + + + update aftersales_out_order set del_flag = '1' where out_order_id = #{outOrderId} + + + + update aftersales_out_order set del_flag = '0' where out_order_id = #{outOrderId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/add.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/add.html new file mode 100644 index 00000000..56a1a782 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/add.html @@ -0,0 +1,252 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html new file mode 100644 index 00000000..d3af55f5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html @@ -0,0 +1,226 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/edit.html new file mode 100644 index 00000000..ab69cf61 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/edit.html @@ -0,0 +1,253 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file