Browse Source

[feat]仓库管理:

库存查询
新增库存查询Controller
新增库存查询Service
新增库存查询ServiceImpl
新增库存查询inventoryInquiry.html
完成数据填充,页面展示,条件查询操作
dev
liuxiaoxu 5 months ago
parent
commit
3030bd4eae
  1. 151
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java
  2. 280
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java
  3. 77
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java
  4. 75
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java
  5. 126
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java
  6. 151
      ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml
  7. 135
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html
  8. 139
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html
  9. 170
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html

151
ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.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.WarehouseInventoryInquiry;
import com.ruoyi.warehouse.service.IWarehouseInventoryInquiryService;
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-06-06
*/
@Controller
@RequestMapping("/warehouse/inventoryInquiry")
public class WarehouseInventoryInquiryController extends BaseController
{
private String prefix = "warehouse/inventoryInquiry";
@Autowired
private IWarehouseInventoryInquiryService warehouseInventoryInquiryService;
@RequiresPermissions("warehouse:inventoryInquiry:view")
@GetMapping()
public String inventoryInquiry()
{
return prefix + "/inventoryInquiry";
}
/**
* 查询仓库库存查询列表
*/
@RequiresPermissions("warehouse:inventoryInquiry:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
startPage();
List<WarehouseInventoryInquiry> list = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryList(warehouseInventoryInquiry);
return getDataTable(list);
}
/**
* 导出仓库库存查询列表
*/
@RequiresPermissions("warehouse:inventoryInquiry:export")
@Log(title = "仓库库存查询", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
List<WarehouseInventoryInquiry> list = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryList(warehouseInventoryInquiry);
ExcelUtil<WarehouseInventoryInquiry> util = new ExcelUtil<WarehouseInventoryInquiry>(WarehouseInventoryInquiry.class);
return util.exportExcel(list, "仓库库存查询数据");
}
/**
* 新增仓库库存查询
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存仓库库存查询
*/
@RequiresPermissions("warehouse:inventoryInquiry:add")
@Log(title = "仓库库存查询", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
return toAjax(warehouseInventoryInquiryService.insertWarehouseInventoryInquiry(warehouseInventoryInquiry));
}
/**
* 修改仓库库存查询
*/
@GetMapping("/edit/{inventoryInquiryId}")
public String edit(@PathVariable("inventoryInquiryId") Long inventoryInquiryId, ModelMap mmap)
{
WarehouseInventoryInquiry warehouseInventoryInquiry = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryById(inventoryInquiryId);
mmap.put("warehouseInventoryInquiry", warehouseInventoryInquiry);
return prefix + "/edit";
}
/**
* 修改保存仓库库存查询
*/
@RequiresPermissions("warehouse:inventoryInquiry:edit")
@Log(title = "仓库库存查询", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
return toAjax(warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(warehouseInventoryInquiry));
}
/**
* 删除仓库库存查询
*/
@RequiresPermissions("warehouse:inventoryInquiry:remove")
@Log(title = "仓库库存查询", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(warehouseInventoryInquiryService.deleteWarehouseInventoryInquiryByIds(ids));
}
/**
* 作废仓库库存查询
*/
@RequiresPermissions("warehouse:inventoryInquiry:cancel")
@Log(title = "仓库库存查询", businessType = BusinessType.CANCEL)
@GetMapping( "/cancel/{id}")
@ResponseBody
public AjaxResult cancel(@PathVariable("id") Long id){
return toAjax(warehouseInventoryInquiryService.cancelWarehouseInventoryInquiryById(id));
}
/**
* 恢复仓库库存查询
*/
@RequiresPermissions("warehouse:inventoryInquiry:restore")
@Log(title = "仓库库存查询", businessType = BusinessType.RESTORE)
@GetMapping( "/restore/{id}")
@ResponseBody
public AjaxResult restore(@PathVariable("id")Long id)
{
return toAjax(warehouseInventoryInquiryService.restoreWarehouseInventoryInquiryById(id));
}
}

280
ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java

@ -0,0 +1,280 @@
package com.ruoyi.warehouse.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;
/**
* 仓库库存查询对象 warehouse_inventory_inquiry
*
* @author 刘晓旭
* @date 2024-06-06
*/
public class WarehouseInventoryInquiry extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 库存查询id */
private Long inventoryInquiryId;
/** 料号 */
@Excel(name = "料号")
private String materialNo;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 物料类型 */
@Excel(name = "物料类型")
private String materialType;
/** 物料图片地址 */
@Excel(name = "物料图片地址")
private String materialPhotourl;
/** 物料品牌 */
@Excel(name = "物料品牌")
private String materialBrand;
/** 物料单位 */
@Excel(name = "物料单位")
private String materialUnit;
/** 物料描述 */
@Excel(name = "物料描述")
private String materialDescribe;
/** 物料加工方式 */
@Excel(name = "物料加工方式")
private String materialProcessMethod;
/** 物料型号 */
@Excel(name = "物料型号")
private String materialModel;
/** 物料规格 */
@Excel(name = "物料规格")
private String materialSpecification;
/** 物料历史总数量 */
@Excel(name = "物料历史总数量")
private Integer historicalTotal;
/** 可用库存数 */
@Excel(name = "可用库存数")
private Integer availableStockNum;
/** 物料归属可用库存数 */
@Excel(name = "物料归属可用库存数")
private Integer attributionAvailableStockNum;
/** 物料无归属可用库存数 */
@Excel(name = "物料无归属可用库存数")
private Integer noattributionAvailableStockNum;
/** 物料使用数 */
@Excel(name = "物料使用数")
private Integer useNum;
/** 物料报损数 */
@Excel(name = "物料报损数")
private Integer reportDamageNum;
/** 物料使用状态(0 使用中、1 已作废) */
@Excel(name = "物料使用状态", readConverterExp = "0=,使=用中、1,已=作废")
private String materialUseStatus;
public void setInventoryInquiryId(Long inventoryInquiryId)
{
this.inventoryInquiryId = inventoryInquiryId;
}
public Long getInventoryInquiryId()
{
return inventoryInquiryId;
}
public void setMaterialNo(String materialNo)
{
this.materialNo = materialNo;
}
public String getMaterialNo()
{
return materialNo;
}
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
{
return materialName;
}
public void setMaterialType(String materialType)
{
this.materialType = materialType;
}
public String getMaterialType()
{
return materialType;
}
public void setMaterialPhotourl(String materialPhotourl)
{
this.materialPhotourl = materialPhotourl;
}
public String getMaterialPhotourl()
{
return materialPhotourl;
}
public void setMaterialBrand(String materialBrand)
{
this.materialBrand = materialBrand;
}
public String getMaterialBrand()
{
return materialBrand;
}
public void setMaterialUnit(String materialUnit)
{
this.materialUnit = materialUnit;
}
public String getMaterialUnit()
{
return materialUnit;
}
public void setMaterialDescribe(String materialDescribe)
{
this.materialDescribe = materialDescribe;
}
public String getMaterialDescribe()
{
return materialDescribe;
}
public void setMaterialProcessMethod(String materialProcessMethod)
{
this.materialProcessMethod = materialProcessMethod;
}
public String getMaterialProcessMethod()
{
return materialProcessMethod;
}
public void setMaterialModel(String materialModel)
{
this.materialModel = materialModel;
}
public String getMaterialModel()
{
return materialModel;
}
public void setMaterialSpecification(String materialSpecification)
{
this.materialSpecification = materialSpecification;
}
public String getMaterialSpecification()
{
return materialSpecification;
}
public void setHistoricalTotal(Integer historicalTotal)
{
this.historicalTotal = historicalTotal;
}
public Integer getHistoricalTotal()
{
return historicalTotal;
}
public void setAvailableStockNum(Integer availableStockNum)
{
this.availableStockNum = availableStockNum;
}
public Integer getAvailableStockNum()
{
return availableStockNum;
}
public void setAttributionAvailableStockNum(Integer attributionAvailableStockNum)
{
this.attributionAvailableStockNum = attributionAvailableStockNum;
}
public Integer getAttributionAvailableStockNum()
{
return attributionAvailableStockNum;
}
public void setNoattributionAvailableStockNum(Integer noattributionAvailableStockNum)
{
this.noattributionAvailableStockNum = noattributionAvailableStockNum;
}
public Integer getNoattributionAvailableStockNum()
{
return noattributionAvailableStockNum;
}
public void setUseNum(Integer useNum)
{
this.useNum = useNum;
}
public Integer getUseNum()
{
return useNum;
}
public void setReportDamageNum(Integer reportDamageNum)
{
this.reportDamageNum = reportDamageNum;
}
public Integer getReportDamageNum()
{
return reportDamageNum;
}
public void setMaterialUseStatus(String materialUseStatus)
{
this.materialUseStatus = materialUseStatus;
}
public String getMaterialUseStatus()
{
return materialUseStatus;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("inventoryInquiryId", getInventoryInquiryId())
.append("materialNo", getMaterialNo())
.append("materialName", getMaterialName())
.append("materialType", getMaterialType())
.append("materialPhotourl", getMaterialPhotourl())
.append("materialBrand", getMaterialBrand())
.append("materialUnit", getMaterialUnit())
.append("materialDescribe", getMaterialDescribe())
.append("materialProcessMethod", getMaterialProcessMethod())
.append("materialModel", getMaterialModel())
.append("materialSpecification", getMaterialSpecification())
.append("historicalTotal", getHistoricalTotal())
.append("availableStockNum", getAvailableStockNum())
.append("attributionAvailableStockNum", getAttributionAvailableStockNum())
.append("noattributionAvailableStockNum", getNoattributionAvailableStockNum())
.append("useNum", getUseNum())
.append("reportDamageNum", getReportDamageNum())
.append("materialUseStatus", getMaterialUseStatus())
.append("remark", getRemark())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

77
ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java

@ -0,0 +1,77 @@
package com.ruoyi.warehouse.mapper;
import java.util.List;
import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry;
/**
* 仓库库存查询Mapper接口
*
* @author 刘晓旭
* @date 2024-06-06
*/
public interface WarehouseInventoryInquiryMapper
{
/**
* 查询仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 仓库库存查询
*/
public WarehouseInventoryInquiry selectWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 查询仓库库存查询列表
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 仓库库存查询集合
*/
public List<WarehouseInventoryInquiry> selectWarehouseInventoryInquiryList(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 新增仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
public int insertWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 修改仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
public int updateWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 删除仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
public int deleteWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 批量删除仓库库存查询
*
* @param inventoryInquiryIds 需要删除的数据ID
* @return 结果
*/
public int deleteWarehouseInventoryInquiryByIds(String[] inventoryInquiryIds);
/**
* 作废仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
public int cancelWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 恢复仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
public int restoreWarehouseInventoryInquiryById(Long inventoryInquiryId);
}

75
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java

@ -0,0 +1,75 @@
package com.ruoyi.warehouse.service;
import java.util.List;
import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry;
/**
* 仓库库存查询Service接口
*
* @author 刘晓旭
* @date 2024-06-06
*/
public interface IWarehouseInventoryInquiryService
{
/**
* 查询仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 仓库库存查询
*/
public WarehouseInventoryInquiry selectWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 查询仓库库存查询列表
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 仓库库存查询集合
*/
public List<WarehouseInventoryInquiry> selectWarehouseInventoryInquiryList(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 新增仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
public int insertWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 修改仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
public int updateWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry);
/**
* 批量删除仓库库存查询
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteWarehouseInventoryInquiryByIds(String ids);
/**
* 删除仓库库存查询信息
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
public int deleteWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 作废仓库库存查询
* @param inventoryInquiryId 仓库库存查询ID
* @return
*/
int cancelWarehouseInventoryInquiryById(Long inventoryInquiryId);
/**
* 恢复仓库库存查询
* @param inventoryInquiryId 仓库库存查询ID
* @return
*/
int restoreWarehouseInventoryInquiryById(Long inventoryInquiryId);
}

126
ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.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.WarehouseInventoryInquiryMapper;
import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry;
import com.ruoyi.warehouse.service.IWarehouseInventoryInquiryService;
import com.ruoyi.common.core.text.Convert;
/**
* 仓库库存查询Service业务层处理
*
* @author 刘晓旭
* @date 2024-06-06
*/
@Service
public class WarehouseInventoryInquiryServiceImpl implements IWarehouseInventoryInquiryService
{
@Autowired
private WarehouseInventoryInquiryMapper warehouseInventoryInquiryMapper;
/**
* 查询仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 仓库库存查询
*/
@Override
public WarehouseInventoryInquiry selectWarehouseInventoryInquiryById(Long inventoryInquiryId)
{
return warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryById(inventoryInquiryId);
}
/**
* 查询仓库库存查询列表
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 仓库库存查询
*/
@Override
public List<WarehouseInventoryInquiry> selectWarehouseInventoryInquiryList(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
return warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryList(warehouseInventoryInquiry);
}
/**
* 新增仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
@Override
public int insertWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
warehouseInventoryInquiry.setCreateTime(DateUtils.getNowDate());
String loginName = ShiroUtils.getLoginName();
warehouseInventoryInquiry.setCreateBy(loginName);
return warehouseInventoryInquiryMapper.insertWarehouseInventoryInquiry(warehouseInventoryInquiry);
}
/**
* 修改仓库库存查询
*
* @param warehouseInventoryInquiry 仓库库存查询
* @return 结果
*/
@Override
public int updateWarehouseInventoryInquiry(WarehouseInventoryInquiry warehouseInventoryInquiry)
{
String loginName = ShiroUtils.getLoginName();
warehouseInventoryInquiry.setUpdateBy(loginName);
warehouseInventoryInquiry.setUpdateTime(DateUtils.getNowDate());
return warehouseInventoryInquiryMapper.updateWarehouseInventoryInquiry(warehouseInventoryInquiry);
}
/**
* 删除仓库库存查询对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteWarehouseInventoryInquiryByIds(String ids)
{
return warehouseInventoryInquiryMapper.deleteWarehouseInventoryInquiryByIds(Convert.toStrArray(ids));
}
/**
* 删除仓库库存查询信息
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
@Override
public int deleteWarehouseInventoryInquiryById(Long inventoryInquiryId)
{
return warehouseInventoryInquiryMapper.deleteWarehouseInventoryInquiryById(inventoryInquiryId);
}
/**
* 作废仓库库存查询
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
@Override
public int cancelWarehouseInventoryInquiryById(Long inventoryInquiryId)
{
return warehouseInventoryInquiryMapper.cancelWarehouseInventoryInquiryById(inventoryInquiryId);
}
/**
* 恢复仓库库存查询信息
*
* @param inventoryInquiryId 仓库库存查询ID
* @return 结果
*/
@Override
public int restoreWarehouseInventoryInquiryById(Long inventoryInquiryId)
{
return warehouseInventoryInquiryMapper.restoreWarehouseInventoryInquiryById(inventoryInquiryId);
}
}

151
ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml

@ -0,0 +1,151 @@
<?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.WarehouseInventoryInquiryMapper">
<resultMap type="WarehouseInventoryInquiry" id="WarehouseInventoryInquiryResult">
<result property="inventoryInquiryId" column="inventory_inquiry_id" />
<result property="materialNo" column="material_no" />
<result property="materialName" column="material_name" />
<result property="materialType" column="material_type" />
<result property="materialPhotourl" column="material_photoUrl" />
<result property="materialBrand" column="material_brand" />
<result property="materialUnit" column="material_unit" />
<result property="materialDescribe" column="material_describe" />
<result property="materialProcessMethod" column="material_process_method" />
<result property="materialModel" column="material_model" />
<result property="materialSpecification" column="material_specification" />
<result property="historicalTotal" column="historical_total" />
<result property="availableStockNum" column="available_stock_num" />
<result property="attributionAvailableStockNum" column="attribution_available_stock_num" />
<result property="noattributionAvailableStockNum" column="noattribution_available_stock_num" />
<result property="useNum" column="use_num" />
<result property="reportDamageNum" column="report_damage_num" />
<result property="materialUseStatus" column="material_use_status" />
<result property="remark" column="remark" />
<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="selectWarehouseInventoryInquiryVo">
select inventory_inquiry_id, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, historical_total, available_stock_num, attribution_available_stock_num, noattribution_available_stock_num, use_num, report_damage_num, material_use_status, remark, create_time, create_by, update_by, update_time from warehouse_inventory_inquiry
</sql>
<select id="selectWarehouseInventoryInquiryList" parameterType="WarehouseInventoryInquiry" resultMap="WarehouseInventoryInquiryResult">
<include refid="selectWarehouseInventoryInquiryVo"/>
<where>
<if test="materialNo != null and materialNo != ''"> and material_no = #{materialNo}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</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="selectWarehouseInventoryInquiryById" parameterType="Long" resultMap="WarehouseInventoryInquiryResult">
<include refid="selectWarehouseInventoryInquiryVo"/>
where inventory_inquiry_id = #{inventoryInquiryId}
</select>
<insert id="insertWarehouseInventoryInquiry" parameterType="WarehouseInventoryInquiry" useGeneratedKeys="true" keyProperty="inventoryInquiryId">
insert into warehouse_inventory_inquiry
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="materialNo != null">material_no,</if>
<if test="materialName != null">material_name,</if>
<if test="materialType != null">material_type,</if>
<if test="materialPhotourl != null">material_photoUrl,</if>
<if test="materialBrand != null">material_brand,</if>
<if test="materialUnit != null">material_unit,</if>
<if test="materialDescribe != null">material_describe,</if>
<if test="materialProcessMethod != null">material_process_method,</if>
<if test="materialModel != null">material_model,</if>
<if test="materialSpecification != null">material_specification,</if>
<if test="historicalTotal != null">historical_total,</if>
<if test="availableStockNum != null">available_stock_num,</if>
<if test="attributionAvailableStockNum != null">attribution_available_stock_num,</if>
<if test="noattributionAvailableStockNum != null">noattribution_available_stock_num,</if>
<if test="useNum != null">use_num,</if>
<if test="reportDamageNum != null">report_damage_num,</if>
<if test="materialUseStatus != null">material_use_status,</if>
<if test="remark != null">remark,</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="materialNo != null">#{materialNo},</if>
<if test="materialName != null">#{materialName},</if>
<if test="materialType != null">#{materialType},</if>
<if test="materialPhotourl != null">#{materialPhotourl},</if>
<if test="materialBrand != null">#{materialBrand},</if>
<if test="materialUnit != null">#{materialUnit},</if>
<if test="materialDescribe != null">#{materialDescribe},</if>
<if test="materialProcessMethod != null">#{materialProcessMethod},</if>
<if test="materialModel != null">#{materialModel},</if>
<if test="materialSpecification != null">#{materialSpecification},</if>
<if test="historicalTotal != null">#{historicalTotal},</if>
<if test="availableStockNum != null">#{availableStockNum},</if>
<if test="attributionAvailableStockNum != null">#{attributionAvailableStockNum},</if>
<if test="noattributionAvailableStockNum != null">#{noattributionAvailableStockNum},</if>
<if test="useNum != null">#{useNum},</if>
<if test="reportDamageNum != null">#{reportDamageNum},</if>
<if test="materialUseStatus != null">#{materialUseStatus},</if>
<if test="remark != null">#{remark},</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="updateWarehouseInventoryInquiry" parameterType="WarehouseInventoryInquiry">
update warehouse_inventory_inquiry
<trim prefix="SET" suffixOverrides=",">
<if test="materialNo != null">material_no = #{materialNo},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="materialType != null">material_type = #{materialType},</if>
<if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if>
<if test="materialBrand != null">material_brand = #{materialBrand},</if>
<if test="materialUnit != null">material_unit = #{materialUnit},</if>
<if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
<if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
<if test="materialModel != null">material_model = #{materialModel},</if>
<if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
<if test="historicalTotal != null">historical_total = #{historicalTotal},</if>
<if test="availableStockNum != null">available_stock_num = #{availableStockNum},</if>
<if test="attributionAvailableStockNum != null">attribution_available_stock_num = #{attributionAvailableStockNum},</if>
<if test="noattributionAvailableStockNum != null">noattribution_available_stock_num = #{noattributionAvailableStockNum},</if>
<if test="useNum != null">use_num = #{useNum},</if>
<if test="reportDamageNum != null">report_damage_num = #{reportDamageNum},</if>
<if test="materialUseStatus != null">material_use_status = #{materialUseStatus},</if>
<if test="remark != null">remark = #{remark},</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 inventory_inquiry_id = #{inventoryInquiryId}
</update>
<delete id="deleteWarehouseInventoryInquiryById" parameterType="Long">
delete from warehouse_inventory_inquiry where inventory_inquiry_id = #{inventoryInquiryId}
</delete>
<delete id="deleteWarehouseInventoryInquiryByIds" parameterType="String">
delete from warehouse_inventory_inquiry where inventory_inquiry_id in
<foreach item="inventoryInquiryId" collection="array" open="(" separator="," close=")">
#{inventoryInquiryId}
</foreach>
</delete>
<update id="cancelWarehouseInventoryInquiryById" parameterType="Long">
update warehouse_inventory_inquiry set del_flag = '1' where inventory_inquiry_id = #{inventoryInquiryId}
</update>
<update id="restoreWarehouseInventoryInquiryById" parameterType="Long">
update warehouse_inventory_inquiry set del_flag = '0' where inventory_inquiry_id = #{inventoryInquiryId}
</update>
</mapper>

135
ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html

@ -0,0 +1,135 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增仓库库存查询')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-inventoryInquiry-add">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input name="materialNo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
<input name="materialType" 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="materialPhotourl" 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="materialBrand" 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="materialUnit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料描述:</label>
<div class="col-sm-8">
<textarea name="materialDescribe" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料加工方式:</label>
<div class="col-sm-8">
<input name="materialProcessMethod" 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="materialModel" 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="materialSpecification" 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="historicalTotal" 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="availableStockNum" 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="attributionAvailableStockNum" 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="noattributionAvailableStockNum" 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="useNum" 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="reportDamageNum" 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="materialUseStatus" class="form-control m-b" th:with="type=${@dict.getType('material_use_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "warehouse/inventoryInquiry"
$("#form-inventoryInquiry-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-inventoryInquiry-add').serialize());
}
}
</script>
</body>
</html>

139
ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html

@ -0,0 +1,139 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改仓库库存查询')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-inventoryInquiry-edit" th:object="${warehouseInventoryInquiry}">
<input name="inventoryInquiryId" th:field="*{inventoryInquiryId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
<select name="materialType" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料图片地址:</label>
<div class="col-sm-8">
<input name="materialPhotourl" th:field="*{materialPhotourl}" 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="materialBrand" th:field="*{materialBrand}" 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="materialUnit" th:field="*{materialUnit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料描述:</label>
<div class="col-sm-8">
<textarea name="materialDescribe" class="form-control">[[*{materialDescribe}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料加工方式:</label>
<div class="col-sm-8">
<input name="materialProcessMethod" th:field="*{materialProcessMethod}" 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="materialModel" th:field="*{materialModel}" 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="materialSpecification" th:field="*{materialSpecification}" 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="historicalTotal" th:field="*{historicalTotal}" 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="availableStockNum" th:field="*{availableStockNum}" 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="attributionAvailableStockNum" th:field="*{attributionAvailableStockNum}" 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="noattributionAvailableStockNum" th:field="*{noattributionAvailableStockNum}" 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="useNum" th:field="*{useNum}" 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="reportDamageNum" th:field="*{reportDamageNum}" 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="materialUseStatus" class="form-control m-b" th:with="type=${@dict.getType('material_use_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{materialUseStatus}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "warehouse/inventoryInquiry";
$("#form-inventoryInquiry-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-inventoryInquiry-edit').serialize());
}
}
</script>
</body>
</html>

170
ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html

@ -0,0 +1,170 @@
<!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="materialNo"/>
</li>
<li>
<label>物料名称:</label>
<input type="text" name="materialName"/>
</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-warning" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:inventoryInquiry: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:inventoryInquiry:edit')}]];
var materialUseStatusDatas = [[${@dict.getType('material_use_status')}]];
var prefix = ctx + "warehouse/inventoryInquiry";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
exportUrl: prefix + "/export",
modalName: "仓库库存查询",
columns: [{
checkbox: true
},
{
title: '库存查询id',
field: 'inventoryInquiryId',
visible: false
},
{
title: '料号',
field: 'materialNo',
},
{
title: '物料名称',
field: 'materialName',
},
{
title: '物料类型',
field: 'materialType',
},
{
title: '物料图片地址',
field: 'materialPhotourl',
},
{
title: '物料品牌',
field: 'materialBrand',
},
{
title: '物料单位',
field: 'materialUnit',
},
{
title: '物料描述',
field: 'materialDescribe',
},
{
title: '物料加工方式',
field: 'materialProcessMethod',
},
{
title: '物料型号',
field: 'materialModel',
},
{
title: '物料规格',
field: 'materialSpecification',
},
{
title: '物料历史总数量',
field: 'historicalTotal',
},
{
title: '可用库存数',
field: 'availableStockNum',
},
{
title: '物料归属可用库存数',
field: 'attributionAvailableStockNum',
},
{
title: '物料无归属可用库存数',
field: 'noattributionAvailableStockNum',
},
{
title: '物料使用数',
field: 'useNum',
},
{
title: '物料报损数',
field: 'reportDamageNum',
},
{
title: '物料使用状态',
field: 'materialUseStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(materialUseStatusDatas, value);
}
},
{
title: '录入时间',
field: 'createTime',
},
{
title: '录入人',
field: 'createBy',
},
{
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.inventoryInquiryId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
Loading…
Cancel
Save