diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java new file mode 100644 index 00000000..684f538a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java @@ -0,0 +1,116 @@ +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.WarehouseInventoryCheck; +import com.ruoyi.warehouse.service.IWarehouseInventoryCheckService; +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-07 + */ +@Controller +@RequestMapping("/warehouse/inventoryCheck") +public class WarehouseInventoryCheckController extends BaseController +{ + private String prefix = "warehouse/inventoryCheck"; + + @Autowired + private IWarehouseInventoryCheckService warehouseInventoryCheckService; + + @RequiresPermissions("warehouse:inventoryCheck:view") + @GetMapping() + public String inventoryCheck() + { + return prefix + "/inventoryCheck"; + } + + /** + * 查询仓库库存盘点列表 + */ + @RequiresPermissions("warehouse:inventoryCheck:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(WarehouseInventoryCheck warehouseInventoryCheck) + { + startPage(); + List list = warehouseInventoryCheckService.selectWarehouseInventoryCheckList(warehouseInventoryCheck); + return getDataTable(list); + } + + /** + * 导出仓库库存盘点列表 + */ + @RequiresPermissions("warehouse:inventoryCheck:export") + @Log(title = "仓库库存盘点", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(WarehouseInventoryCheck warehouseInventoryCheck) + { + List list = warehouseInventoryCheckService.selectWarehouseInventoryCheckList(warehouseInventoryCheck); + ExcelUtil util = new ExcelUtil(WarehouseInventoryCheck.class); + return util.exportExcel(list, "仓库库存盘点数据"); + } + + /** + * 新增仓库库存盘点 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存仓库库存盘点 + */ + @RequiresPermissions("warehouse:inventoryCheck:add") + @Log(title = "仓库库存盘点", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(WarehouseInventoryCheck warehouseInventoryCheck) + { + return toAjax(warehouseInventoryCheckService.insertWarehouseInventoryCheck(warehouseInventoryCheck)); + } + + /** + * 修改仓库库存盘点 + */ + @GetMapping("/edit/{inventoryCheckId}") + public String edit(@PathVariable("inventoryCheckId") Long inventoryCheckId, ModelMap mmap) + { + WarehouseInventoryCheck warehouseInventoryCheck = warehouseInventoryCheckService.selectWarehouseInventoryCheckById(inventoryCheckId); + mmap.put("warehouseInventoryCheck", warehouseInventoryCheck); + return prefix + "/edit"; + } + + /** + * 修改保存仓库库存盘点 + */ + @RequiresPermissions("warehouse:inventoryCheck:edit") + @Log(title = "仓库库存盘点", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(WarehouseInventoryCheck warehouseInventoryCheck) + { + return toAjax(warehouseInventoryCheckService.updateWarehouseInventoryCheck(warehouseInventoryCheck)); + } + + +} 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 index 38958ff6..ec82d5da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java @@ -1,6 +1,10 @@ package com.ruoyi.warehouse.controller; import java.util.List; + +import com.ruoyi.warehouse.domain.WarehouseInventoryInquiryDetail; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; +import com.ruoyi.warehouse.service.IWarehouseInventoryInquiryDetailService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +38,9 @@ public class WarehouseInventoryInquiryController extends BaseController @Autowired private IWarehouseInventoryInquiryService warehouseInventoryInquiryService; + @Autowired + private IWarehouseInventoryInquiryDetailService inventoryInquiryDetailService; + @RequiresPermissions("warehouse:inventoryInquiry:view") @GetMapping() public String inventoryInquiry() @@ -113,39 +120,38 @@ public class WarehouseInventoryInquiryController extends BaseController } /** - * 删除仓库库存查询 + * 修改仓库库存历史 */ - @RequiresPermissions("warehouse:inventoryInquiry:remove") - @Log(title = "仓库库存查询", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) + @GetMapping("/inventoryHistory/{materialNo}") + public String inventoryHistory(@PathVariable("materialNo") String materialNo, ModelMap mmap) { - return toAjax(warehouseInventoryInquiryService.deleteWarehouseInventoryInquiryByIds(ids)); + WarehouseInventoryInquiry warehouseInventoryInquiry = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + mmap.put("warehouseInventoryInquiry", warehouseInventoryInquiry); + return prefix + "/inventoryHistory"; } /** - * 作废仓库库存查询 + * 修改保存仓库库存历史 */ - @RequiresPermissions("warehouse:inventoryInquiry:cancel") - @Log(title = "仓库库存查询", businessType = BusinessType.CANCEL) - @GetMapping( "/cancel/{id}") + @RequiresPermissions("warehouse:inventoryInquiry:inventoryHistory") + @Log(title = "仓库库存查询", businessType = BusinessType.UPDATE) + @PostMapping("/inventoryHistory") @ResponseBody - public AjaxResult cancel(@PathVariable("id") Long id){ - return toAjax(warehouseInventoryInquiryService.cancelWarehouseInventoryInquiryById(id)); + public AjaxResult inventoryHistorySave(WarehouseInventoryInquiry warehouseInventoryInquiry) + { + return toAjax(warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(warehouseInventoryInquiry)); } /** - * 恢复仓库库存查询 + * 仓库库存历史详情列表 */ - @RequiresPermissions("warehouse:inventoryInquiry:restore") - @Log(title = "仓库库存查询", businessType = BusinessType.RESTORE) - @GetMapping( "/restore/{id}") + @PostMapping("/getMaterialInventoryHistoricalList") @ResponseBody - public AjaxResult restore(@PathVariable("id")Long id) + public TableDataInfo getMaterialInventoryHistoricalList(WarehouseInventoryInquiry warehouseInventoryInquiry) { - return toAjax(warehouseInventoryInquiryService.restoreWarehouseInventoryInquiryById(id)); + startPage(); + List list = inventoryInquiryDetailService.selectWarehouseInventoryInquiryDetailByMaterialNo(warehouseInventoryInquiry.getMaterialNo()); + return getDataTable(list); } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryCheck.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryCheck.java new file mode 100644 index 00000000..922fe115 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryCheck.java @@ -0,0 +1,171 @@ +package com.ruoyi.warehouse.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 仓库库存盘点对象 warehouse_inventory_check + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public class WarehouseInventoryCheck extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 库存盘点ID */ + private Long inventoryCheckId; + + /** 库存盘点单号 */ + @Excel(name = "库存盘点单号") + private String inventoryCheckCode; + + /** 库存盘点人名 */ + @Excel(name = "库存盘点人名") + private String inventoryCheckName; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 仓库号 */ + @Excel(name = "仓库号") + private String warehouseCode; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 库存盘点日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "库存盘点日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date inventoryCheckDate; + + /** 物料数合计 */ + @Excel(name = "物料数合计") + private Integer materialTotal; + + /** 数量合计 */ + @Excel(name = "数量合计") + private Integer numTotal; + + public void setInventoryCheckId(Long inventoryCheckId) + { + this.inventoryCheckId = inventoryCheckId; + } + + public Long getInventoryCheckId() + { + return inventoryCheckId; + } + public void setInventoryCheckCode(String inventoryCheckCode) + { + this.inventoryCheckCode = inventoryCheckCode; + } + + public String getInventoryCheckCode() + { + return inventoryCheckCode; + } + public void setInventoryCheckName(String inventoryCheckName) + { + this.inventoryCheckName = inventoryCheckName; + } + + public String getInventoryCheckName() + { + return inventoryCheckName; + } + 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 setWarehouseCode(String warehouseCode) + { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseCode() + { + return warehouseCode; + } + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setInventoryCheckDate(Date inventoryCheckDate) + { + this.inventoryCheckDate = inventoryCheckDate; + } + + public Date getInventoryCheckDate() + { + return inventoryCheckDate; + } + public void setMaterialTotal(Integer materialTotal) + { + this.materialTotal = materialTotal; + } + + public Integer getMaterialTotal() + { + return materialTotal; + } + public void setNumTotal(Integer numTotal) + { + this.numTotal = numTotal; + } + + public Integer getNumTotal() + { + return numTotal; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("inventoryCheckId", getInventoryCheckId()) + .append("inventoryCheckCode", getInventoryCheckCode()) + .append("inventoryCheckName", getInventoryCheckName()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("inventoryCheckDate", getInventoryCheckDate()) + .append("materialTotal", getMaterialTotal()) + .append("numTotal", getNumTotal()) + .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/domain/WarehouseInventoryCheckDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryCheckDetail.java new file mode 100644 index 00000000..482b6eda --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryCheckDetail.java @@ -0,0 +1,247 @@ +package com.ruoyi.warehouse.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 仓库库存盘点详情对象 warehouse_inventory_check_detail + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public class WarehouseInventoryCheckDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 库存盘点详情ID */ + private Long inventoryCheckDetailId; + + /** 库存盘点单号 */ + private String inventoryCheckCode; + + /** 库存盘点人名 */ + private String inventoryCheckName; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料单位 */ + @Excel(name = "物料单位") + private String materialUnit; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDescribe; + + /** 库存盘点数量 */ + @Excel(name = "库存盘点数量") + private Integer inventoryCheckNum; + + /** 当时库存账上数量 */ + @Excel(name = "当时库存账上数量") + private Integer inventoryAccountNum; + + /** 仓库存放地址 */ + @Excel(name = "仓库存放地址") + private String warehouseStoreAddress; + + /** 批号 */ + @Excel(name = "批号") + private Integer batchNumber; + + /** 仓库号 */ + private String warehouseCode; + + /** 仓库名称 */ + private String warehouseName; + + /** 库存盘点日期 */ + private Date inventoryCheckDate; + + /** 物料数合计 */ + private Integer materialTotal; + + /** 数量合计 */ + private Integer numTotal; + + public void setInventoryCheckDetailId(Long inventoryCheckDetailId) + { + this.inventoryCheckDetailId = inventoryCheckDetailId; + } + + public Long getInventoryCheckDetailId() + { + return inventoryCheckDetailId; + } + public void setInventoryCheckCode(String inventoryCheckCode) + { + this.inventoryCheckCode = inventoryCheckCode; + } + + public String getInventoryCheckCode() + { + return inventoryCheckCode; + } + public void setInventoryCheckName(String inventoryCheckName) + { + this.inventoryCheckName = inventoryCheckName; + } + + public String getInventoryCheckName() + { + return inventoryCheckName; + } + 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 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 setInventoryCheckNum(Integer inventoryCheckNum) + { + this.inventoryCheckNum = inventoryCheckNum; + } + + public Integer getInventoryCheckNum() + { + return inventoryCheckNum; + } + public void setInventoryAccountNum(Integer inventoryAccountNum) + { + this.inventoryAccountNum = inventoryAccountNum; + } + + public Integer getInventoryAccountNum() + { + return inventoryAccountNum; + } + public void setWarehouseStoreAddress(String warehouseStoreAddress) + { + this.warehouseStoreAddress = warehouseStoreAddress; + } + + public String getWarehouseStoreAddress() + { + return warehouseStoreAddress; + } + public void setBatchNumber(Integer batchNumber) + { + this.batchNumber = batchNumber; + } + + public Integer getBatchNumber() + { + return batchNumber; + } + public void setWarehouseCode(String warehouseCode) + { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseCode() + { + return warehouseCode; + } + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setInventoryCheckDate(Date inventoryCheckDate) + { + this.inventoryCheckDate = inventoryCheckDate; + } + + public Date getInventoryCheckDate() + { + return inventoryCheckDate; + } + public void setMaterialTotal(Integer materialTotal) + { + this.materialTotal = materialTotal; + } + + public Integer getMaterialTotal() + { + return materialTotal; + } + public void setNumTotal(Integer numTotal) + { + this.numTotal = numTotal; + } + + public Integer getNumTotal() + { + return numTotal; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("inventoryCheckDetailId", getInventoryCheckDetailId()) + .append("inventoryCheckCode", getInventoryCheckCode()) + .append("inventoryCheckName", getInventoryCheckName()) + .append("materialNo", getMaterialNo()) + .append("materialName", getMaterialName()) + .append("materialUnit", getMaterialUnit()) + .append("materialDescribe", getMaterialDescribe()) + .append("inventoryCheckNum", getInventoryCheckNum()) + .append("inventoryAccountNum", getInventoryAccountNum()) + .append("warehouseStoreAddress", getWarehouseStoreAddress()) + .append("batchNumber", getBatchNumber()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("inventoryCheckDate", getInventoryCheckDate()) + .append("materialTotal", getMaterialTotal()) + .append("numTotal", getNumTotal()) + .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/domain/WarehouseInventoryInquiryDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java new file mode 100644 index 00000000..a50cb972 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiryDetail.java @@ -0,0 +1,421 @@ +package com.ruoyi.warehouse.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 仓库库存查询详情对象 warehouse_inventory_inquiry_detail + * + * @author 刘晓旭 + * @date 2024-06-06 + */ +public class WarehouseInventoryInquiryDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 库存查询详情id */ + private Long inventoryInquiryDetailId; + + /** 料号 */ + private String materialNo; + + /** 物料名称 */ + private String materialName; + + /** 物料类型 */ + private String materialType; + + /** 物料图片地址 */ + private String materialPhotourl; + + /** 物料品牌 */ + private String materialBrand; + + /** 物料单位 */ + private String materialUnit; + + /** 物料描述 */ + private String materialDescribe; + + /** 物料加工方式 */ + private String materialProcessMethod; + + /** 物料型号 */ + private String materialModel; + + /** 物料规格 */ + private String materialSpecification; + + /** 物料历史总数量 */ + private Integer historicalTotal; + + /** 可用库存数 */ + private Integer availableStockNum; + + /** 物料归属可用库存数 */ + private Integer attributionAvailableStockNum; + + /** 物料无归属可用库存数 */ + private Integer noattributionAvailableStockNum; + + /** 物料使用数 */ + private Integer useNum; + + /** 物料报损数 */ + private Integer reportDamageNum; + + /** 物料使用状态 */ + private String materialUseStatus; + + /** 库存归属单号 */ + @Excel(name = "库存归属单号") + private String inventoryAttributionCode; + + /** 库存使用单号 */ + @Excel(name = "库存使用单号") + private String inventoryUseCode; + + /** 库存历史时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "库存历史时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date inventoryHistoricalTime; + + /** 库存历史类型 */ + @Excel(name = "库存历史类型") + private String inventoryHistoricalType; + + /** 库存增减 */ + @Excel(name = "库存增减") + private String inventoryIncreaseDecrease; + + /** 库存历史数量 */ + @Excel(name = "库存历史数量") + private Integer inventoryHistoricalNum; + + /** 不含税采购总价 */ + @Excel(name = "不含税采购总价") + private BigDecimal purchasePriceExcludingTax; + + /** 含税总价 */ + @Excel(name = "含税总价") + private BigDecimal purchasePriceIncludesTax; + + /** 采购单号 */ + @Excel(name = "采购单号") + private String purchaseOrderCode; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + public void setInventoryInquiryDetailId(Long inventoryInquiryDetailId) + { + this.inventoryInquiryDetailId = inventoryInquiryDetailId; + } + + public Long getInventoryInquiryDetailId() + { + return inventoryInquiryDetailId; + } + 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; + } + public void setInventoryAttributionCode(String inventoryAttributionCode) + { + this.inventoryAttributionCode = inventoryAttributionCode; + } + + public String getInventoryAttributionCode() + { + return inventoryAttributionCode; + } + public void setInventoryUseCode(String inventoryUseCode) + { + this.inventoryUseCode = inventoryUseCode; + } + + public String getInventoryUseCode() + { + return inventoryUseCode; + } + public void setInventoryHistoricalTime(Date inventoryHistoricalTime) + { + this.inventoryHistoricalTime = inventoryHistoricalTime; + } + + public Date getInventoryHistoricalTime() + { + return inventoryHistoricalTime; + } + public void setInventoryHistoricalType(String inventoryHistoricalType) + { + this.inventoryHistoricalType = inventoryHistoricalType; + } + + public String getInventoryHistoricalType() + { + return inventoryHistoricalType; + } + public void setInventoryIncreaseDecrease(String inventoryIncreaseDecrease) + { + this.inventoryIncreaseDecrease = inventoryIncreaseDecrease; + } + + public String getInventoryIncreaseDecrease() + { + return inventoryIncreaseDecrease; + } + public void setInventoryHistoricalNum(Integer inventoryHistoricalNum) + { + this.inventoryHistoricalNum = inventoryHistoricalNum; + } + + public Integer getInventoryHistoricalNum() + { + return inventoryHistoricalNum; + } + public void setPurchasePriceExcludingTax(BigDecimal purchasePriceExcludingTax) + { + this.purchasePriceExcludingTax = purchasePriceExcludingTax; + } + + public BigDecimal getPurchasePriceExcludingTax() + { + return purchasePriceExcludingTax; + } + public void setPurchasePriceIncludesTax(BigDecimal purchasePriceIncludesTax) + { + this.purchasePriceIncludesTax = purchasePriceIncludesTax; + } + + public BigDecimal getPurchasePriceIncludesTax() + { + return purchasePriceIncludesTax; + } + public void setPurchaseOrderCode(String purchaseOrderCode) + { + this.purchaseOrderCode = purchaseOrderCode; + } + + public String getPurchaseOrderCode() + { + return purchaseOrderCode; + } + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("inventoryInquiryDetailId", getInventoryInquiryDetailId()) + .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("inventoryAttributionCode", getInventoryAttributionCode()) + .append("inventoryUseCode", getInventoryUseCode()) + .append("inventoryHistoricalTime", getInventoryHistoricalTime()) + .append("inventoryHistoricalType", getInventoryHistoricalType()) + .append("inventoryIncreaseDecrease", getInventoryIncreaseDecrease()) + .append("inventoryHistoricalNum", getInventoryHistoricalNum()) + .append("purchasePriceExcludingTax", getPurchasePriceExcludingTax()) + .append("purchasePriceIncludesTax", getPurchasePriceIncludesTax()) + .append("purchaseOrderCode", getPurchaseOrderCode()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .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/WarehouseInventoryCheckDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryCheckDetailMapper.java new file mode 100644 index 00000000..2bde4d1b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryCheckDetailMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.warehouse.mapper; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail; + +/** + * 仓库库存盘点详情Mapper接口 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public interface WarehouseInventoryCheckDetailMapper +{ + /** + * 查询仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 仓库库存盘点详情 + */ + public WarehouseInventoryCheckDetail selectWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 查询仓库库存盘点详情列表 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 仓库库存盘点详情集合 + */ + public List selectWarehouseInventoryCheckDetailList(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 新增仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + public int insertWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 修改仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + public int updateWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 删除仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 批量删除仓库库存盘点详情 + * + * @param inventoryCheckDetailIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckDetailByIds(String[] inventoryCheckDetailIds); + + /** + * 作废仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + public int cancelWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 恢复仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + public int restoreWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryCheckMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryCheckMapper.java new file mode 100644 index 00000000..8cfff5db --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryCheckMapper.java @@ -0,0 +1,80 @@ +package com.ruoyi.warehouse.mapper; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheck; +import org.apache.ibatis.annotations.Param; + +/** + * 仓库库存盘点Mapper接口 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public interface WarehouseInventoryCheckMapper +{ + /** + * 查询仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 仓库库存盘点 + */ + public WarehouseInventoryCheck selectWarehouseInventoryCheckById(Long inventoryCheckId); + + /** + * 查询仓库库存盘点列表 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 仓库库存盘点集合 + */ + public List selectWarehouseInventoryCheckList(WarehouseInventoryCheck warehouseInventoryCheck); + + /** + * 新增仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + public int insertWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck); + + /** + * 修改仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + public int updateWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck); + + /** + * 删除仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckById(Long inventoryCheckId); + + /** + * 批量删除仓库库存盘点 + * + * @param inventoryCheckIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckByIds(String[] inventoryCheckIds); + + /** + * 作废仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 结果 + */ + public int cancelWarehouseInventoryCheckById(Long inventoryCheckId); + + /** + * 恢复仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 结果 + */ + public int restoreWarehouseInventoryCheckById(Long inventoryCheckId); + + public String findMaxRoundCode(@Param("prefix") String prefix); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryDetailMapper.java new file mode 100644 index 00000000..fee76a32 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryDetailMapper.java @@ -0,0 +1,82 @@ +package com.ruoyi.warehouse.mapper; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryInquiryDetail; + +/** + * 仓库库存查询详情Mapper接口 + * + * @author 刘晓旭 + * @date 2024-06-06 + */ +public interface WarehouseInventoryInquiryDetailMapper +{ + /** + * 查询仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 仓库库存查询详情 + */ + public WarehouseInventoryInquiryDetail selectWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 查询仓库库存查询详情列表 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 仓库库存查询详情集合 + */ + public List selectWarehouseInventoryInquiryDetailList(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 新增仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + public int insertWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 修改仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + public int updateWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 删除仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + public int deleteWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 批量删除仓库库存查询详情 + * + * @param inventoryInquiryDetailIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryInquiryDetailByIds(String[] inventoryInquiryDetailIds); + + /** + * 作废仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + public int cancelWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 恢复仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + public int restoreWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /* + * 根据物料号查询库存查询详情列表 + * */ + List selectWarehouseInventoryInquiryDetailByMaterialNo(String materialNo); +} 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 index fc53d363..8db09ffb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryInquiryMapper.java @@ -74,4 +74,9 @@ public interface WarehouseInventoryInquiryMapper * @return 结果 */ public int restoreWarehouseInventoryInquiryById(Long inventoryInquiryId); + + /* + * 根据物料号查询库存查询信息 + * */ + WarehouseInventoryInquiry selectWarehouseInventoryInquiryByMaterialNo(String materialNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckDetailService.java new file mode 100644 index 00000000..5c113fa4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckDetailService.java @@ -0,0 +1,75 @@ +package com.ruoyi.warehouse.service; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail; + +/** + * 仓库库存盘点详情Service接口 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public interface IWarehouseInventoryCheckDetailService +{ + /** + * 查询仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 仓库库存盘点详情 + */ + public WarehouseInventoryCheckDetail selectWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 查询仓库库存盘点详情列表 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 仓库库存盘点详情集合 + */ + public List selectWarehouseInventoryCheckDetailList(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 新增仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + public int insertWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 修改仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + public int updateWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail); + + /** + * 批量删除仓库库存盘点详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckDetailByIds(String ids); + + /** + * 删除仓库库存盘点详情信息 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + public int deleteWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 作废仓库库存盘点详情 + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return + */ + int cancelWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); + + /** + * 恢复仓库库存盘点详情 + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return + */ + int restoreWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckService.java new file mode 100644 index 00000000..178ce8fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryCheckService.java @@ -0,0 +1,46 @@ +package com.ruoyi.warehouse.service; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheck; + +/** + * 仓库库存盘点Service接口 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +public interface IWarehouseInventoryCheckService +{ + /** + * 查询仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 仓库库存盘点 + */ + public WarehouseInventoryCheck selectWarehouseInventoryCheckById(Long inventoryCheckId); + + /** + * 查询仓库库存盘点列表 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 仓库库存盘点集合 + */ + public List selectWarehouseInventoryCheckList(WarehouseInventoryCheck warehouseInventoryCheck); + + /** + * 新增仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + public int insertWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck); + + /** + * 修改仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + public int updateWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryDetailService.java new file mode 100644 index 00000000..aa485d0a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryDetailService.java @@ -0,0 +1,80 @@ +package com.ruoyi.warehouse.service; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryInquiryDetail; + +/** + * 仓库库存查询详情Service接口 + * + * @author 刘晓旭 + * @date 2024-06-06 + */ +public interface IWarehouseInventoryInquiryDetailService +{ + /** + * 查询仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 仓库库存查询详情 + */ + public WarehouseInventoryInquiryDetail selectWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 查询仓库库存查询详情列表 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 仓库库存查询详情集合 + */ + public List selectWarehouseInventoryInquiryDetailList(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 新增仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + public int insertWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 修改仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + public int updateWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail); + + /** + * 批量删除仓库库存查询详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryInquiryDetailByIds(String ids); + + /** + * 删除仓库库存查询详情信息 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + public int deleteWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 作废仓库库存查询详情 + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return + */ + int cancelWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /** + * 恢复仓库库存查询详情 + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return + */ + int restoreWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId); + + /* + * 根据物料号查询库存查询详情列表 + * */ + List selectWarehouseInventoryInquiryDetailByMaterialNo(String materialNo); +} 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 index 152b8679..4f6094ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java @@ -72,4 +72,9 @@ public interface IWarehouseInventoryInquiryService * @return */ int restoreWarehouseInventoryInquiryById(Long inventoryInquiryId); + + /* + * 根据物料号查询库存查询信息 + * */ + public WarehouseInventoryInquiry selectWarehouseInventoryInquiryByMaterialNo(String materialNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckDetailServiceImpl.java new file mode 100644 index 00000000..1198cf32 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckDetailServiceImpl.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.WarehouseInventoryCheckDetailMapper; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail; +import com.ruoyi.warehouse.service.IWarehouseInventoryCheckDetailService; +import com.ruoyi.common.core.text.Convert; + +/** + * 仓库库存盘点详情Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +@Service +public class WarehouseInventoryCheckDetailServiceImpl implements IWarehouseInventoryCheckDetailService +{ + @Autowired + private WarehouseInventoryCheckDetailMapper warehouseInventoryCheckDetailMapper; + + /** + * 查询仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 仓库库存盘点详情 + */ + @Override + public WarehouseInventoryCheckDetail selectWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId) + { + return warehouseInventoryCheckDetailMapper.selectWarehouseInventoryCheckDetailById(inventoryCheckDetailId); + } + + /** + * 查询仓库库存盘点详情列表 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 仓库库存盘点详情 + */ + @Override + public List selectWarehouseInventoryCheckDetailList(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail) + { + return warehouseInventoryCheckDetailMapper.selectWarehouseInventoryCheckDetailList(warehouseInventoryCheckDetail); + } + + /** + * 新增仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + @Override + public int insertWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail) + { + warehouseInventoryCheckDetail.setCreateTime(DateUtils.getNowDate()); + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryCheckDetail.setCreateBy(loginName); + return warehouseInventoryCheckDetailMapper.insertWarehouseInventoryCheckDetail(warehouseInventoryCheckDetail); + } + + /** + * 修改仓库库存盘点详情 + * + * @param warehouseInventoryCheckDetail 仓库库存盘点详情 + * @return 结果 + */ + @Override + public int updateWarehouseInventoryCheckDetail(WarehouseInventoryCheckDetail warehouseInventoryCheckDetail) + { + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryCheckDetail.setUpdateBy(loginName); + warehouseInventoryCheckDetail.setUpdateTime(DateUtils.getNowDate()); + return warehouseInventoryCheckDetailMapper.updateWarehouseInventoryCheckDetail(warehouseInventoryCheckDetail); + } + + /** + * 删除仓库库存盘点详情对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryCheckDetailByIds(String ids) + { + return warehouseInventoryCheckDetailMapper.deleteWarehouseInventoryCheckDetailByIds(Convert.toStrArray(ids)); + } + + /** + * 删除仓库库存盘点详情信息 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId) + { + return warehouseInventoryCheckDetailMapper.deleteWarehouseInventoryCheckDetailById(inventoryCheckDetailId); + } + + /** + * 作废仓库库存盘点详情 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + @Override + public int cancelWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId) + { + return warehouseInventoryCheckDetailMapper.cancelWarehouseInventoryCheckDetailById(inventoryCheckDetailId); + } + + /** + * 恢复仓库库存盘点详情信息 + * + * @param inventoryCheckDetailId 仓库库存盘点详情ID + * @return 结果 + */ + @Override + public int restoreWarehouseInventoryCheckDetailById(Long inventoryCheckDetailId) + { + return warehouseInventoryCheckDetailMapper.restoreWarehouseInventoryCheckDetailById(inventoryCheckDetailId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java new file mode 100644 index 00000000..642fea59 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java @@ -0,0 +1,117 @@ +package com.ruoyi.warehouse.service.impl; + +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.exception.BusinessException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.warehouse.mapper.WarehouseInventoryCheckMapper; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheck; +import com.ruoyi.warehouse.service.IWarehouseInventoryCheckService; +import com.ruoyi.common.core.text.Convert; + +/** + * 仓库库存盘点Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-06-07 + */ +@Service +public class WarehouseInventoryCheckServiceImpl implements IWarehouseInventoryCheckService +{ + @Autowired + private WarehouseInventoryCheckMapper warehouseInventoryCheckMapper; + + /** + * 查询仓库库存盘点 + * + * @param inventoryCheckId 仓库库存盘点ID + * @return 仓库库存盘点 + */ + @Override + public WarehouseInventoryCheck selectWarehouseInventoryCheckById(Long inventoryCheckId) + { + return warehouseInventoryCheckMapper.selectWarehouseInventoryCheckById(inventoryCheckId); + } + + /** + * 查询仓库库存盘点列表 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 仓库库存盘点 + */ + @Override + public List selectWarehouseInventoryCheckList(WarehouseInventoryCheck warehouseInventoryCheck) + { + return warehouseInventoryCheckMapper.selectWarehouseInventoryCheckList(warehouseInventoryCheck); + } + + /** + * 新增仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + @Override + public int insertWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck) + { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String prefix = "KCPD" + simpleDateFormat.format(new Date()).replace("-", ""); + + String maxCode = warehouseInventoryCheckMapper.findMaxRoundCode(prefix); + + String newCode = generateCode(prefix,maxCode); + + warehouseInventoryCheck.setInventoryCheckCode(newCode); + warehouseInventoryCheck.setCreateTime(DateUtils.getNowDate()); + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryCheck.setCreateBy(loginName); + return warehouseInventoryCheckMapper.insertWarehouseInventoryCheck(warehouseInventoryCheck); + } + + /** + * 修改仓库库存盘点 + * + * @param warehouseInventoryCheck 仓库库存盘点 + * @return 结果 + */ + @Override + public int updateWarehouseInventoryCheck(WarehouseInventoryCheck warehouseInventoryCheck) + { + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryCheck.setUpdateBy(loginName); + warehouseInventoryCheck.setUpdateTime(DateUtils.getNowDate()); + return warehouseInventoryCheckMapper.updateWarehouseInventoryCheck(warehouseInventoryCheck); + } + + + /** + *库存盘点单号生成规则 + *系统自动生成，按照特定编码，编码暂用【KCPD+年月日+001】， + *自增长，如:KCPD20231111001，KCPD20231111002 + * + */ + public static String generateCode(String prefix, String maxCode){ + if (StringUtils.isEmpty(maxCode)){ + return prefix + "001"; + } + + //解析并递增编号 + int sequence = Integer.parseInt(maxCode.substring(4)) + 1; + + //检查序列号是否溢出 + if (sequence > 999){ + throw new BusinessException("当前编号已达到最大值999,请检查或调整策略"); + } + + //格式化序列号，自动补零至三位 + DecimalFormat df = new DecimalFormat("000"); + return prefix + df.format(sequence); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryDetailServiceImpl.java new file mode 100644 index 00000000..b18c064d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryDetailServiceImpl.java @@ -0,0 +1,135 @@ +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.WarehouseInventoryInquiryDetailMapper; +import com.ruoyi.warehouse.domain.WarehouseInventoryInquiryDetail; +import com.ruoyi.warehouse.service.IWarehouseInventoryInquiryDetailService; +import com.ruoyi.common.core.text.Convert; + +/** + * 仓库库存查询详情Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-06-06 + */ +@Service +public class WarehouseInventoryInquiryDetailServiceImpl implements IWarehouseInventoryInquiryDetailService +{ + @Autowired + private WarehouseInventoryInquiryDetailMapper warehouseInventoryInquiryDetailMapper; + + /** + * 查询仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 仓库库存查询详情 + */ + @Override + public WarehouseInventoryInquiryDetail selectWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId) + { + return warehouseInventoryInquiryDetailMapper.selectWarehouseInventoryInquiryDetailById(inventoryInquiryDetailId); + } + + /** + * 查询仓库库存查询详情列表 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 仓库库存查询详情 + */ + @Override + public List selectWarehouseInventoryInquiryDetailList(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail) + { + return warehouseInventoryInquiryDetailMapper.selectWarehouseInventoryInquiryDetailList(warehouseInventoryInquiryDetail); + } + + /** + * 新增仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + @Override + public int insertWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail) + { + warehouseInventoryInquiryDetail.setCreateTime(DateUtils.getNowDate()); + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryInquiryDetail.setCreateBy(loginName); + return warehouseInventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(warehouseInventoryInquiryDetail); + } + + /** + * 修改仓库库存查询详情 + * + * @param warehouseInventoryInquiryDetail 仓库库存查询详情 + * @return 结果 + */ + @Override + public int updateWarehouseInventoryInquiryDetail(WarehouseInventoryInquiryDetail warehouseInventoryInquiryDetail) + { + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryInquiryDetail.setUpdateBy(loginName); + warehouseInventoryInquiryDetail.setUpdateTime(DateUtils.getNowDate()); + return warehouseInventoryInquiryDetailMapper.updateWarehouseInventoryInquiryDetail(warehouseInventoryInquiryDetail); + } + + /** + * 删除仓库库存查询详情对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryInquiryDetailByIds(String ids) + { + return warehouseInventoryInquiryDetailMapper.deleteWarehouseInventoryInquiryDetailByIds(Convert.toStrArray(ids)); + } + + /** + * 删除仓库库存查询详情信息 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId) + { + return warehouseInventoryInquiryDetailMapper.deleteWarehouseInventoryInquiryDetailById(inventoryInquiryDetailId); + } + + /** + * 作废仓库库存查询详情 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + @Override + public int cancelWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId) + { + return warehouseInventoryInquiryDetailMapper.cancelWarehouseInventoryInquiryDetailById(inventoryInquiryDetailId); + } + + /** + * 恢复仓库库存查询详情信息 + * + * @param inventoryInquiryDetailId 仓库库存查询详情ID + * @return 结果 + */ + @Override + public int restoreWarehouseInventoryInquiryDetailById(Long inventoryInquiryDetailId) + { + return warehouseInventoryInquiryDetailMapper.restoreWarehouseInventoryInquiryDetailById(inventoryInquiryDetailId); + } + + /* + * 根据物料号查询库存查询详情列表 + * */ + @Override + public List selectWarehouseInventoryInquiryDetailByMaterialNo(String materialNo) { + + return warehouseInventoryInquiryDetailMapper.selectWarehouseInventoryInquiryDetailByMaterialNo(materialNo); + } +} 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 index afae57e4..d6b5d112 100644 --- 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 @@ -123,4 +123,13 @@ public class WarehouseInventoryInquiryServiceImpl implements IWarehouseInventory { return warehouseInventoryInquiryMapper.restoreWarehouseInventoryInquiryById(inventoryInquiryId); } + + /* + * 根据物料号查询库存查询信息 + * */ + @Override + public WarehouseInventoryInquiry selectWarehouseInventoryInquiryByMaterialNo(String materialNo) { + + return warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckDetailMapper.xml new file mode 100644 index 00000000..3d543a45 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckDetailMapper.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select inventory_check_detail_id, inventory_check_code, inventory_check_name, material_no, material_name, material_unit, material_describe, inventory_check_num, inventory_account_num, warehouse_store_address, batch_number, warehouse_code, warehouse_name, inventory_check_date, material_total, num_total, remark, create_time, create_by, update_by, update_time from warehouse_inventory_check_detail + + + + + + + + insert into warehouse_inventory_check_detail + + inventory_check_code, + inventory_check_name, + material_no, + material_name, + material_unit, + material_describe, + inventory_check_num, + inventory_account_num, + warehouse_store_address, + batch_number, + warehouse_code, + warehouse_name, + inventory_check_date, + material_total, + num_total, + remark, + create_time, + create_by, + update_by, + update_time, + + + #{inventoryCheckCode}, + #{inventoryCheckName}, + #{materialNo}, + #{materialName}, + #{materialUnit}, + #{materialDescribe}, + #{inventoryCheckNum}, + #{inventoryAccountNum}, + #{warehouseStoreAddress}, + #{batchNumber}, + #{warehouseCode}, + #{warehouseName}, + #{inventoryCheckDate}, + #{materialTotal}, + #{numTotal}, + #{remark}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_inventory_check_detail + + inventory_check_code = #{inventoryCheckCode}, + inventory_check_name = #{inventoryCheckName}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_unit = #{materialUnit}, + material_describe = #{materialDescribe}, + inventory_check_num = #{inventoryCheckNum}, + inventory_account_num = #{inventoryAccountNum}, + warehouse_store_address = #{warehouseStoreAddress}, + batch_number = #{batchNumber}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + inventory_check_date = #{inventoryCheckDate}, + material_total = #{materialTotal}, + num_total = #{numTotal}, + remark = #{remark}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inventory_check_detail_id = #{inventoryCheckDetailId} + + + + delete from warehouse_inventory_check_detail where inventory_check_detail_id = #{inventoryCheckDetailId} + + + + delete from warehouse_inventory_check_detail where inventory_check_detail_id in + + #{inventoryCheckDetailId} + + + + + update warehouse_inventory_check_detail set del_flag = '1' where inventory_check_detail_id = #{inventoryCheckDetailId} + + + + update warehouse_inventory_check_detail set del_flag = '0' where inventory_check_detail_id = #{inventoryCheckDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckMapper.xml new file mode 100644 index 00000000..fda1d2b7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryCheckMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + select inventory_check_id, inventory_check_code, inventory_check_name, material_no, material_name, warehouse_code, warehouse_name, inventory_check_date, material_total, num_total, remark, create_time, create_by, update_by, update_time from warehouse_inventory_check + + + + + + + + insert into warehouse_inventory_check + + inventory_check_code, + inventory_check_name, + material_no, + material_name, + warehouse_code, + warehouse_name, + inventory_check_date, + material_total, + num_total, + remark, + create_time, + create_by, + update_by, + update_time, + + + #{inventoryCheckCode}, + #{inventoryCheckName}, + #{materialNo}, + #{materialName}, + #{warehouseCode}, + #{warehouseName}, + #{inventoryCheckDate}, + #{materialTotal}, + #{numTotal}, + #{remark}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_inventory_check + + inventory_check_code = #{inventoryCheckCode}, + inventory_check_name = #{inventoryCheckName}, + material_no = #{materialNo}, + material_name = #{materialName}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + inventory_check_date = #{inventoryCheckDate}, + material_total = #{materialTotal}, + num_total = #{numTotal}, + remark = #{remark}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inventory_check_id = #{inventoryCheckId} + + + + delete from warehouse_inventory_check where inventory_check_id = #{inventoryCheckId} + + + + delete from warehouse_inventory_check where inventory_check_id in + + #{inventoryCheckId} + + + + + update warehouse_inventory_check set del_flag = '1' where inventory_check_id = #{inventoryCheckId} + + + + update warehouse_inventory_check set del_flag = '0' where inventory_check_id = #{inventoryCheckId} + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml new file mode 100644 index 00000000..3e0f79d8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryDetailMapper.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select inventory_inquiry_detail_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, inventory_attribution_code, inventory_use_code, inventory_historical_time, inventory_historical_type, inventory_increase_decrease, inventory_historical_num, purchase_price_excluding_tax, purchase_price_includes_tax, purchase_order_code, supplier_code, supplier_name, remark, create_time, create_by, update_by, update_time from warehouse_inventory_inquiry_detail + + + + + + + + + + + insert into warehouse_inventory_inquiry_detail + + 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, + inventory_attribution_code, + inventory_use_code, + inventory_historical_time, + inventory_historical_type, + inventory_increase_decrease, + inventory_historical_num, + purchase_price_excluding_tax, + purchase_price_includes_tax, + purchase_order_code, + supplier_code, + supplier_name, + 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}, + #{inventoryAttributionCode}, + #{inventoryUseCode}, + #{inventoryHistoricalTime}, + #{inventoryHistoricalType}, + #{inventoryIncreaseDecrease}, + #{inventoryHistoricalNum}, + #{purchasePriceExcludingTax}, + #{purchasePriceIncludesTax}, + #{purchaseOrderCode}, + #{supplierCode}, + #{supplierName}, + #{remark}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_inventory_inquiry_detail + + 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}, + inventory_attribution_code = #{inventoryAttributionCode}, + inventory_use_code = #{inventoryUseCode}, + inventory_historical_time = #{inventoryHistoricalTime}, + inventory_historical_type = #{inventoryHistoricalType}, + inventory_increase_decrease = #{inventoryIncreaseDecrease}, + inventory_historical_num = #{inventoryHistoricalNum}, + purchase_price_excluding_tax = #{purchasePriceExcludingTax}, + purchase_price_includes_tax = #{purchasePriceIncludesTax}, + purchase_order_code = #{purchaseOrderCode}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + remark = #{remark}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where inventory_inquiry_detail_id = #{inventoryInquiryDetailId} + + + + delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id = #{inventoryInquiryDetailId} + + + + delete from warehouse_inventory_inquiry_detail where inventory_inquiry_detail_id in + + #{inventoryInquiryDetailId} + + + + + update warehouse_inventory_inquiry_detail set del_flag = '1' where inventory_inquiry_detail_id = #{inventoryInquiryDetailId} + + + + update warehouse_inventory_inquiry_detail set del_flag = '0' where inventory_inquiry_detail_id = #{inventoryInquiryDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml index 3f41b556..3366624b 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml @@ -47,7 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where inventory_inquiry_id = #{inventoryInquiryId} - + + + + insert into warehouse_inventory_inquiry diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html new file mode 100644 index 00000000..bdde0e9f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html @@ -0,0 +1,66 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/edit.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/edit.html new file mode 100644 index 00000000..26c00b90 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/edit.html @@ -0,0 +1,97 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/inventoryCheck.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/inventoryCheck.html new file mode 100644 index 00000000..505b0630 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/inventoryCheck.html @@ -0,0 +1,169 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html new file mode 100644 index 00000000..4326c48c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html @@ -0,0 +1,145 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+
+
+
+
+
+
+ + + + \ 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 index 2400fb27..550d9a0f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html @@ -34,6 +34,9 @@
+ + 库存历史 + 导出 @@ -165,6 +168,20 @@ }; $.table.init(options); }); + + + /*查看库存历史*/ + function add() { + var rows = $("#bootstrap-table").bootstrapTable('getSelections'); + console.log("rows" + rows); + if (rows.length == 1){ + var url = ctx + 'warehouse/inventoryInquiry/inventoryHistory/' +rows[0].materialNo; + $.modal.open("库存历史",url); + }else{ + $.modal.msgWarning("只能查看一种物料的库存历史！") + } + + }; \ No newline at end of file