[feat]仓库管理

入库单
新增入库单前端列表页面
新增入库单Controller
新增入库单Mapper
新增入库单Mapper.xml
新增入库单Service
新增入库单ServiceImpl
新增入库单receivables.html
完成数据填充，页面展示，条件查询操作

ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java

@@ -0,0 +1,151 @@
+package com.ruoyi.warehouse.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.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.service.IWarehouseStorageOrderService;
+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-05-22
+ */
+@Controller
+@RequestMapping("/warehouse/storageOrder")
+public class WarehouseStorageOrderController extends BaseController
+{
+    private String prefix = "warehouse/storageOrder";
+
+    @Autowired
+    private IWarehouseStorageOrderService warehouseStorageOrderService;
+
+    @RequiresPermissions("warehouse:storageOrder:view")
+    @GetMapping()
+    public String storageOrder()
+    {
+        return prefix + "/storageOrder";
+    }
+
+    /**
+     * 查询仓库入库单列表
+     */
+    @RequiresPermissions("warehouse:storageOrder:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        startPage();
+        List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出仓库入库单列表
+     */
+    @RequiresPermissions("warehouse:storageOrder:export")
+    @Log(title = "仓库入库单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
+        ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class);
+        return util.exportExcel(list, "仓库入库单数据");
+    }
+
+    /**
+     * 新增仓库入库单
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存仓库入库单
+     */
+    @RequiresPermissions("warehouse:storageOrder:add")
+    @Log(title = "仓库入库单", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        return toAjax(warehouseStorageOrderService.insertWarehouseStorageOrder(warehouseStorageOrder));
+    }
+
+    /**
+     * 修改仓库入库单
+     */
+    @GetMapping("/edit/{warehouseStorageId}")
+    public String edit(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap)
+    {
+        WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId);
+        mmap.put("warehouseStorageOrder", warehouseStorageOrder);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存仓库入库单
+     */
+    @RequiresPermissions("warehouse:storageOrder:edit")
+    @Log(title = "仓库入库单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+    }
+
+    /**
+     * 删除仓库入库单
+     */
+    @RequiresPermissions("warehouse:storageOrder:remove")
+    @Log(title = "仓库入库单", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(warehouseStorageOrderService.deleteWarehouseStorageOrderByIds(ids));
+    }
+
+    /**
+     * 作废仓库入库单
+     */
+    @RequiresPermissions("warehouse:storageOrder:cancel")
+    @Log(title = "仓库入库单", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(warehouseStorageOrderService.cancelWarehouseStorageOrderById(id));
+    }
+
+    /**
+     * 恢复仓库入库单
+     */
+    @RequiresPermissions("warehouse:storageOrder:restore")
+    @Log(title = "仓库入库单", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(warehouseStorageOrderService.restoreWarehouseStorageOrderById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java

@@ -0,0 +1,358 @@
+package com.ruoyi.warehouse.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_storage_order
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-22
+ */
+public class WarehouseStorageOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库单id */
+    private Long warehouseStorageId;
+
+    /** 入库单号 */
+    @Excel(name = "入库单号")
+    private String warehouseStorageCode;
+
+    /** 关联订单号（多种订单类型） */
+    @Excel(name = "关联订单号", readConverterExp = "多=种订单类型")
+    private String relatedOrderCode;
+
+    /** 仓库入库状态 */
+    @Excel(name = "仓库入库状态")
+    private String warehouseStorageStatus;
+
+    /** 仓库品质状态 */
+    @Excel(name = "仓库品质状态")
+    private String warehouseQualityStatus;
+
+    /** 仓库入库类型 */
+    @Excel(name = "仓库入库类型")
+    private String warehouseStorageType;
+
+    /** 仓库订单类型 */
+    @Excel(name = "仓库订单类型")
+    private String warehouseOrderType;
+
+    /** 仓库入库部门类型 */
+    @Excel(name = "仓库入库部门类型")
+    private String warehouseDeptType;
+
+    /** 通知已到货数量 */
+    @Excel(name = "通知已到货数量")
+    private Integer notifyArrivedNum;
+
+    /** 实际已到货数量 */
+    @Excel(name = "实际已到货数量")
+    private Integer actualArrivedNum;
+
+    /** 暂收合格数量 */
+    @Excel(name = "暂收合格数量")
+    private Integer temporaryQualifiedNum;
+
+    /** 暂收不合格数量 */
+    @Excel(name = "暂收不合格数量")
+    private Integer temporaryUnqualifiedNum;
+
+    /** 品质合格数量 */
+    @Excel(name = "品质合格数量")
+    private Integer qualityQualifiedNum;
+
+
+    /** 品质不合格数量 */
+    @Excel(name = "品质不合格数量")
+    private Integer qualityUnqualifiedNum;
+
+
+    /** 入库数量 */
+    @Excel(name = "入库数量")
+    private Integer storageNum;
+
+    /** 到货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date arrivedTime;
+
+    /** 暂收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "暂收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date temporaryTime;
+
+    /** 交付质检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryInspectionTime;
+
+    /** 品质时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "品质时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qualityTime;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date storageTime;
+
+    /** 仓库员工 */
+    @Excel(name = "仓库员工")
+    private String warehouseEmployee;
+
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseCode;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    public void setWarehouseStorageId(Long warehouseStorageId) 
+    {
+        this.warehouseStorageId = warehouseStorageId;
+    }
+
+    public Long getWarehouseStorageId() 
+    {
+        return warehouseStorageId;
+    }
+    public void setWarehouseStorageCode(String warehouseStorageCode) 
+    {
+        this.warehouseStorageCode = warehouseStorageCode;
+    }
+
+    public String getWarehouseStorageCode() 
+    {
+        return warehouseStorageCode;
+    }
+    public void setRelatedOrderCode(String relatedOrderCode) 
+    {
+        this.relatedOrderCode = relatedOrderCode;
+    }
+
+    public String getRelatedOrderCode() 
+    {
+        return relatedOrderCode;
+    }
+    public void setWarehouseStorageStatus(String warehouseStorageStatus) 
+    {
+        this.warehouseStorageStatus = warehouseStorageStatus;
+    }
+
+    public String getWarehouseStorageStatus() 
+    {
+        return warehouseStorageStatus;
+    }
+    public void setWarehouseQualityStatus(String warehouseQualityStatus) 
+    {
+        this.warehouseQualityStatus = warehouseQualityStatus;
+    }
+
+    public String getWarehouseQualityStatus() 
+    {
+        return warehouseQualityStatus;
+    }
+    public void setWarehouseStorageType(String warehouseStorageType) 
+    {
+        this.warehouseStorageType = warehouseStorageType;
+    }
+
+    public String getWarehouseStorageType() 
+    {
+        return warehouseStorageType;
+    }
+    public void setWarehouseOrderType(String warehouseOrderType) 
+    {
+        this.warehouseOrderType = warehouseOrderType;
+    }
+
+    public String getWarehouseOrderType() 
+    {
+        return warehouseOrderType;
+    }
+    public void setWarehouseDeptType(String warehouseDeptType) 
+    {
+        this.warehouseDeptType = warehouseDeptType;
+    }
+
+    public String getWarehouseDeptType() 
+    {
+        return warehouseDeptType;
+    }
+    public void setNotifyArrivedNum(Integer notifyArrivedNum) 
+    {
+        this.notifyArrivedNum = notifyArrivedNum;
+    }
+
+    public Integer getNotifyArrivedNum() 
+    {
+        return notifyArrivedNum;
+    }
+    public void setActualArrivedNum(Integer actualArrivedNum) 
+    {
+        this.actualArrivedNum = actualArrivedNum;
+    }
+
+    public Integer getActualArrivedNum() 
+    {
+        return actualArrivedNum;
+    }
+    public void setTemporaryQualifiedNum(Integer temporaryQualifiedNum) 
+    {
+        this.temporaryQualifiedNum = temporaryQualifiedNum;
+    }
+
+    public Integer getTemporaryQualifiedNum() 
+    {
+        return temporaryQualifiedNum;
+    }
+    public void setTemporaryUnqualifiedNum(Integer temporaryUnqualifiedNum) 
+    {
+        this.temporaryUnqualifiedNum = temporaryUnqualifiedNum;
+    }
+
+    public Integer getTemporaryUnqualifiedNum() 
+    {
+        return temporaryUnqualifiedNum;
+    }
+    public void setQualityQualifiedNum(Integer qualityQualifiedNum) 
+    {
+        this.qualityQualifiedNum = qualityQualifiedNum;
+    }
+
+    public Integer getQualityQualifiedNum() 
+    {
+        return qualityQualifiedNum;
+    }
+
+    public Integer getQualityUnqualifiedNum() {
+        return qualityUnqualifiedNum;
+    }
+
+    public void setQualityUnqualifiedNum(Integer qualityUnqualifiedNum) {
+        this.qualityUnqualifiedNum = qualityUnqualifiedNum;
+    }
+
+    public void setStorageNum(Integer storageNum)
+    {
+        this.storageNum = storageNum;
+    }
+
+    public Integer getStorageNum() 
+    {
+        return storageNum;
+    }
+    public void setArrivedTime(Date arrivedTime) 
+    {
+        this.arrivedTime = arrivedTime;
+    }
+
+    public Date getArrivedTime() 
+    {
+        return arrivedTime;
+    }
+    public void setTemporaryTime(Date temporaryTime) 
+    {
+        this.temporaryTime = temporaryTime;
+    }
+
+    public Date getTemporaryTime() 
+    {
+        return temporaryTime;
+    }
+    public void setDeliveryInspectionTime(Date deliveryInspectionTime) 
+    {
+        this.deliveryInspectionTime = deliveryInspectionTime;
+    }
+
+    public Date getDeliveryInspectionTime() 
+    {
+        return deliveryInspectionTime;
+    }
+    public void setQualityTime(Date qualityTime) 
+    {
+        this.qualityTime = qualityTime;
+    }
+
+    public Date getQualityTime() 
+    {
+        return qualityTime;
+    }
+    public void setStorageTime(Date storageTime) 
+    {
+        this.storageTime = storageTime;
+    }
+
+    public Date getStorageTime() 
+    {
+        return storageTime;
+    }
+    public void setWarehouseEmployee(String warehouseEmployee) 
+    {
+        this.warehouseEmployee = warehouseEmployee;
+    }
+
+    public String getWarehouseEmployee() 
+    {
+        return warehouseEmployee;
+    }
+    public void setWarehouseCode(String warehouseCode) 
+    {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getWarehouseCode() 
+    {
+        return warehouseCode;
+    }
+    public void setWarehouseName(String warehouseName) 
+    {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseName() 
+    {
+        return warehouseName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("warehouseStorageId", getWarehouseStorageId())
+            .append("warehouseStorageCode", getWarehouseStorageCode())
+            .append("relatedOrderCode", getRelatedOrderCode())
+            .append("warehouseStorageStatus", getWarehouseStorageStatus())
+            .append("warehouseQualityStatus", getWarehouseQualityStatus())
+            .append("warehouseStorageType", getWarehouseStorageType())
+            .append("warehouseOrderType", getWarehouseOrderType())
+            .append("warehouseDeptType", getWarehouseDeptType())
+            .append("notifyArrivedNum", getNotifyArrivedNum())
+            .append("actualArrivedNum", getActualArrivedNum())
+            .append("temporaryQualifiedNum", getTemporaryQualifiedNum())
+            .append("temporaryUnqualifiedNum", getTemporaryUnqualifiedNum())
+            .append("qualityQualifiedNum", getQualityQualifiedNum())
+            .append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
+            .append("storageNum", getStorageNum())
+            .append("arrivedTime", getArrivedTime())
+            .append("temporaryTime", getTemporaryTime())
+            .append("deliveryInspectionTime", getDeliveryInspectionTime())
+            .append("qualityTime", getQualityTime())
+            .append("storageTime", getStorageTime())
+            .append("warehouseEmployee", getWarehouseEmployee())
+            .append("warehouseCode", getWarehouseCode())
+            .append("warehouseName", getWarehouseName())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.warehouse.mapper;
+
+import java.util.List;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+
+/**
+ * 仓库入库单Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-22
+ */
+public interface WarehouseStorageOrderMapper 
+{
+    /**
+     * 查询仓库入库单
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 仓库入库单
+     */
+    public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 查询仓库入库单列表
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 仓库入库单集合
+     */
+    public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 新增仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 修改仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 删除仓库入库单
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    public int deleteWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 批量删除仓库入库单
+     * 
+     * @param warehouseStorageIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteWarehouseStorageOrderByIds(String[] warehouseStorageIds);
+
+    /**
+     * 作废仓库入库单
+     *
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    public int cancelWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 恢复仓库入库单
+     *
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    public int restoreWarehouseStorageOrderById(Long warehouseStorageId);
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.warehouse.service;
+
+import java.util.List;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+
+/**
+ * 仓库入库单Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-22
+ */
+public interface IWarehouseStorageOrderService 
+{
+    /**
+     * 查询仓库入库单
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 仓库入库单
+     */
+    public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 查询仓库入库单列表
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 仓库入库单集合
+     */
+    public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 新增仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 修改仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+     * 批量删除仓库入库单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteWarehouseStorageOrderByIds(String ids);
+
+    /**
+     * 删除仓库入库单信息
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    public int deleteWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 作废仓库入库单
+     * @param warehouseStorageId 仓库入库单ID
+     * @return
+     */
+    int cancelWarehouseStorageOrderById(Long warehouseStorageId);
+
+    /**
+     * 恢复仓库入库单
+     * @param warehouseStorageId 仓库入库单ID
+     * @return
+     */
+    int restoreWarehouseStorageOrderById(Long warehouseStorageId);
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.warehouse.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.warehouse.mapper.WarehouseStorageOrderMapper;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.service.IWarehouseStorageOrderService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 仓库入库单Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-22
+ */
+@Service
+public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderService 
+{
+    @Autowired
+    private WarehouseStorageOrderMapper warehouseStorageOrderMapper;
+
+    /**
+     * 查询仓库入库单
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 仓库入库单
+     */
+    @Override
+    public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId)
+    {
+        return warehouseStorageOrderMapper.selectWarehouseStorageOrderById(warehouseStorageId);
+    }
+
+    /**
+     * 查询仓库入库单列表
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 仓库入库单
+     */
+    @Override
+    public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        return warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder);
+    }
+
+    /**
+     * 新增仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    @Override
+    public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        warehouseStorageOrder.setCreateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        warehouseStorageOrder.setCreateBy(loginName);
+        return warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
+    }
+
+    /**
+     * 修改仓库入库单
+     * 
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 结果
+     */
+    @Override
+    public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        warehouseStorageOrder.setUpdateBy(loginName);
+        warehouseStorageOrder.setUpdateTime(DateUtils.getNowDate());
+        return warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder);
+    }
+
+    /**
+     * 删除仓库入库单对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseStorageOrderByIds(String ids)
+    {
+        return warehouseStorageOrderMapper.deleteWarehouseStorageOrderByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除仓库入库单信息
+     * 
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseStorageOrderById(Long warehouseStorageId)
+    {
+        return warehouseStorageOrderMapper.deleteWarehouseStorageOrderById(warehouseStorageId);
+    }
+
+    /**
+     * 作废仓库入库单
+     *
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    @Override
+    public int cancelWarehouseStorageOrderById(Long warehouseStorageId)
+    {
+        return warehouseStorageOrderMapper.cancelWarehouseStorageOrderById(warehouseStorageId);
+    }
+
+    /**
+     * 恢复仓库入库单信息
+     *
+     * @param warehouseStorageId 仓库入库单ID
+     * @return 结果
+     */
+    @Override
+    public int restoreWarehouseStorageOrderById(Long warehouseStorageId)
+    {
+        return warehouseStorageOrderMapper.restoreWarehouseStorageOrderById(warehouseStorageId);
+    }
+}

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml

@@ -0,0 +1,171 @@
+<?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.warehouse.mapper.WarehouseStorageOrderMapper">
+    
+    <resultMap type="WarehouseStorageOrder" id="WarehouseStorageOrderResult">
+        <result property="warehouseStorageId"    column="warehouse_storage_id"    />
+        <result property="warehouseStorageCode"    column="warehouse_storage_code"    />
+        <result property="relatedOrderCode"    column="related_order_code"    />
+        <result property="warehouseStorageStatus"    column="warehouse_storage_status"    />
+        <result property="warehouseQualityStatus"    column="warehouse_quality_status"    />
+        <result property="warehouseStorageType"    column="warehouse_storage_type"    />
+        <result property="warehouseOrderType"    column="warehouse_order_type"    />
+        <result property="warehouseDeptType"    column="warehouse_dept_type"    />
+        <result property="notifyArrivedNum"    column="notify_arrived_num"    />
+        <result property="actualArrivedNum"    column="actual_arrived_num"    />
+        <result property="temporaryQualifiedNum"    column="temporary_qualified_num"    />
+        <result property="temporaryUnqualifiedNum"    column="temporary_unqualified_num"    />
+        <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
+        <result property="qualityUnqualifiedNum"    column="quality_unqualified_num"    />
+        <result property="storageNum"    column="storage_num"    />
+        <result property="arrivedTime"    column="arrived_time"    />
+        <result property="temporaryTime"    column="temporary_time"    />
+        <result property="deliveryInspectionTime"    column="delivery_inspection_time"    />
+        <result property="qualityTime"    column="quality_time"    />
+        <result property="storageTime"    column="storage_time"    />
+        <result property="warehouseEmployee"    column="warehouse_employee"    />
+        <result property="warehouseCode"    column="warehouse_code"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectWarehouseStorageOrderVo">
+        select warehouse_storage_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_order_type, warehouse_dept_type, notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num, quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, warehouse_name, create_time, create_by, update_by, update_time from warehouse_storage_order
+    </sql>
+
+    <select id="selectWarehouseStorageOrderList" parameterType="WarehouseStorageOrder" resultMap="WarehouseStorageOrderResult">
+        <include refid="selectWarehouseStorageOrderVo"/>
+        <where>  
+            <if test="warehouseStorageCode != null  and warehouseStorageCode != ''"> and warehouse_storage_code = #{warehouseStorageCode}</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code = #{relatedOrderCode}</if>
+            <if test="warehouseStorageStatus != null  and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if>
+            <if test="warehouseQualityStatus != null  and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if>
+            <if test="warehouseDeptType != null  and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if>
+            <if test="warehouseEmployee != null  and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</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="selectWarehouseStorageOrderById" parameterType="Long" resultMap="WarehouseStorageOrderResult">
+        <include refid="selectWarehouseStorageOrderVo"/>
+        where warehouse_storage_id = #{warehouseStorageId}
+    </select>
+        
+    <insert id="insertWarehouseStorageOrder" parameterType="WarehouseStorageOrder" useGeneratedKeys="true" keyProperty="warehouseStorageId">
+        insert into warehouse_storage_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code,</if>
+            <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="warehouseStorageStatus != null">warehouse_storage_status,</if>
+            <if test="warehouseQualityStatus != null">warehouse_quality_status,</if>
+            <if test="warehouseStorageType != null">warehouse_storage_type,</if>
+            <if test="warehouseOrderType != null">warehouse_order_type,</if>
+            <if test="warehouseDeptType != null">warehouse_dept_type,</if>
+            <if test="notifyArrivedNum != null">notify_arrived_num,</if>
+            <if test="actualArrivedNum != null">actual_arrived_num,</if>
+            <if test="temporaryQualifiedNum != null">temporary_qualified_num,</if>
+            <if test="temporaryUnqualifiedNum != null">temporary_unqualified_num,</if>
+            <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
+            <if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
+            <if test="storageNum != null">storage_num,</if>
+            <if test="arrivedTime != null">arrived_time,</if>
+            <if test="temporaryTime != null">temporary_time,</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
+            <if test="qualityTime != null">quality_time,</if>
+            <if test="storageTime != null">storage_time,</if>
+            <if test="warehouseEmployee != null">warehouse_employee,</if>
+            <if test="warehouseCode != null">warehouse_code,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">#{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if>
+            <if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if>
+            <if test="warehouseStorageType != null">#{warehouseStorageType},</if>
+            <if test="warehouseOrderType != null">#{warehouseOrderType},</if>
+            <if test="warehouseDeptType != null">#{warehouseDeptType},</if>
+            <if test="notifyArrivedNum != null">#{notifyArrivedNum},</if>
+            <if test="actualArrivedNum != null">#{actualArrivedNum},</if>
+            <if test="temporaryQualifiedNum != null">#{temporaryQualifiedNum},</if>
+            <if test="temporaryUnqualifiedNum != null">#{temporaryUnqualifiedNum},</if>
+            <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
+            <if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
+            <if test="storageNum != null">#{storageNum},</if>
+            <if test="arrivedTime != null">#{arrivedTime},</if>
+            <if test="temporaryTime != null">#{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">#{qualityTime},</if>
+            <if test="storageTime != null">#{storageTime},</if>
+            <if test="warehouseEmployee != null">#{warehouseEmployee},</if>
+            <if test="warehouseCode != null">#{warehouseCode},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWarehouseStorageOrder" parameterType="WarehouseStorageOrder">
+        update warehouse_storage_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
+            <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
+            <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="warehouseDeptType != null">warehouse_dept_type = #{warehouseDeptType},</if>
+            <if test="notifyArrivedNum != null">notify_arrived_num = #{notifyArrivedNum},</if>
+            <if test="actualArrivedNum != null">actual_arrived_num = #{actualArrivedNum},</if>
+            <if test="temporaryQualifiedNum != null">temporary_qualified_num = #{temporaryQualifiedNum},</if>
+            <if test="temporaryUnqualifiedNum != null">temporary_unqualified_num = #{temporaryUnqualifiedNum},</if>
+            <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
+            <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
+            <if test="storageNum != null">storage_num = #{storageNum},</if>
+            <if test="arrivedTime != null">arrived_time = #{arrivedTime},</if>
+            <if test="temporaryTime != null">temporary_time = #{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">quality_time = #{qualityTime},</if>
+            <if test="storageTime != null">storage_time = #{storageTime},</if>
+            <if test="warehouseEmployee != null">warehouse_employee = #{warehouseEmployee},</if>
+            <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where warehouse_storage_id = #{warehouseStorageId}
+    </update>
+
+    <delete id="deleteWarehouseStorageOrderById" parameterType="Long">
+        delete from warehouse_storage_order where warehouse_storage_id = #{warehouseStorageId}
+    </delete>
+
+    <delete id="deleteWarehouseStorageOrderByIds" parameterType="String">
+        delete from warehouse_storage_order where warehouse_storage_id in 
+        <foreach item="warehouseStorageId" collection="array" open="(" separator="," close=")">
+            #{warehouseStorageId}
+        </foreach>
+    </delete>
+
+    <update id="cancelWarehouseStorageOrderById" parameterType="Long">
+        update warehouse_storage_order set del_flag = '1' where warehouse_storage_id = #{warehouseStorageId}
+    </update>
+
+    <update id="restoreWarehouseStorageOrderById" parameterType="Long">
+        update warehouse_storage_order set del_flag = '0' where warehouse_storage_id = #{warehouseStorageId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html

@@ -0,0 +1,237 @@
+<!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="warehouseStorageCode"/>
+                            </li>
+                            <li>
+                                <label>入库状态：</label>
+                                <select name="warehouseStorageStatus" th:with="type=${@dict.getType('warehouse_storage_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>品质状态：</label>
+                                <select name="warehouseQualityStatus" th:with="type=${@dict.getType('warehouse_quality_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="warehouseEmployee"/>
+                            </li>
+                            <li>
+                                <label>入库部门：</label>
+                                <select name="warehouseDeptType" th:with="type=${@dict.getType('warehouse_dept_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="warehouse:storageOrder:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:storageOrder: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('warehouse:storageOrder:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('warehouse:storageOrder:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('warehouse:storageOrder:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('warehouse:storageOrder:restore')}]];
+        var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]];
+        var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]];
+        var warehouseStorageTypeDatas = [[${@dict.getType('warehouse_storage_type')}]];
+        var warehouseOrderTypeDatas = [[${@dict.getType('storage_order_type')}]];
+        var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
+        var prefix = ctx + "warehouse/storageOrder";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "仓库入库单",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '入库单id',
+                    field: 'warehouseStorageId',
+                    visible: false
+                },
+                {
+                    title: '入库单号',
+                    field: 'warehouseStorageCode',
+                },
+
+                {
+                    title: '仓库入库状态',
+                    field: 'warehouseStorageStatus',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseStorageStatusDatas, value);
+                    }
+                },
+                {
+                    title: '仓库品质状态',
+                    field: 'warehouseQualityStatus',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseQualityStatusDatas, value);
+                    }
+                },
+                {
+                    title: '关联订单号',
+                    field: 'relatedOrderCode',
+                },
+                {
+                    title: '仓库订单类型',
+                    field: 'warehouseOrderType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
+                    }
+                },
+                {
+                    title: '仓库入库类型',
+                    field: 'warehouseStorageType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseStorageTypeDatas, value);
+                    }
+                },
+                {
+                    title: '入库部门',
+                    field: 'warehouseDeptType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseDeptTypeDatas, value);
+                    }
+                },
+                {
+                    title: '通知已到货数量',
+                    field: 'notifyArrivedNum',
+                },
+                {
+                    title: '实际到货数',
+                    field: 'actualArrivedNum',
+                },
+                {
+                    title: '暂收合格数',
+                    field: 'temporaryQualifiedNum',
+                },
+                {
+                    title: '暂收不合格数',
+                    field: 'temporaryUnqualifiedNum',
+                },
+                {
+                    title: '品质合格数',
+                    field: 'qualityQualifiedNum',
+                },
+                {
+                    title: '品质不合格数',
+                    field: 'qualityUnqualifiedNum',
+                },
+                {
+                    title: '入库数',
+                    field: 'storageNum',
+                },
+                {
+                    title: '到货时间',
+                    field: 'arrivedTime',
+                },
+                {
+                    title: '暂收时间',
+                    field: 'temporaryTime',
+                },
+                {
+                    title: '交检时间',
+                    field: 'deliveryInspectionTime',
+                },
+                {
+                    title: '品质时间',
+                    field: 'qualityTime',
+                },
+                {
+                    title: '入库时间',
+                    field: 'storageTime',
+                },
+                {
+                    title: '仓库员',
+                    field: 'warehouseEmployee',
+                },
+                {
+                    title: '仓库ID',
+                    field: 'warehouseCode',
+                },
+                {
+                    title: '仓库名称',
+                    field: 'warehouseName',
+                },
+                {
+                    title: '录入人',
+                    field: 'createBy',
+                },
+                {
+                    title: '录入时间',
+                    field: 'createTime',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '上次更新时间',
+                    field: 'updateTime',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>