From 1acfeeb19426d9879cacb19a263a278a07096edd Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 23 Apr 2024 16:20:42 +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=87=BA=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=20=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseOutOrderController.java | 151 +++++++ .../aftersales/domain/WarehouseOutOrder.java | 398 ++++++++++++++++++ .../mapper/WarehouseOutOrderMapper.java | 77 ++++ .../service/IWarehouseOutOrderService.java | 75 ++++ .../impl/WarehouseOutOrderServiceImpl.java | 126 ++++++ .../aftersales/WarehouseOutOrderMapper.xml | 187 ++++++++ .../aftersales/warehouseOutOrder/add.html | 207 +++++++++ .../aftersales/warehouseOutOrder/edit.html | 208 +++++++++ .../warehouseOutOrder/warehouseOutOrder.html | 204 +++++++++ 9 files changed, 1633 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/WarehouseOutOrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/WarehouseOutOrder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/WarehouseOutOrderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IWarehouseOutOrderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/WarehouseOutOrderServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/aftersales/WarehouseOutOrderMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/WarehouseOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/WarehouseOutOrderController.java new file mode 100644 index 00000000..c6be6b55 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/WarehouseOutOrderController.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.WarehouseOutOrder; +import com.ruoyi.aftersales.service.IWarehouseOutOrderService; +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-23 + */ +@Controller +@RequestMapping("/aftersales/warehouseOutOrder") +public class WarehouseOutOrderController extends BaseController +{ + private String prefix = "aftersales/warehouseOutOrder"; + + @Autowired + private IWarehouseOutOrderService warehouseOutOrderService; + + @RequiresPermissions("aftersales:warehouseOutOrder:view") + @GetMapping() + public String warehouseOutOrder() + { + return prefix + "/warehouseOutOrder"; + } + + /** + * 查询出库单列表 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(WarehouseOutOrder warehouseOutOrder) + { + startPage(); + List list = warehouseOutOrderService.selectWarehouseOutOrderList(warehouseOutOrder); + return getDataTable(list); + } + + /** + * 导出出库单列表 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:export") + @Log(title = "出库单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(WarehouseOutOrder warehouseOutOrder) + { + List list = warehouseOutOrderService.selectWarehouseOutOrderList(warehouseOutOrder); + ExcelUtil util = new ExcelUtil(WarehouseOutOrder.class); + return util.exportExcel(list, "出库单数据"); + } + + /** + * 新增出库单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存出库单 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:add") + @Log(title = "出库单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.insertWarehouseOutOrder(warehouseOutOrder)); + } + + /** + * 修改出库单 + */ + @GetMapping("/edit/{outOrderId}") + public String edit(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId); + mmap.put("warehouseOutOrder", warehouseOutOrder); + return prefix + "/edit"; + } + + /** + * 修改保存出库单 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:edit") + @Log(title = "出库单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.updateWarehouseOutOrder(warehouseOutOrder)); + } + + /** + * 删除出库单 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:remove") + @Log(title = "出库单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(warehouseOutOrderService.deleteWarehouseOutOrderByIds(ids)); + } + + /** + * 作废出库单 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:cancel") + @Log(title = "出库单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(warehouseOutOrderService.cancelWarehouseOutOrderById(id)); + } + + /** + * 恢复出库单 + */ + @RequiresPermissions("aftersales:warehouseOutOrder:restore") + @Log(title = "出库单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(warehouseOutOrderService.restoreWarehouseOutOrderById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/WarehouseOutOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/WarehouseOutOrder.java new file mode 100644 index 00000000..0f39126a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/WarehouseOutOrder.java @@ -0,0 +1,398 @@ +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; + +/** + * 出库单对象 warehouse_out_order + * + * @author 刘晓旭 + * @date 2024-04-23 + */ +public class WarehouseOutOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 出库单Id */ + private Long outOrderId; + + /** 出库单号 */ + @Excel(name = "出库单号") + private String outOrderCode; + + /** 关联生产订单号 */ + private String makeNo; + + /** 出库状态 */ + @Excel(name = "出库状态") + private String warehouseOutStatus; + + /** 关联订单号 */ + @Excel(name = "关联订单号") + private String relatedOrderCode; + + /** 关联销售订单编号 */ + private String salesOrderCode; + + /** 订单类型 */ + @Excel(name = "订单类型") + private String warehouseOrderType; + + /** 出库类型 */ + 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 customerId; + + /** 客户名称 */ + private String customerName; + + /** 申请人员 */ + private String applyName; + + /** 计划交付时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planDeliveryTime; + + /** 交付条件 */ + @Excel(name = "交付条件") + private String deliveryCondition; + + /** 收货地址 */ + @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 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 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 setApplyName(String applyName) + { + this.applyName = applyName; + } + + public String getApplyName() + { + return applyName; + } + public void setPlanDeliveryTime(Date planDeliveryTime) + { + this.planDeliveryTime = planDeliveryTime; + } + + public Date getPlanDeliveryTime() + { + return planDeliveryTime; + } + public void setDeliveryCondition(String deliveryCondition) + { + this.deliveryCondition = deliveryCondition; + } + + public String getDeliveryCondition() + { + return deliveryCondition; + } + 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("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("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("applyName", getApplyName()) + .append("planDeliveryTime", getPlanDeliveryTime()) + .append("deliveryCondition", getDeliveryCondition()) + .append("deliveryAddress", getDeliveryAddress()) + .append("deliveryName", getDeliveryName()) + .append("deliveryNumber", getDeliveryNumber()) + .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/WarehouseOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/WarehouseOutOrderMapper.java new file mode 100644 index 00000000..9600a657 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/WarehouseOutOrderMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.aftersales.mapper; + +import java.util.List; +import com.ruoyi.aftersales.domain.WarehouseOutOrder; + +/** + * 出库单Mapper接口 + * + * @author 刘晓旭 + * @date 2024-04-23 + */ +public interface WarehouseOutOrderMapper +{ + /** + * 查询出库单 + * + * @param outOrderId 出库单ID + * @return 出库单 + */ + public WarehouseOutOrder selectWarehouseOutOrderById(Long outOrderId); + + /** + * 查询出库单列表 + * + * @param warehouseOutOrder 出库单 + * @return 出库单集合 + */ + public List selectWarehouseOutOrderList(WarehouseOutOrder warehouseOutOrder); + + /** + * 新增出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + public int insertWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder); + + /** + * 修改出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + public int updateWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder); + + /** + * 删除出库单 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + public int deleteWarehouseOutOrderById(Long outOrderId); + + /** + * 批量删除出库单 + * + * @param outOrderIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseOutOrderByIds(String[] outOrderIds); + + /** + * 作废出库单 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + public int cancelWarehouseOutOrderById(Long outOrderId); + + /** + * 恢复出库单 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + public int restoreWarehouseOutOrderById(Long outOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IWarehouseOutOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IWarehouseOutOrderService.java new file mode 100644 index 00000000..35bccf5d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IWarehouseOutOrderService.java @@ -0,0 +1,75 @@ +package com.ruoyi.aftersales.service; + +import java.util.List; +import com.ruoyi.aftersales.domain.WarehouseOutOrder; + +/** + * 出库单Service接口 + * + * @author 刘晓旭 + * @date 2024-04-23 + */ +public interface IWarehouseOutOrderService +{ + /** + * 查询出库单 + * + * @param outOrderId 出库单ID + * @return 出库单 + */ + public WarehouseOutOrder selectWarehouseOutOrderById(Long outOrderId); + + /** + * 查询出库单列表 + * + * @param warehouseOutOrder 出库单 + * @return 出库单集合 + */ + public List selectWarehouseOutOrderList(WarehouseOutOrder warehouseOutOrder); + + /** + * 新增出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + public int insertWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder); + + /** + * 修改出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + public int updateWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder); + + /** + * 批量删除出库单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseOutOrderByIds(String ids); + + /** + * 删除出库单信息 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + public int deleteWarehouseOutOrderById(Long outOrderId); + + /** + * 作废出库单 + * @param outOrderId 出库单ID + * @return + */ + int cancelWarehouseOutOrderById(Long outOrderId); + + /** + * 恢复出库单 + * @param outOrderId 出库单ID + * @return + */ + int restoreWarehouseOutOrderById(Long outOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/WarehouseOutOrderServiceImpl.java new file mode 100644 index 00000000..045ac1ff --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/WarehouseOutOrderServiceImpl.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.WarehouseOutOrderMapper; +import com.ruoyi.aftersales.domain.WarehouseOutOrder; +import com.ruoyi.aftersales.service.IWarehouseOutOrderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 出库单Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-04-23 + */ +@Service +public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService +{ + @Autowired + private WarehouseOutOrderMapper warehouseOutOrderMapper; + + /** + * 查询出库单 + * + * @param outOrderId 出库单ID + * @return 出库单 + */ + @Override + public WarehouseOutOrder selectWarehouseOutOrderById(Long outOrderId) + { + return warehouseOutOrderMapper.selectWarehouseOutOrderById(outOrderId); + } + + /** + * 查询出库单列表 + * + * @param warehouseOutOrder 出库单 + * @return 出库单 + */ + @Override + public List selectWarehouseOutOrderList(WarehouseOutOrder warehouseOutOrder) + { + return warehouseOutOrderMapper.selectWarehouseOutOrderList(warehouseOutOrder); + } + + /** + * 新增出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + @Override + public int insertWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder) + { + String loginName = ShiroUtils.getLoginName(); + warehouseOutOrder.setCreateBy(loginName); + warehouseOutOrder.setCreateTime(DateUtils.getNowDate()); + return warehouseOutOrderMapper.insertWarehouseOutOrder(warehouseOutOrder); + } + + /** + * 修改出库单 + * + * @param warehouseOutOrder 出库单 + * @return 结果 + */ + @Override + public int updateWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder) + { + String loginName = ShiroUtils.getLoginName(); + warehouseOutOrder.setUpdateBy(loginName); + warehouseOutOrder.setUpdateTime(DateUtils.getNowDate()); + return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder); + } + + /** + * 删除出库单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehouseOutOrderByIds(String ids) + { + return warehouseOutOrderMapper.deleteWarehouseOutOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除出库单信息 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + @Override + public int deleteWarehouseOutOrderById(Long outOrderId) + { + return warehouseOutOrderMapper.deleteWarehouseOutOrderById(outOrderId); + } + + /** + * 作废出库单 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + @Override + public int cancelWarehouseOutOrderById(Long outOrderId) + { + return warehouseOutOrderMapper.cancelWarehouseOutOrderById(outOrderId); + } + + /** + * 恢复出库单信息 + * + * @param outOrderId 出库单ID + * @return 结果 + */ + @Override + public int restoreWarehouseOutOrderById(Long outOrderId) + { + return warehouseOutOrderMapper.restoreWarehouseOutOrderById(outOrderId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/WarehouseOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/WarehouseOutOrderMapper.xml new file mode 100644 index 00000000..391d1506 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/WarehouseOutOrderMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select out_order_id, out_order_code, make_no, warehouse_out_status, related_order_code, sales_order_code, warehouse_order_type, 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, customer_id, customer_name, apply_name, plan_delivery_time, delivery_condition, delivery_address, delivery_name, delivery_number, create_by, create_time, update_by, update_time from warehouse_out_order + + + + + + + + insert into warehouse_out_order + + out_order_code, + make_no, + warehouse_out_status, + related_order_code, + sales_order_code, + warehouse_order_type, + 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, + customer_id, + customer_name, + apply_name, + plan_delivery_time, + delivery_condition, + delivery_address, + delivery_name, + delivery_number, + create_by, + create_time, + update_by, + update_time, + + + #{outOrderCode}, + #{makeNo}, + #{warehouseOutStatus}, + #{relatedOrderCode}, + #{salesOrderCode}, + #{warehouseOrderType}, + #{warehouseOutType}, + #{businessName}, + #{aftersalesName}, + #{warehouseName}, + #{shippingDeviceId}, + #{materialNo}, + #{materialName}, + #{materialSum}, + #{enterpriseSum}, + #{outOrderSum}, + #{outOrderName}, + #{outOrderTime}, + #{customerId}, + #{customerName}, + #{applyName}, + #{planDeliveryTime}, + #{deliveryCondition}, + #{deliveryAddress}, + #{deliveryName}, + #{deliveryNumber}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_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}, + 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}, + customer_id = #{customerId}, + customer_name = #{customerName}, + apply_name = #{applyName}, + plan_delivery_time = #{planDeliveryTime}, + delivery_condition = #{deliveryCondition}, + delivery_address = #{deliveryAddress}, + delivery_name = #{deliveryName}, + delivery_number = #{deliveryNumber}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where out_order_id = #{outOrderId} + + + + delete from warehouse_out_order where out_order_id = #{outOrderId} + + + + delete from warehouse_out_order where out_order_id in + + #{outOrderId} + + + + + update warehouse_out_order set del_flag = '1' where out_order_id = #{outOrderId} + + + + update warehouse_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/warehouseOutOrder/add.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/add.html new file mode 100644 index 00000000..33895897 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/add.html @@ -0,0 +1,207 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/edit.html new file mode 100644 index 00000000..eeeec626 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/edit.html @@ -0,0 +1,208 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html new file mode 100644 index 00000000..851dacc3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html @@ -0,0 +1,204 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+
+
+ + + + \ No newline at end of file