diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInSearchController.java
deleted file mode 100644
index 3cffdc3c..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInSearchController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.ruoyi.storehouse.controller;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.storehouse.domain.WarehousingInSearch;
-import com.ruoyi.storehouse.service.IWarehousingInSearchService;
-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.*;
-
-import java.util.List;
-
-/**
- * 入库查询Controller
- * 
- * @author ruoyi
- * @date 2023-05-05
- */
-@Controller
-@RequestMapping("/storehouse/warehousingInSearch")
-public class WarehousingInSearchController extends BaseController
-{
-    private String prefix = "storehouse/warehousingInSearch";
-
-    @Autowired
-    private IWarehousingInSearchService warehousingInSearchService;
-
-    @RequiresPermissions("storehouse:warehousingInSearch:view")
-    @GetMapping()
-    public String warehousingInSearch()
-    {
-        return prefix + "/warehousingInSearch";
-    }
-
-    /**
-     * 查询入库查询列表
-     */
-    @RequiresPermissions("storehouse:warehousingInSearch:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(WarehousingInSearch warehousingInSearch)
-    {
-        startPage();
-        List<WarehousingInSearch> list = warehousingInSearchService.selectWarehousingInSearchList(warehousingInSearch);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出入库查询列表
-     */
-    @RequiresPermissions("storehouse:warehousingInSearch:export")
-    @Log(title = "入库查询", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(WarehousingInSearch warehousingInSearch)
-    {
-        List<WarehousingInSearch> list = warehousingInSearchService.selectWarehousingInSearchList(warehousingInSearch);
-        ExcelUtil<WarehousingInSearch> util = new ExcelUtil<WarehousingInSearch>(WarehousingInSearch.class);
-        return util.exportExcel(list, "入库查询数据");
-    }
-
-    /**
-     * 新增入库查询
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存入库查询
-     */
-    @RequiresPermissions("storehouse:warehousingInSearch:add")
-    @Log(title = "入库查询", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(WarehousingInSearch warehousingInSearch)
-    {
-        return toAjax(warehousingInSearchService.insertWarehousingInSearch(warehousingInSearch));
-    }
-
-    /**
-     * 修改入库查询
-     */
-    @GetMapping("/edit/{warehousingDetailId}")
-    public String edit(@PathVariable("warehousingDetailId") Long warehousingDetailId, ModelMap mmap)
-    {
-        WarehousingInSearch warehousingInSearch = warehousingInSearchService.selectWarehousingInSearchById(warehousingDetailId);
-        mmap.put("warehousingInSearch", warehousingInSearch);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存入库查询
-     */
-    @RequiresPermissions("storehouse:warehousingInSearch:edit")
-    @Log(title = "入库查询", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(WarehousingInSearch warehousingInSearch)
-    {
-        return toAjax(warehousingInSearchService.updateWarehousingInSearch(warehousingInSearch));
-    }
-
-    /**
-     * 删除入库查询
-     */
-    @RequiresPermissions("storehouse:warehousingInSearch:remove")
-    @Log(title = "入库查询", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(warehousingInSearchService.deleteWarehousingInSearchByIds(ids));
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInSearch.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInSearch.java
deleted file mode 100644
index ff2bc3ee..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInSearch.java
+++ /dev/null
@@ -1,527 +0,0 @@
-package com.ruoyi.storehouse.domain;
-
-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;
-
-/**
- * 入库查询对象 warehousing_in_search
- * 
- * @author ruoyi
- * @date 2023-05-05
- */
-public class WarehousingInSearch extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 入库物料id */
-    private Long warehousingDetailId;
-
-    /** 入库单号 */
-    @Excel(name = "入库单号")
-    private String warehousingNumber;
-
-    /** 物料代码 */
-    @Excel(name = "物料代码")
-    private String materialCode;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String materialName;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型")
-    private String materialType;
-
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String specificationModel;
-
-    /** 机种 */
-    @Excel(name = "机种")
-    private String typeMachine;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String inventoryUnit;
-
-    /** 数量 */
-    @Excel(name = "数量")
-    private String warehousingQuantity;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private String unitPrice;
-
-    /** 金额 */
-    @Excel(name = "金额")
-    private String amountMoney;
-
-    /** 说明 */
-    @Excel(name = "说明")
-    private String description;
-
-    /** 批号 */
-    @Excel(name = "批号")
-    private String batchNumber;
-
-    /** 厂商批号 */
-    @Excel(name = "厂商批号")
-    private String manufacturerBatchNumber;
-
-    /** 存放地址 */
-    @Excel(name = "存放地址")
-    private String storageLocation;
-
-    /** 暂收单号 */
-    @Excel(name = "暂收单号")
-    private String inNoticeNumber;
-
-    /** 入库类型 */
-    @Excel(name = "入库类型")
-    private String warehousingCategory;
-
-    /** 采购订单号 */
-    @Excel(name = "采购订单号")
-    private String purchaseOrderNumber;
-
-    /** 联系人 */
-    @Excel(name = "联系人")
-    private String contacts;
-
-    /** 入库日期 */
-    @Excel(name = "入库日期")
-    private String warehousingDate;
-
-    /** 供应商代码 */
-    @Excel(name = "供应商代码")
-    private String supplierCode;
-
-    /** 供应商名称 */
-    @Excel(name = "供应商名称")
-    private String supplierName;
-
-    /** 制单人员 */
-    @Excel(name = "制单人员")
-    private String documentPreparationPersonnel;
-
-    /** 仓库号 */
-    @Excel(name = "仓库号")
-    private String stockNumber;
-
-    /** 仓库名称 */
-    @Excel(name = "仓库名称")
-    private String stockName;
-
-    /** 仓库管理员 */
-    @Excel(name = "仓库管理员")
-    private String stockManager;
-
-    /** 内外销 */
-    @Excel(name = "内外销")
-    private String exportSales;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remarks;
-
-    /** 送货人 */
-    @Excel(name = "送货人")
-    private String deliveryMan;
-
-    /** 退货单号 */
-    @Excel(name = "退货单号")
-    private String returnGoodsNumber;
-
-    /** 企业代码 */
-    @Excel(name = "企业代码")
-    private String enterpriseCode;
-
-    /** 企业名称 */
-    @Excel(name = "企业名称")
-    private String enterpriseName;
-
-    /** 入库通知单号 */
-    @Excel(name = "入库通知单号")
-    private String notificationNumber;
-
-    /** 工单号 */
-    @Excel(name = "工单号")
-    private String workOrderNumber;
-
-    /** 部门编号 */
-    @Excel(name = "部门编号")
-    private String deptCode;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    public void setWarehousingDetailId(Long warehousingDetailId) 
-    {
-        this.warehousingDetailId = warehousingDetailId;
-    }
-
-    public Long getWarehousingDetailId() 
-    {
-        return warehousingDetailId;
-    }
-    public void setWarehousingNumber(String warehousingNumber) 
-    {
-        this.warehousingNumber = warehousingNumber;
-    }
-
-    public String getWarehousingNumber() 
-    {
-        return warehousingNumber;
-    }
-    public void setMaterialCode(String materialCode) 
-    {
-        this.materialCode = materialCode;
-    }
-
-    public String getMaterialCode() 
-    {
-        return materialCode;
-    }
-    public void setMaterialName(String materialName) 
-    {
-        this.materialName = materialName;
-    }
-
-    public String getMaterialName() 
-    {
-        return materialName;
-    }
-    public void setMaterialType(String materialType) 
-    {
-        this.materialType = materialType;
-    }
-
-    public String getMaterialType() 
-    {
-        return materialType;
-    }
-    public void setSpecificationModel(String specificationModel) 
-    {
-        this.specificationModel = specificationModel;
-    }
-
-    public String getSpecificationModel() 
-    {
-        return specificationModel;
-    }
-    public void setTypeMachine(String typeMachine) 
-    {
-        this.typeMachine = typeMachine;
-    }
-
-    public String getTypeMachine() 
-    {
-        return typeMachine;
-    }
-    public void setInventoryUnit(String inventoryUnit) 
-    {
-        this.inventoryUnit = inventoryUnit;
-    }
-
-    public String getInventoryUnit() 
-    {
-        return inventoryUnit;
-    }
-
-    public String getWarehousingQuantity() {
-        return warehousingQuantity;
-    }
-
-    public void setWarehousingQuantity(String warehousingQuantity) {
-        this.warehousingQuantity = warehousingQuantity;
-    }
-
-    public void setUnitPrice(String unitPrice)
-    {
-        this.unitPrice = unitPrice;
-    }
-
-    public String getUnitPrice() 
-    {
-        return unitPrice;
-    }
-    public void setAmountMoney(String amountMoney) 
-    {
-        this.amountMoney = amountMoney;
-    }
-
-    public String getAmountMoney() 
-    {
-        return amountMoney;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setBatchNumber(String batchNumber) 
-    {
-        this.batchNumber = batchNumber;
-    }
-
-    public String getBatchNumber() 
-    {
-        return batchNumber;
-    }
-    public void setManufacturerBatchNumber(String manufacturerBatchNumber) 
-    {
-        this.manufacturerBatchNumber = manufacturerBatchNumber;
-    }
-
-    public String getManufacturerBatchNumber() 
-    {
-        return manufacturerBatchNumber;
-    }
-    public void setStorageLocation(String storageLocation) 
-    {
-        this.storageLocation = storageLocation;
-    }
-
-    public String getStorageLocation() 
-    {
-        return storageLocation;
-    }
-    public void setInNoticeNumber(String inNoticeNumber) 
-    {
-        this.inNoticeNumber = inNoticeNumber;
-    }
-
-    public String getInNoticeNumber() 
-    {
-        return inNoticeNumber;
-    }
-    public void setWarehousingCategory(String warehousingCategory) 
-    {
-        this.warehousingCategory = warehousingCategory;
-    }
-
-    public String getWarehousingCategory() 
-    {
-        return warehousingCategory;
-    }
-    public void setPurchaseOrderNumber(String purchaseOrderNumber) 
-    {
-        this.purchaseOrderNumber = purchaseOrderNumber;
-    }
-
-    public String getPurchaseOrderNumber() 
-    {
-        return purchaseOrderNumber;
-    }
-    public void setContacts(String contacts) 
-    {
-        this.contacts = contacts;
-    }
-
-    public String getContacts() 
-    {
-        return contacts;
-    }
-    public void setWarehousingDate(String warehousingDate) 
-    {
-        this.warehousingDate = warehousingDate;
-    }
-
-    public String getWarehousingDate() 
-    {
-        return warehousingDate;
-    }
-    public void setSupplierCode(String supplierCode) 
-    {
-        this.supplierCode = supplierCode;
-    }
-
-    public String getSupplierCode() 
-    {
-        return supplierCode;
-    }
-    public void setSupplierName(String supplierName) 
-    {
-        this.supplierName = supplierName;
-    }
-
-    public String getSupplierName() 
-    {
-        return supplierName;
-    }
-    public void setDocumentPreparationPersonnel(String documentPreparationPersonnel) 
-    {
-        this.documentPreparationPersonnel = documentPreparationPersonnel;
-    }
-
-    public String getDocumentPreparationPersonnel() 
-    {
-        return documentPreparationPersonnel;
-    }
-    public void setStockNumber(String stockNumber) 
-    {
-        this.stockNumber = stockNumber;
-    }
-
-    public String getStockNumber() 
-    {
-        return stockNumber;
-    }
-    public void setStockName(String stockName) 
-    {
-        this.stockName = stockName;
-    }
-
-    public String getStockName() 
-    {
-        return stockName;
-    }
-    public void setStockManager(String stockManager) 
-    {
-        this.stockManager = stockManager;
-    }
-
-    public String getStockManager() 
-    {
-        return stockManager;
-    }
-    public void setExportSales(String exportSales) 
-    {
-        this.exportSales = exportSales;
-    }
-
-    public String getExportSales() 
-    {
-        return exportSales;
-    }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-    public void setDeliveryMan(String deliveryMan) 
-    {
-        this.deliveryMan = deliveryMan;
-    }
-
-    public String getDeliveryMan() 
-    {
-        return deliveryMan;
-    }
-    public void setReturnGoodsNumber(String returnGoodsNumber) 
-    {
-        this.returnGoodsNumber = returnGoodsNumber;
-    }
-
-    public String getReturnGoodsNumber() 
-    {
-        return returnGoodsNumber;
-    }
-    public void setEnterpriseCode(String enterpriseCode) 
-    {
-        this.enterpriseCode = enterpriseCode;
-    }
-
-    public String getEnterpriseCode() 
-    {
-        return enterpriseCode;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setNotificationNumber(String notificationNumber) 
-    {
-        this.notificationNumber = notificationNumber;
-    }
-
-    public String getNotificationNumber() 
-    {
-        return notificationNumber;
-    }
-    public void setWorkOrderNumber(String workOrderNumber) 
-    {
-        this.workOrderNumber = workOrderNumber;
-    }
-
-    public String getWorkOrderNumber() 
-    {
-        return workOrderNumber;
-    }
-    public void setDeptCode(String deptCode) 
-    {
-        this.deptCode = deptCode;
-    }
-
-    public String getDeptCode() 
-    {
-        return deptCode;
-    }
-    public void setDeptName(String deptName) 
-    {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() 
-    {
-        return deptName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("warehousingDetailId", getWarehousingDetailId())
-            .append("warehousingNumber", getWarehousingNumber())
-            .append("materialCode", getMaterialCode())
-            .append("materialName", getMaterialName())
-            .append("materialType", getMaterialType())
-            .append("specificationModel", getSpecificationModel())
-            .append("typeMachine", getTypeMachine())
-            .append("inventoryUnit", getInventoryUnit())
-            .append("warehousingQuantity", getWarehousingQuantity())
-            .append("unitPrice", getUnitPrice())
-            .append("amountMoney", getAmountMoney())
-            .append("description", getDescription())
-            .append("batchNumber", getBatchNumber())
-            .append("manufacturerBatchNumber", getManufacturerBatchNumber())
-            .append("storageLocation", getStorageLocation())
-            .append("inNoticeNumber", getInNoticeNumber())
-            .append("warehousingCategory", getWarehousingCategory())
-            .append("purchaseOrderNumber", getPurchaseOrderNumber())
-            .append("contacts", getContacts())
-            .append("warehousingDate", getWarehousingDate())
-            .append("supplierCode", getSupplierCode())
-            .append("supplierName", getSupplierName())
-            .append("documentPreparationPersonnel", getDocumentPreparationPersonnel())
-            .append("stockNumber", getStockNumber())
-            .append("stockName", getStockName())
-            .append("stockManager", getStockManager())
-            .append("exportSales", getExportSales())
-            .append("remarks", getRemarks())
-            .append("deliveryMan", getDeliveryMan())
-            .append("returnGoodsNumber", getReturnGoodsNumber())
-            .append("enterpriseCode", getEnterpriseCode())
-            .append("enterpriseName", getEnterpriseName())
-            .append("notificationNumber", getNotificationNumber())
-            .append("workOrderNumber", getWorkOrderNumber())
-            .append("deptCode", getDeptCode())
-            .append("deptName", getDeptName())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInSearchMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInSearchMapper.java
deleted file mode 100644
index a1d5afb2..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInSearchMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.storehouse.mapper;
-
-import java.util.List;
-import com.ruoyi.storehouse.domain.WarehousingInSearch;
-
-/**
- * 入库查询Mapper接口
- * 
- * @author ruoyi
- * @date 2023-05-05
- */
-public interface WarehousingInSearchMapper 
-{
-    /**
-     * 查询入库查询
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 入库查询
-     */
-    public WarehousingInSearch selectWarehousingInSearchById(Long warehousingDetailId);
-
-    /**
-     * 查询入库查询列表
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 入库查询集合
-     */
-    public List<WarehousingInSearch> selectWarehousingInSearchList(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 新增入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    public int insertWarehousingInSearch(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 修改入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    public int updateWarehousingInSearch(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 删除入库查询
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 结果
-     */
-    public int deleteWarehousingInSearchById(Long warehousingDetailId);
-
-    /**
-     * 批量删除入库查询
-     * 
-     * @param warehousingDetailIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteWarehousingInSearchByIds(String[] warehousingDetailIds);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInSearchService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInSearchService.java
deleted file mode 100644
index 061f8aee..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInSearchService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.storehouse.service;
-
-import java.util.List;
-import com.ruoyi.storehouse.domain.WarehousingInSearch;
-
-/**
- * 入库查询Service接口
- * 
- * @author ruoyi
- * @date 2023-05-05
- */
-public interface IWarehousingInSearchService 
-{
-    /**
-     * 查询入库查询
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 入库查询
-     */
-    public WarehousingInSearch selectWarehousingInSearchById(Long warehousingDetailId);
-
-    /**
-     * 查询入库查询列表
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 入库查询集合
-     */
-    public List<WarehousingInSearch> selectWarehousingInSearchList(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 新增入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    public int insertWarehousingInSearch(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 修改入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    public int updateWarehousingInSearch(WarehousingInSearch warehousingInSearch);
-
-    /**
-     * 批量删除入库查询
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteWarehousingInSearchByIds(String ids);
-
-    /**
-     * 删除入库查询信息
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 结果
-     */
-    public int deleteWarehousingInSearchById(Long warehousingDetailId);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInSearchServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInSearchServiceImpl.java
deleted file mode 100644
index 4ee94e2c..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInSearchServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.storehouse.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.storehouse.mapper.WarehousingInSearchMapper;
-import com.ruoyi.storehouse.domain.WarehousingInSearch;
-import com.ruoyi.storehouse.service.IWarehousingInSearchService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 入库查询Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-05-05
- */
-@Service
-public class WarehousingInSearchServiceImpl implements IWarehousingInSearchService 
-{
-    @Autowired
-    private WarehousingInSearchMapper warehousingInSearchMapper;
-
-    /**
-     * 查询入库查询
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 入库查询
-     */
-    @Override
-    public WarehousingInSearch selectWarehousingInSearchById(Long warehousingDetailId)
-    {
-        return warehousingInSearchMapper.selectWarehousingInSearchById(warehousingDetailId);
-    }
-
-    /**
-     * 查询入库查询列表
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 入库查询
-     */
-    @Override
-    public List<WarehousingInSearch> selectWarehousingInSearchList(WarehousingInSearch warehousingInSearch)
-    {
-        return warehousingInSearchMapper.selectWarehousingInSearchList(warehousingInSearch);
-    }
-
-    /**
-     * 新增入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    @Override
-    public int insertWarehousingInSearch(WarehousingInSearch warehousingInSearch)
-    {
-        return warehousingInSearchMapper.insertWarehousingInSearch(warehousingInSearch);
-    }
-
-    /**
-     * 修改入库查询
-     * 
-     * @param warehousingInSearch 入库查询
-     * @return 结果
-     */
-    @Override
-    public int updateWarehousingInSearch(WarehousingInSearch warehousingInSearch)
-    {
-        return warehousingInSearchMapper.updateWarehousingInSearch(warehousingInSearch);
-    }
-
-    /**
-     * 删除入库查询对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteWarehousingInSearchByIds(String ids)
-    {
-        return warehousingInSearchMapper.deleteWarehousingInSearchByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除入库查询信息
-     * 
-     * @param warehousingDetailId 入库查询ID
-     * @return 结果
-     */
-    @Override
-    public int deleteWarehousingInSearchById(Long warehousingDetailId)
-    {
-        return warehousingInSearchMapper.deleteWarehousingInSearchById(warehousingDetailId);
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInSearchMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInSearchMapper.xml
deleted file mode 100644
index 56b18564..00000000
--- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInSearchMapper.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?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.storehouse.mapper.WarehousingInSearchMapper">
-    
-    <resultMap type="WarehousingInSearch" id="WarehousingInSearchResult">
-        <result property="warehousingDetailId"    column="warehousing_detail_id"    />
-        <result property="warehousingNumber"    column="warehousing_number"    />
-        <result property="materialCode"    column="material_code"    />
-        <result property="materialName"    column="material_name"    />
-        <result property="materialType"    column="material_type"    />
-        <result property="specificationModel"    column="specification_model"    />
-        <result property="typeMachine"    column="type_machine"    />
-        <result property="inventoryUnit"    column="inventory_unit"    />
-        <result property="warehousingQuantity"    column="warehousing_quantity"    />
-        <result property="unitPrice"    column="unit_price"    />
-        <result property="amountMoney"    column="amount_money"    />
-        <result property="description"    column="description"    />
-        <result property="batchNumber"    column="batch_number"    />
-        <result property="manufacturerBatchNumber"    column="manufacturer_batch_number"    />
-        <result property="storageLocation"    column="storage_location"    />
-        <result property="inNoticeNumber"    column="in_notice_number"    />
-        <result property="warehousingCategory"    column="warehousing_category"    />
-        <result property="purchaseOrderNumber"    column="purchase_order_number"    />
-        <result property="contacts"    column="contacts"    />
-        <result property="warehousingDate"    column="warehousing_date"    />
-        <result property="supplierCode"    column="supplier_code"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="documentPreparationPersonnel"    column="document_preparation_personnel"    />
-        <result property="stockNumber"    column="stock_number"    />
-        <result property="stockName"    column="stock_name"    />
-        <result property="stockManager"    column="stock_manager"    />
-        <result property="exportSales"    column="export_sales"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="deliveryMan"    column="delivery_man"    />
-        <result property="returnGoodsNumber"    column="return_goods_number"    />
-        <result property="enterpriseCode"    column="enterprise_code"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="notificationNumber"    column="notification_number"    />
-        <result property="workOrderNumber"    column="work_order_number"    />
-        <result property="deptCode"    column="dept_code"    />
-        <result property="deptName"    column="dept_name"    />
-    </resultMap>
-
-    <sql id="selectWarehousingInSearchVo">
---         select warehousing_detail_id, warehousing_number, material_code, material_name, material_type, specification_model, type_machine, inventory_unit, warehousing_quantity, unit_price, amount_money, description, batch_number, manufacturer_batch_number, storage_location, return_goods_quantity, in_notice_number, warehousing_category, purchase_order_number, contacts, warehousing_date, supplier_code, supplier_name, document_preparation_personnel, stock_number, stock_name, stock_manager, export_sales, remarks, delivery_man, return_goods_number, enterprise_code, enterprise_name, notification_number, work_order_number, dept_code, dept_name from warehousing_in_search
-        SELECT
-            wid.warehousing_detail_id,
-            wid.warehousing_number,
-            wid.material_code,
-            wid.material_name,
-            wid.material_type,
-            wid.specification_model,
-            wid.type_machine,
-            wid.inventory_unit,
-            wid.warehousing_quantity,
-            wid.unit_price,
-            wid.amount_money,
-            wid.description,
-            wid.batch_number,
-            wid.manufacturer_batch_number,
-            wid.storage_location,
-            wii.in_notice_number,
-            wii.warehousing_category,
-            wii.purchase_order_number,
-            wii.contacts,
-            wii.warehousing_date,
-            wii.supplier_code,
-            wii.supplier_name,
-            wii.document_preparation_personnel,
-            wii.stock_number,
-            wii.stock_name,
-            wii.stock_manager,
-            wii.export_sales,
-            wii.remarks,
-            wii.delivery_man,
-            wii.return_goods_number,
-            wii.enterprise_code,
-            wii.enterprise_name,
-            wii.notification_number,
-            wii.work_order_number,
-            wii.dept_code,
-            wii.dept_name
-        FROM
-            warehousing_in_detail AS wid,
-            warehousing_in_info AS wii
-        WHERE
-            wid.warehousing_number = wii.warehousing_number
-    </sql>
-
-    <select id="selectWarehousingInSearchList" parameterType="WarehousingInSearch" resultMap="WarehousingInSearchResult">
-        <include refid="selectWarehousingInSearchVo"/>
-            <if test="warehousingNumber != null  and warehousingNumber != ''"> and wid.warehousing_number like concat('%', #{warehousingNumber}, '%')</if>
-            <if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
-            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
-            <if test="materialType != null  and materialType != ''"> and material_type = #{materialType}</if>
-            <if test="batchNumber != null  and batchNumber != ''"> and batch_number like concat('%', #{batchNumber}, '%')</if>
-            <if test="manufacturerBatchNumber != null  and manufacturerBatchNumber != ''"> and manufacturer_batch_number like concat('%', #{manufacturerBatchNumber}, '%')</if>
-            <if test="inNoticeNumber != null  and inNoticeNumber != ''"> and in_notice_number like concat('%', #{inNoticeNumber}, '%')</if>
-            <if test="warehousingCategory != null  and warehousingCategory != ''"> and warehousing_category = #{warehousingCategory}</if>
-            <if test="purchaseOrderNumber != null  and purchaseOrderNumber != ''"> and purchase_order_number like concat('%', #{purchaseOrderNumber}, '%')</if>
-            <if test="params.beginWarehousingDate != null and params.beginWarehousingDate != '' and params.endWarehousingDate != null and params.endWarehousingDate != ''"> and warehousing_date between #{params.beginWarehousingDate} and #{params.endWarehousingDate}</if>
-            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
-            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="stockNumber != null  and stockNumber != ''"> and stock_number like concat('%', #{stockNumber}, '%')</if>
-            <if test="stockName != null  and stockName != ''"> and stock_name like concat('%', #{stockName}, '%')</if>
-    </select>
-    
-    <select id="selectWarehousingInSearchById" parameterType="Long" resultMap="WarehousingInSearchResult">
-        <include refid="selectWarehousingInSearchVo"/>
-        where warehousing_detail_id = #{warehousingDetailId}
-    </select>
-        
-    <insert id="insertWarehousingInSearch" parameterType="WarehousingInSearch" useGeneratedKeys="true" keyProperty="warehousingDetailId">
-        insert into warehousing_in_search
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="warehousingNumber != null">warehousing_number,</if>
-            <if test="materialCode != null">material_code,</if>
-            <if test="materialName != null">material_name,</if>
-            <if test="materialType != null">material_type,</if>
-            <if test="specificationModel != null">specification_model,</if>
-            <if test="typeMachine != null">type_machine,</if>
-            <if test="inventoryUnit != null">inventory_unit,</if>
-            <if test="warehousingQuantity != null">warehousing_quantity,</if>
-            <if test="unitPrice != null">unit_price,</if>
-            <if test="amountMoney != null">amount_money,</if>
-            <if test="description != null">description,</if>
-            <if test="batchNumber != null">batch_number,</if>
-            <if test="manufacturerBatchNumber != null">manufacturer_batch_number,</if>
-            <if test="storageLocation != null">storage_location,</if>
-            <if test="inNoticeNumber != null">in_notice_number,</if>
-            <if test="warehousingCategory != null">warehousing_category,</if>
-            <if test="purchaseOrderNumber != null">purchase_order_number,</if>
-            <if test="contacts != null">contacts,</if>
-            <if test="warehousingDate != null">warehousing_date,</if>
-            <if test="supplierCode != null">supplier_code,</if>
-            <if test="supplierName != null">supplier_name,</if>
-            <if test="documentPreparationPersonnel != null">document_preparation_personnel,</if>
-            <if test="stockNumber != null">stock_number,</if>
-            <if test="stockName != null">stock_name,</if>
-            <if test="stockManager != null">stock_manager,</if>
-            <if test="exportSales != null">export_sales,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="deliveryMan != null">delivery_man,</if>
-            <if test="returnGoodsNumber != null">return_goods_number,</if>
-            <if test="enterpriseCode != null">enterprise_code,</if>
-            <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="notificationNumber != null">notification_number,</if>
-            <if test="workOrderNumber != null">work_order_number,</if>
-            <if test="deptCode != null">dept_code,</if>
-            <if test="deptName != null">dept_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="warehousingNumber != null">#{warehousingNumber},</if>
-            <if test="materialCode != null">#{materialCode},</if>
-            <if test="materialName != null">#{materialName},</if>
-            <if test="materialType != null">#{materialType},</if>
-            <if test="specificationModel != null">#{specificationModel},</if>
-            <if test="typeMachine != null">#{typeMachine},</if>
-            <if test="inventoryUnit != null">#{inventoryUnit},</if>
-            <if test="qualifiedQuantity != null">#{qualifiedQuantity},</if>
-            <if test="unitPrice != null">#{unitPrice},</if>
-            <if test="amountMoney != null">#{amountMoney},</if>
-            <if test="description != null">#{description},</if>
-            <if test="batchNumber != null">#{batchNumber},</if>
-            <if test="manufacturerBatchNumber != null">#{manufacturerBatchNumber},</if>
-            <if test="storageLocation != null">#{storageLocation},</if>
-            <if test="inNoticeNumber != null">#{inNoticeNumber},</if>
-            <if test="warehousingCategory != null">#{warehousingCategory},</if>
-            <if test="purchaseOrderNumber != null">#{purchaseOrderNumber},</if>
-            <if test="contacts != null">#{contacts},</if>
-            <if test="warehousingDate != null">#{warehousingDate},</if>
-            <if test="supplierCode != null">#{supplierCode},</if>
-            <if test="supplierName != null">#{supplierName},</if>
-            <if test="documentPreparationPersonnel != null">#{documentPreparationPersonnel},</if>
-            <if test="stockNumber != null">#{stockNumber},</if>
-            <if test="stockName != null">#{stockName},</if>
-            <if test="stockManager != null">#{stockManager},</if>
-            <if test="exportSales != null">#{exportSales},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="deliveryMan != null">#{deliveryMan},</if>
-            <if test="returnGoodsNumber != null">#{returnGoodsNumber},</if>
-            <if test="enterpriseCode != null">#{enterpriseCode},</if>
-            <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="notificationNumber != null">#{notificationNumber},</if>
-            <if test="workOrderNumber != null">#{workOrderNumber},</if>
-            <if test="deptCode != null">#{deptCode},</if>
-            <if test="deptName != null">#{deptName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateWarehousingInSearch" parameterType="WarehousingInSearch">
-        update warehousing_in_search
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="warehousingNumber != null">warehousing_number = #{warehousingNumber},</if>
-            <if test="materialCode != null">material_code = #{materialCode},</if>
-            <if test="materialName != null">material_name = #{materialName},</if>
-            <if test="materialType != null">material_type = #{materialType},</if>
-            <if test="specificationModel != null">specification_model = #{specificationModel},</if>
-            <if test="typeMachine != null">type_machine = #{typeMachine},</if>
-            <if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
-            <if test="qualifiedQuantity != null">warehousing_quantity = #{qualifiedQuantity},</if>
-            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
-            <if test="amountMoney != null">amount_money = #{amountMoney},</if>
-            <if test="description != null">description = #{description},</if>
-            <if test="batchNumber != null">batch_number = #{batchNumber},</if>
-            <if test="manufacturerBatchNumber != null">manufacturer_batch_number = #{manufacturerBatchNumber},</if>
-            <if test="storageLocation != null">storage_location = #{storageLocation},</if>
-            <if test="inNoticeNumber != null">in_notice_number = #{inNoticeNumber},</if>
-            <if test="warehousingCategory != null">warehousing_category = #{warehousingCategory},</if>
-            <if test="purchaseOrderNumber != null">purchase_order_number = #{purchaseOrderNumber},</if>
-            <if test="contacts != null">contacts = #{contacts},</if>
-            <if test="warehousingDate != null">warehousing_date = #{warehousingDate},</if>
-            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
-            <if test="documentPreparationPersonnel != null">document_preparation_personnel = #{documentPreparationPersonnel},</if>
-            <if test="stockNumber != null">stock_number = #{stockNumber},</if>
-            <if test="stockName != null">stock_name = #{stockName},</if>
-            <if test="stockManager != null">stock_manager = #{stockManager},</if>
-            <if test="exportSales != null">export_sales = #{exportSales},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="deliveryMan != null">delivery_man = #{deliveryMan},</if>
-            <if test="returnGoodsNumber != null">return_goods_number = #{returnGoodsNumber},</if>
-            <if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
-            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
-            <if test="notificationNumber != null">notification_number = #{notificationNumber},</if>
-            <if test="workOrderNumber != null">work_order_number = #{workOrderNumber},</if>
-            <if test="deptCode != null">dept_code = #{deptCode},</if>
-            <if test="deptName != null">dept_name = #{deptName},</if>
-        </trim>
-        where warehousing_detail_id = #{warehousingDetailId}
-    </update>
-
-    <delete id="deleteWarehousingInSearchById" parameterType="Long">
-        delete from warehousing_in_search where warehousing_detail_id = #{warehousingDetailId}
-    </delete>
-
-    <delete id="deleteWarehousingInSearchByIds" parameterType="String">
-        delete from warehousing_in_search where warehousing_detail_id in 
-        <foreach item="warehousingDetailId" collection="array" open="(" separator="," close=")">
-            #{warehousingDetailId}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/add.html
deleted file mode 100644
index eb420c47..00000000
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/add.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!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-warehousingInSearch-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">入库单号：</label>
-                <div class="col-sm-8">
-                    <input name="warehousingNumber" 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="materialCode" 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">
-                    <select name="materialType" class="form-control m-b" th:with="type=${@dict.getType('ck_meterialt_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="specificationModel" 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="typeMachine" 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="inventoryUnit" 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="warehousingQuantity" 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="unitPrice" 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="amountMoney" 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="description" 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="batchNumber" 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="manufacturerBatchNumber" 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="storageLocation" 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="inNoticeNumber" 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="warehousingCategory" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
-                        <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="purchaseOrderNumber" 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="contacts" 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="warehousingDate" 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="supplierCode" 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="supplierName" 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="documentPreparationPersonnel" 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="stockNumber" 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="stockName" 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="stockManager" 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="exportSales" 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="remarks" 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="deliveryMan" 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="returnGoodsNumber" 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="enterpriseCode" 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="enterpriseName" 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="notificationNumber" 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="workOrderNumber" 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="deptCode" 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="deptName" 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 + "storehouse/warehousingInSearch"
-        $("#form-warehousingInSearch-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-warehousingInSearch-add').serialize());
-            }
-        }
-
-        $("input[name='warehousingDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/edit.html
deleted file mode 100644
index b963e099..00000000
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/edit.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!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-warehousingInSearch-edit" th:object="${warehousingInSearch}">
-            <input name="warehousingDetailId" th:field="*{warehousingDetailId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">入库单号：</label>
-                <div class="col-sm-8">
-                    <input name="warehousingNumber" th:field="*{warehousingNumber}" 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="materialCode" th:field="*{materialCode}" 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">
-                    <select name="materialType" class="form-control m-b" th:with="type=${@dict.getType('ck_meterialt_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{materialType}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">规格型号：</label>
-                <div class="col-sm-8">
-                    <input name="specificationModel" th:field="*{specificationModel}" 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="typeMachine" th:field="*{typeMachine}" 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="inventoryUnit" th:field="*{inventoryUnit}" 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="warehousingQuantity" th:field="*{warehousingQuantity}" 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="unitPrice" th:field="*{unitPrice}" 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="amountMoney" th:field="*{amountMoney}" 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="description" th:field="*{description}" 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="batchNumber" th:field="*{batchNumber}" 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="manufacturerBatchNumber" th:field="*{manufacturerBatchNumber}" 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="storageLocation" th:field="*{storageLocation}" 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="inNoticeNumber" th:field="*{inNoticeNumber}" 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="warehousingCategory" class="form-control m-b" th:with="type=${@dict.getType('warehousing_category')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehousingCategory}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">采购订单号：</label>
-                <div class="col-sm-8">
-                    <input name="purchaseOrderNumber" th:field="*{purchaseOrderNumber}" 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="contacts" th:field="*{contacts}" 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="warehousingDate" th:value="${#dates.format(warehousingInSearch.warehousingDate, '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="supplierCode" th:field="*{supplierCode}" 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="supplierName" th:field="*{supplierName}" 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="documentPreparationPersonnel" th:field="*{documentPreparationPersonnel}" 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="stockNumber" th:field="*{stockNumber}" 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="stockName" th:field="*{stockName}" 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="stockManager" th:field="*{stockManager}" 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="exportSales" th:field="*{exportSales}" 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="remarks" th:field="*{remarks}" 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="deliveryMan" th:field="*{deliveryMan}" 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="returnGoodsNumber" th:field="*{returnGoodsNumber}" 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="enterpriseCode" th:field="*{enterpriseCode}" 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="enterpriseName" th:field="*{enterpriseName}" 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="notificationNumber" th:field="*{notificationNumber}" 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="workOrderNumber" th:field="*{workOrderNumber}" 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="deptCode" th:field="*{deptCode}" 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="deptName" th:field="*{deptName}" 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 + "storehouse/warehousingInSearch";
-        $("#form-warehousingInSearch-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-warehousingInSearch-edit').serialize());
-            }
-        }
-
-        $("input[name='warehousingDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/warehousingInSearch.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/warehousingInSearch.html
deleted file mode 100644
index 7f6b2cea..00000000
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSearch/warehousingInSearch.html
+++ /dev/null
@@ -1,311 +0,0 @@
-<!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="warehousingNumber"/>
-                            </li>
-                            <li>
-                                <label>物料代码：</label>
-                                <input type="text" name="materialCode"/>
-                            </li>
-                            <li>
-                                <label>物料名称：</label>
-                                <input type="text" name="materialName"/>
-                            </li>
-                            <li>
-                                <label>物料类型：</label>
-                                <select name="materialType" th:with="type=${@dict.getType('ck_meterialt_type')}">
-                                    <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="batchNumber"/>
-                            </li>
-                            <li>
-                                <label>厂商批号：</label>
-                                <input type="text" name="manufacturerBatchNumber"/>
-                            </li>
-                            <li>
-                                <label>暂收单号：</label>
-                                <input type="text" name="inNoticeNumber"/>
-                            </li>
-                            <li>
-                                <label>入库类型：</label>
-                                <select name="warehousingCategory" th:with="type=${@dict.getType('warehousing_category')}">
-                                    <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="purchaseOrderNumber"/>
-                            </li>
-                            <li class="select-time">
-                                <label>入库日期：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始日期" name="params[beginWarehousingDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束日期" name="params[endWarehousingDate]"/>
-                            </li>
-                            <li>
-                                <label>供应商代码：</label>
-                                <input type="text" name="supplierCode"/>
-                            </li>
-                            <li>
-                                <label>供应商名称：</label>
-                                <input type="text" name="supplierName"/>
-                            </li>
-                            <li>
-                                <label>仓库号：</label>
-                                <input type="text" name="stockNumber"/>
-                            </li>
-                            <li>
-                                <label>仓库名称：</label>
-                                <input type="text" name="stockName"/>
-                            </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="storehouse:warehousingInSearch:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="storehouse:warehousingInSearch:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="storehouse:warehousingInSearch:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="storehouse:warehousingInSearch:export">-->
-<!--                    <i class="fa fa-download"></i> 导出-->
-<!--                </a>-->
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table" style="white-space: nowrap"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('storehouse:warehousingInSearch:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('storehouse:warehousingInSearch:remove')}]];
-        var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
-        var warehousingCategoryDatas = [[${@dict.getType('warehousing_category')}]];
-        var prefix = ctx + "storehouse/warehousingInSearch";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "入库查询",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'warehousingDetailId',
-                    title: '入库物料id',
-                    visible: false
-                },
-                {
-                    field: 'warehousingNumber',
-                    title: '入库单号'
-                },
-                {
-                    field: 'materialCode',
-                    title: '物料代码'
-                },
-                {
-                    field: 'materialName',
-                    title: '物料名称'
-                },
-                {
-                    field: 'materialType',
-                    title: '物料类型',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(materialTypeDatas, value);
-                    }
-                },
-                {
-                    field: 'specificationModel',
-                    title: '规格型号'
-                },
-                {
-                    field: 'typeMachine',
-                    title: '机种'
-                },
-                {
-                    field: 'inventoryUnit',
-                    title: '单位'
-                },
-                {
-                    field: 'warehousingQuantity',
-                    title: '数量'
-                },
-                {
-                    field: 'unitPrice',
-                    title: '单价'
-                },
-                {
-                    field: 'amountMoney',
-                    title: '金额'
-                },
-                {
-                    field: 'description',
-                    title: '说明',
-                    visible: false
-                },
-                {
-                    field: 'batchNumber',
-                    title: '批号'
-                },
-                {
-                    field: 'manufacturerBatchNumber',
-                    title: '厂商批号'
-                },
-                {
-                    field: 'storageLocation',
-                    title: '存放地址',
-                    visible: false
-                },
-                {
-                    field: 'inNoticeNumber',
-                    title: '暂收单号',
-                    visible: false
-                },
-                {
-                    field: 'warehousingCategory',
-                    title: '入库类型',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(warehousingCategoryDatas, value);
-                    }
-                },
-                {
-                    field: 'purchaseOrderNumber',
-                    title: '采购订单号'
-                },
-                {
-                    field: 'contacts',
-                    title: '联系人',
-                    visible: false
-                },
-                {
-                    field: 'warehousingDate',
-                    title: '入库日期'
-                },
-                {
-                    field: 'supplierCode',
-                    title: '供应商代码',
-                    visible: false
-                },
-                {
-                    field: 'supplierName',
-                    title: '供应商名称',
-                    visible: false
-                },
-                {
-                    field: 'documentPreparationPersonnel',
-                    title: '制单人员',
-                    visible: false
-                },
-                {
-                    field: 'stockNumber',
-                    title: '仓库号',
-                    visible: false
-                },
-                {
-                    field: 'stockName',
-                    title: '仓库名称',
-                    visible: false
-                },
-                {
-                    field: 'stockManager',
-                    title: '仓库管理员',
-                    visible: false
-                },
-                {
-                    field: 'exportSales',
-                    title: '内外销',
-                    visible: false
-                },
-                {
-                    field: 'remarks',
-                    title: '备注',
-                    visible: false
-                },
-                {
-                    field: 'deliveryMan',
-                    title: '送货人',
-                    visible: false
-                },
-                {
-                    field: 'returnGoodsNumber',
-                    title: '退货单号',
-                    visible: false
-                },
-                {
-                    field: 'enterpriseCode',
-                    title: '企业代码',
-                    visible: false
-                },
-                {
-                    field: 'enterpriseName',
-                    title: '企业名称',
-                    visible: false
-                },
-                {
-                    field: 'notificationNumber',
-                    title: '入库通知单号',
-                    visible: false
-                },
-                {
-                    field: 'workOrderNumber',
-                    title: '工单号',
-                    visible: false
-                },
-                {
-                    field: 'deptCode',
-                    title: '部门编号',
-                    visible: false
-                },
-                {
-                    field: 'deptName',
-                    title: '部门名称',
-                    visible: false
-                }]
-                // ,
-                // {
-                //     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.warehousingDetailId + '\')"><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.warehousingDetailId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                //         return actions.join('');
-                //     }
-                // }
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file