From 3030bd4eae73353c34dfa4b6d892f5d05eb953c4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 6 Jun 2024 15:15:31 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2Controller=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2Service=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2ServiceIm?= =?UTF-8?q?pl=20=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2inve?= =?UTF-8?q?ntoryInquiry.html=20=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A1=AB=E5=85=85=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseInventoryInquiryController.java | 151 ++++++++++ .../domain/WarehouseInventoryInquiry.java | 280 ++++++++++++++++++ .../WarehouseInventoryInquiryMapper.java | 77 +++++ .../IWarehouseInventoryInquiryService.java | 75 +++++ .../WarehouseInventoryInquiryServiceImpl.java | 126 ++++++++ .../WarehouseInventoryInquiryMapper.xml | 151 ++++++++++ .../warehouse/inventoryInquiry/add.html | 135 +++++++++ .../warehouse/inventoryInquiry/edit.html | 139 +++++++++ .../inventoryInquiry/inventoryInquiry.html | 170 +++++++++++ 9 files changed, 1304 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java new file mode 100644 index 00000000..38958ff6 --- /dev/null +++ b/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 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 list = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryList(warehouseInventoryInquiry); + ExcelUtil util = new ExcelUtil(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)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java new file mode 100644 index 00000000..d6196c09 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java new file mode 100644 index 00000000..fc53d363 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java new file mode 100644 index 00000000..152b8679 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java new file mode 100644 index 00000000..afae57e4 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml new file mode 100644 index 00000000..3f41b556 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into warehouse_inventory_inquiry + + 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, + + + #{materialNo}, + #{materialName}, + #{materialType}, + #{materialPhotourl}, + #{materialBrand}, + #{materialUnit}, + #{materialDescribe}, + #{materialProcessMethod}, + #{materialModel}, + #{materialSpecification}, + #{historicalTotal}, + #{availableStockNum}, + #{attributionAvailableStockNum}, + #{noattributionAvailableStockNum}, + #{useNum}, + #{reportDamageNum}, + #{materialUseStatus}, + #{remark}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_inventory_inquiry + + material_no = #{materialNo}, + material_name = #{materialName}, + material_type = #{materialType}, + material_photoUrl = #{materialPhotourl}, + material_brand = #{materialBrand}, + material_unit = #{materialUnit}, + material_describe = #{materialDescribe}, + material_process_method = #{materialProcessMethod}, + material_model = #{materialModel}, + material_specification = #{materialSpecification}, + historical_total = #{historicalTotal}, + available_stock_num = #{availableStockNum}, + attribution_available_stock_num = #{attributionAvailableStockNum}, + noattribution_available_stock_num = #{noattributionAvailableStockNum}, + use_num = #{useNum}, + report_damage_num = #{reportDamageNum}, + material_use_status = #{materialUseStatus}, + remark = #{remark}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inventory_inquiry_id = #{inventoryInquiryId} + + + + delete from warehouse_inventory_inquiry where inventory_inquiry_id = #{inventoryInquiryId} + + + + delete from warehouse_inventory_inquiry where inventory_inquiry_id in + + #{inventoryInquiryId} + + + + + update warehouse_inventory_inquiry set del_flag = '1' where inventory_inquiry_id = #{inventoryInquiryId} + + + + update warehouse_inventory_inquiry set del_flag = '0' where inventory_inquiry_id = #{inventoryInquiryId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html new file mode 100644 index 00000000..c85e26af --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/add.html @@ -0,0 +1,135 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html new file mode 100644 index 00000000..4a0599c6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/edit.html @@ -0,0 +1,139 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html new file mode 100644 index 00000000..2400fb27 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html @@ -0,0 +1,170 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file