Merge remote-tracking branch 'origin/dev' into dev

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<WarehouseOutOrder> 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<WarehouseOutOrder> list = warehouseOutOrderService.selectWarehouseOutOrderList(warehouseOutOrder);
+        ExcelUtil<WarehouseOutOrder> util = new ExcelUtil<WarehouseOutOrder>(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));
+    }
+
+
+}

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();
+    }
+}

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<WarehouseOutOrder> 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);
+}

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<WarehouseOutOrder> 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);
+}

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<WarehouseOutOrder> 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);
+    }
+}

ruoyi-admin/src/main/resources/mapper/aftersales/WarehouseOutOrderMapper.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.aftersales.mapper.WarehouseOutOrderMapper">
+    
+    <resultMap type="WarehouseOutOrder" id="WarehouseOutOrderResult">
+        <result property="outOrderId"    column="out_order_id"    />
+        <result property="outOrderCode"    column="out_order_code"    />
+        <result property="makeNo"    column="make_no"    />
+        <result property="warehouseOutStatus"    column="warehouse_out_status"    />
+        <result property="relatedOrderCode"    column="related_order_code"    />
+        <result property="salesOrderCode"    column="sales_order_code"    />
+        <result property="warehouseOrderType"    column="warehouse_order_type"    />
+        <result property="warehouseOutType"    column="warehouse_out_type"    />
+        <result property="businessName"    column="business_name"    />
+        <result property="aftersalesName"    column="aftersales_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="shippingDeviceId"    column="shipping_device_id"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialSum"    column="material_sum"    />
+        <result property="enterpriseSum"    column="enterprise_sum"    />
+        <result property="outOrderSum"    column="out_order_sum"    />
+        <result property="outOrderName"    column="out_order_name"    />
+        <result property="outOrderTime"    column="out_order_time"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="applyName"    column="apply_name"    />
+        <result property="planDeliveryTime"    column="plan_delivery_time"    />
+        <result property="deliveryCondition"    column="delivery_condition"    />
+        <result property="deliveryAddress"    column="delivery_address"    />
+        <result property="deliveryName"    column="delivery_name"    />
+        <result property="deliveryNumber"    column="delivery_number"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectWarehouseOutOrderVo">
+        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
+    </sql>
+
+    <select id="selectWarehouseOutOrderList" parameterType="WarehouseOutOrder" resultMap="WarehouseOutOrderResult">
+        <include refid="selectWarehouseOutOrderVo"/>
+        <where>  
+            <if test="outOrderCode != null  and outOrderCode != ''"> and out_order_code = #{outOrderCode}</if>
+            <if test="warehouseOutStatus != null  and warehouseOutStatus != ''"> and warehouse_out_status = #{warehouseOutStatus}</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code = #{relatedOrderCode}</if>
+            <if test="warehouseOrderType != null  and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="applyName != null  and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectWarehouseOutOrderById" parameterType="Long" resultMap="WarehouseOutOrderResult">
+        <include refid="selectWarehouseOutOrderVo"/>
+        where out_order_id = #{outOrderId}
+    </select>
+        
+    <insert id="insertWarehouseOutOrder" parameterType="WarehouseOutOrder" useGeneratedKeys="true" keyProperty="outOrderId">
+        insert into warehouse_out_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code,</if>
+            <if test="makeNo != null">make_no,</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status,</if>
+            <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="salesOrderCode != null">sales_order_code,</if>
+            <if test="warehouseOrderType != null">warehouse_order_type,</if>
+            <if test="warehouseOutType != null">warehouse_out_type,</if>
+            <if test="businessName != null">business_name,</if>
+            <if test="aftersalesName != null">aftersales_name,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="shippingDeviceId != null">shipping_device_id,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="enterpriseSum != null">enterprise_sum,</if>
+            <if test="outOrderSum != null">out_order_sum,</if>
+            <if test="outOrderName != null">out_order_name,</if>
+            <if test="outOrderTime != null">out_order_time,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="applyName != null">apply_name,</if>
+            <if test="planDeliveryTime != null">plan_delivery_time,</if>
+            <if test="deliveryCondition != null">delivery_condition,</if>
+            <if test="deliveryAddress != null">delivery_address,</if>
+            <if test="deliveryName != null">delivery_name,</if>
+            <if test="deliveryNumber != null">delivery_number,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="outOrderCode != null">#{outOrderCode},</if>
+            <if test="makeNo != null">#{makeNo},</if>
+            <if test="warehouseOutStatus != null">#{warehouseOutStatus},</if>
+            <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="salesOrderCode != null">#{salesOrderCode},</if>
+            <if test="warehouseOrderType != null">#{warehouseOrderType},</if>
+            <if test="warehouseOutType != null">#{warehouseOutType},</if>
+            <if test="businessName != null">#{businessName},</if>
+            <if test="aftersalesName != null">#{aftersalesName},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="shippingDeviceId != null">#{shippingDeviceId},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="enterpriseSum != null">#{enterpriseSum},</if>
+            <if test="outOrderSum != null">#{outOrderSum},</if>
+            <if test="outOrderName != null">#{outOrderName},</if>
+            <if test="outOrderTime != null">#{outOrderTime},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="applyName != null">#{applyName},</if>
+            <if test="planDeliveryTime != null">#{planDeliveryTime},</if>
+            <if test="deliveryCondition != null">#{deliveryCondition},</if>
+            <if test="deliveryAddress != null">#{deliveryAddress},</if>
+            <if test="deliveryName != null">#{deliveryName},</if>
+            <if test="deliveryNumber != null">#{deliveryNumber},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWarehouseOutOrder" parameterType="WarehouseOutOrder">
+        update warehouse_out_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="makeNo != null">make_no = #{makeNo},</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status = #{warehouseOutStatus},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
+            <if test="businessName != null">business_name = #{businessName},</if>
+            <if test="aftersalesName != null">aftersales_name = #{aftersalesName},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="outOrderSum != null">out_order_sum = #{outOrderSum},</if>
+            <if test="outOrderName != null">out_order_name = #{outOrderName},</if>
+            <if test="outOrderTime != null">out_order_time = #{outOrderTime},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="applyName != null">apply_name = #{applyName},</if>
+            <if test="planDeliveryTime != null">plan_delivery_time = #{planDeliveryTime},</if>
+            <if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="deliveryNumber != null">delivery_number = #{deliveryNumber},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where out_order_id = #{outOrderId}
+    </update>
+
+    <delete id="deleteWarehouseOutOrderById" parameterType="Long">
+        delete from warehouse_out_order where out_order_id = #{outOrderId}
+    </delete>
+
+    <delete id="deleteWarehouseOutOrderByIds" parameterType="String">
+        delete from warehouse_out_order where out_order_id in 
+        <foreach item="outOrderId" collection="array" open="(" separator="," close=")">
+            #{outOrderId}
+        </foreach>
+    </delete>
+
+    <update id="cancelWarehouseOutOrderById" parameterType="Long">
+        update warehouse_out_order set del_flag = '1' where out_order_id = #{outOrderId}
+    </update>
+
+    <update id="restoreWarehouseOutOrderById" parameterType="Long">
+        update warehouse_out_order set del_flag = '0' where out_order_id = #{outOrderId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/add.html

@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增出库单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-warehouseOutOrder-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库单号：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联生产订单号：</label>
+                <div class="col-sm-8">
+                    <input name="makeNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库状态：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOutStatus" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联订单号：</label>
+                <div class="col-sm-8">
+                    <input name="relatedOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联销售订单编号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOutType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务人员：</label>
+                <div class="col-sm-8">
+                    <input name="businessName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后人员：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">仓库员：</label>
+                <div class="col-sm-8">
+                    <input name="warehouseName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出货设备id：</label>
+                <div class="col-sm-8">
+                    <input name="shippingDeviceId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库数：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库对象：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="outOrderTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户ID：</label>
+                <div class="col-sm-8">
+                    <input name="customerId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="customerName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人员：</label>
+                <div class="col-sm-8">
+                    <input name="applyName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">计划交付时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="planDeliveryTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">交付条件：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryCondition" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货地址：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryAddress" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系人：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryNumber" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "aftersales/warehouseOutOrder"
+        $("#form-warehouseOutOrder-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-warehouseOutOrder-add').serialize());
+            }
+        }
+
+        $("input[name='outOrderTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='planDeliveryTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/edit.html

@@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改出库单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-warehouseOutOrder-edit" th:object="${warehouseOutOrder}">
+            <input name="outOrderId" th:field="*{outOrderId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库单号：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联生产订单号：</label>
+                <div class="col-sm-8">
+                    <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库状态：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOutStatus" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOutStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联订单号：</label>
+                <div class="col-sm-8">
+                    <input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联销售订单编号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOutType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOutType}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务人员：</label>
+                <div class="col-sm-8">
+                    <input name="businessName" th:field="*{businessName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后人员：</label>
+                <div class="col-sm-8">
+                    <input name="aftersalesName" th:field="*{aftersalesName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">仓库员：</label>
+                <div class="col-sm-8">
+                    <input name="warehouseName" th:field="*{warehouseName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出货设备id：</label>
+                <div class="col-sm-8">
+                    <input name="shippingDeviceId" th:field="*{shippingDeviceId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" th:field="*{materialSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseSum" th:field="*{enterpriseSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库数：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderSum" th:field="*{outOrderSum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库对象：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderName" th:field="*{outOrderName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="outOrderTime" th:value="${#dates.format(warehouseOutOrder.outOrderTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户ID：</label>
+                <div class="col-sm-8">
+                    <input name="customerId" th:field="*{customerId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="customerName" th:field="*{customerName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请人员：</label>
+                <div class="col-sm-8">
+                    <input name="applyName" th:field="*{applyName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">计划交付时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="planDeliveryTime" th:value="${#dates.format(warehouseOutOrder.planDeliveryTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">交付条件：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryCondition" th:field="*{deliveryCondition}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货地址：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系人：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "aftersales/warehouseOutOrder";
+        $("#form-warehouseOutOrder-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-warehouseOutOrder-edit').serialize());
+            }
+        }
+
+        $("input[name='outOrderTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='planDeliveryTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/warehouseOutOrder.html

@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('出库单列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>出库单号：</label>
+                                <input type="text" name="outOrderCode"/>
+                            </li>
+                            <li>
+                                <label>出库状态：</label>
+                                <select name="warehouseOutStatus" th:with="type=${@dict.getType('warehouse_out_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>关联订单号：</label>
+                                <input type="text" name="relatedOrderCode"/>
+                            </li>
+                            <li>
+                                <label>申请人员：</label>
+                                <input type="text" name="applyName"/>
+                            </li>
+                            <li>
+                                <label>仓库员：</label>
+                                <input type="text" name="warehouseName"/>
+                            </li>
+                            <li>
+                                <label>订单类型：</label>
+                                <select name="warehouseOrderType" th:with="type=${@dict.getType('warehouse_order_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="aftersales:warehouseOutOrder:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="aftersales:warehouseOutOrder:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="aftersales:warehouseOutOrder:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="aftersales:warehouseOutOrder:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('aftersales:warehouseOutOrder:restore')}]];
+        var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
+        var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
+        var warehouseOutTypeDatas = [[${@dict.getType('warehouse_out_type')}]];
+        var prefix = ctx + "aftersales/warehouseOutOrder";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "出库单",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '出库单Id',
+                    field: 'outOrderId',
+                    visible: false
+                },
+                {
+                    title: '出库单号',
+                    field: 'outOrderCode',
+                },
+                {
+                    title: '出库状态',
+                    field: 'warehouseOutStatus',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseOutStatusDatas, value);
+                    }
+                },
+                {
+                    title: '关联订单号',
+                    field: 'relatedOrderCode',
+                },
+                {
+                    title: '订单类型',
+                    field: 'warehouseOrderType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
+                    }
+                },
+                {
+                    title: '业务人',
+                    field: 'businessName',
+                },
+                {
+                    title: '物料合计',
+                    field: 'materialSum',
+                },
+                {
+                    title: '数量合计',
+                    field: 'enterpriseSum',
+                },
+                    {
+                        title: '计划交付时间',
+                        field: 'planDeliveryTime',
+                    },
+                    {
+                        title: '交付条件',
+                        field: 'deliveryCondition',
+                    },
+                    {
+                        title: '联系人',
+                        field: 'deliveryName',
+                    },
+                    {
+                        title: '联系电话',
+                        field: 'deliveryNumber',
+                    },
+                    {
+                        title: '收货地址',
+                        field: 'deliveryAddress',
+                    },
+                    {
+                        title: '录入时间',
+                        field: 'createTime',
+                    },
+                    {
+                        title: '出库时间',
+                        field: 'outOrderTime',
+                    },
+                    {
+                        title: '仓库员',
+                        field: 'warehouseName',
+                    },
+                {
+                    title: '售后员',
+                    field: 'aftersalesName',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '上次更新时间',
+                    field: 'updateTime',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.outOrderId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>