From af7f587cb7b1a7b219731a45735a5e09117e4528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=9F=8E=E5=BF=B5=E4=BA=91?= <495888462@qq.com> Date: Wed, 15 Jan 2020 08:24:37 +0800 Subject: [PATCH] no commit message --- ruoyi-ui/src/api/data/currentinventory.js | 53 ++ .../src/views/data/currentinventory/index.vue | 657 +++++++++++++++++ ruoyi-ui/src/views/login.vue | 4 +- .../DataCurrentinventoryController.java | 97 +++ .../mr/data/domain/DataCurrentinventory.java | 667 ++++++++++++++++++ .../mapper/DataCurrentinventoryMapper.java | 69 ++ .../service/IDataCurrentinventoryService.java | 69 ++ .../impl/DataCurrentinventoryServiceImpl.java | 106 +++ .../project/tool/swagger/TestController.java | 18 +- ruoyi/src/main/resources/application.yml | 2 +- .../data/DataCurrentinventoryMapper.xml | 267 +++++++ 11 files changed, 2003 insertions(+), 6 deletions(-) create mode 100644 ruoyi-ui/src/api/data/currentinventory.js create mode 100644 ruoyi-ui/src/views/data/currentinventory/index.vue create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/data/controller/DataCurrentinventoryController.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/data/domain/DataCurrentinventory.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/data/mapper/DataCurrentinventoryMapper.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/data/service/IDataCurrentinventoryService.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/data/service/impl/DataCurrentinventoryServiceImpl.java create mode 100644 ruoyi/src/main/resources/mybatis/data/DataCurrentinventoryMapper.xml diff --git a/ruoyi-ui/src/api/data/currentinventory.js b/ruoyi-ui/src/api/data/currentinventory.js new file mode 100644 index 000000000..133df4da7 --- /dev/null +++ b/ruoyi-ui/src/api/data/currentinventory.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询当前库存存储列表 +export function listCurrentinventory(query) { + return request({ + url: '/data/currentinventory/list', + method: 'get', + params: query + }) +} + +// 查询当前库存存储详细 +export function getCurrentinventory(id) { + return request({ + url: '/data/currentinventory/' + id, + method: 'get' + }) +} + +// 新增当前库存存储 +export function addCurrentinventory(data) { + return request({ + url: '/data/currentinventory', + method: 'post', + data: data + }) +} + +// 修改当前库存存储 +export function updateCurrentinventory(data) { + return request({ + url: '/data/currentinventory', + method: 'put', + data: data + }) +} + +// 删除当前库存存储 +export function delCurrentinventory(id) { + return request({ + url: '/data/currentinventory/' + id, + method: 'delete' + }) +} + +// 导出当前库存存储 +export function exportCurrentinventory(query) { + return request({ + url: '/data/currentinventory/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/data/currentinventory/index.vue b/ruoyi-ui/src/views/data/currentinventory/index.vue new file mode 100644 index 000000000..c748504f5 --- /dev/null +++ b/ruoyi-ui/src/views/data/currentinventory/index.vue @@ -0,0 +1,657 @@ + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 7bd290ad3..323f3e1ca 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -67,8 +67,8 @@ export default { loginForm: { username: "admin", password: "admin123", - rememberMe: false, - code: "", + rememberMe: true, + code: "6666", uuid: "" }, loginRules: { diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/data/controller/DataCurrentinventoryController.java b/ruoyi/src/main/java/com/ruoyi/project/mr/data/controller/DataCurrentinventoryController.java new file mode 100644 index 000000000..5d91b713b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/data/controller/DataCurrentinventoryController.java @@ -0,0 +1,97 @@ +package com.ruoyi.project.mr.data.controller; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.aspectj.lang.annotation.Log; +import com.ruoyi.framework.aspectj.lang.enums.BusinessType; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.project.mr.data.domain.DataCurrentinventory; +import com.ruoyi.project.mr.data.service.IDataCurrentinventoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 当前库存存储Controller + * + * @author mr + * @date 2020-01-14 + */ +@RestController +@RequestMapping("/data/currentinventory") +public class DataCurrentinventoryController extends BaseController +{ + @Autowired + private IDataCurrentinventoryService dataCurrentinventoryService; + + /** + * 查询当前库存存储列表 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:list')") + @GetMapping("/list") + public TableDataInfo list(DataCurrentinventory dataCurrentinventory) + { + startPage(); + List list = dataCurrentinventoryService.selectDataCurrentinventorySum(dataCurrentinventory); + return getDataTable(list); + } + + /** + * 导出当前库存存储列表 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:export')") + @Log(title = "当前库存存储", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DataCurrentinventory dataCurrentinventory) + { + List list = dataCurrentinventoryService.selectDataCurrentinventoryList(dataCurrentinventory); + ExcelUtil util = new ExcelUtil(DataCurrentinventory.class); + return util.exportExcel(list, "currentinventory"); + } + + /** + * 获取当前库存存储详细信息 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(dataCurrentinventoryService.selectDataCurrentinventoryById(id)); + } + + /** + * 新增当前库存存储 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:add')") + @Log(title = "当前库存存储", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DataCurrentinventory dataCurrentinventory) + { + return toAjax(dataCurrentinventoryService.insertDataCurrentinventory(dataCurrentinventory)); + } + + /** + * 修改当前库存存储 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:edit')") + @Log(title = "当前库存存储", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DataCurrentinventory dataCurrentinventory) + { + return toAjax(dataCurrentinventoryService.updateDataCurrentinventory(dataCurrentinventory)); + } + + /** + * 删除当前库存存储 + */ + @PreAuthorize("@ss.hasPermi('data:currentinventory:remove')") + @Log(title = "当前库存存储", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(dataCurrentinventoryService.deleteDataCurrentinventoryByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/data/domain/DataCurrentinventory.java b/ruoyi/src/main/java/com/ruoyi/project/mr/data/domain/DataCurrentinventory.java new file mode 100644 index 000000000..5e9d182d6 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/data/domain/DataCurrentinventory.java @@ -0,0 +1,667 @@ +package com.ruoyi.project.mr.data.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.framework.aspectj.lang.annotation.Excel; +import com.ruoyi.framework.web.domain.BaseEntity; +import java.util.Date; + +/** + * 当前库存存储对象 data_currentinventory + * + * @author mr + * @date 2020-01-14 + */ +public class DataCurrentinventory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** UUID */ + private String id; + + /** 记账日期 */ + @Excel(name = "记账日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date accountdate; + + /** 单号 */ + @Excel(name = "单号") + private String billnumber; + + /** 公司UUID */ + @Excel(name = "公司UUID") + private String companyuuid; + + /** 公司代码 */ + @Excel(name = "公司代码") + private String companyid; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyname; + + /** 工厂UUID */ + @Excel(name = "工厂UUID") + private String factoryuuid; + + /** 工厂代码 */ + @Excel(name = "工厂代码") + private String factoryid; + + /** 工厂名称 */ + @Excel(name = "工厂名称") + private String factoryname; + + /** 仓库UUID */ + @Excel(name = "仓库UUID") + private String warehouseuuid; + + /** 仓库代码 */ + @Excel(name = "仓库代码") + private String warehouseid; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehousename; + + /** 库位UUID */ + @Excel(name = "库位UUID") + private String locationuuid; + + /** 库位代码 */ + @Excel(name = "库位代码") + private String locationid; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String locationname; + + /** 商品UUID */ + @Excel(name = "商品UUID") + private String gooduuid; + + /** 商品代码 */ + @Excel(name = "商品代码") + private String goodid; + + /** 商品名称 */ + @Excel(name = "商品名称") + private String goodname; + + /** 计量单位名称 */ + @Excel(name = "计量单位名称") + private String unitname; + + /** 规格 */ + @Excel(name = "规格") + private String standard; + + /** 入库数量 */ + @Excel(name = "入库数量") + private Double inamount; + + /** 出库数量 */ + @Excel(name = "出库数量") + private Double outamount; + + /** 数量 */ + @Excel(name = "数量") + private Double amount; + + /** 冻结数量 */ + @Excel(name = "冻结数量") + private Double freezeamount; + + /** 批次管理 */ + @Excel(name = "批次管理") + private Integer isbatch; + + /** 批次单号 */ + @Excel(name = "批次单号") + private String batchbillnumber; + + /** 专供号 */ + @Excel(name = "专供号") + private String specialnumber; + + /** 类型 */ + @Excel(name = "类型") + private String type; + + /** 单据类型 */ + @Excel(name = "单据类型") + private String billtype; + + /** 创建人代码 */ + @Excel(name = "创建人代码") + private String createuserid; + + /** 创建人名称 */ + @Excel(name = "创建人名称") + private String createusername; + + /** 创建人时间 */ + @Excel(name = "创建人时间") + private String createtime; + + /** 单据类型名称 */ + @Excel(name = "单据类型名称") + private String billtypename; + + /** 类型名称 */ + @Excel(name = "类型名称") + private String typename; + + /** 生产日期 */ + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date productdate; + + /** 订单号 */ + @Excel(name = "订单号") + private String salebillnumber; + + /** 产地 */ + @Excel(name = "产地") + private String productionarea; + + /** 版本号 */ + @Excel(name = "版本号") + private String versionnumber; + + /** 客户UUID */ + @Excel(name = "客户UUID") + private String customeruuid; + + /** 客户代码 */ + @Excel(name = "客户代码") + private String customerid; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customername; + + /** 明细UUID */ + @Excel(name = "明细UUID") + private String detailuuid; + + /** 专供号代码 */ + @Excel(name = "专供号代码") + private String specialcode; + + /** 单据类型（入库、红冲、退库） */ + @Excel(name = "单据类型", readConverterExp = "入=库、红冲、退库") + private String billstatus; + + /** 仓储日期 */ + @Excel(name = "仓储日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date storedate; + + /** 数量 */ + @Excel(name = "可用数量") + private Double availableamount; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setAccountdate(Date accountdate) + { + this.accountdate = accountdate; + } + + public Date getAccountdate() + { + return accountdate; + } + public void setBillnumber(String billnumber) + { + this.billnumber = billnumber; + } + + public String getBillnumber() + { + return billnumber; + } + public void setCompanyuuid(String companyuuid) + { + this.companyuuid = companyuuid; + } + + public String getCompanyuuid() + { + return companyuuid; + } + public void setCompanyid(String companyid) + { + this.companyid = companyid; + } + + public String getCompanyid() + { + return companyid; + } + public void setCompanyname(String companyname) + { + this.companyname = companyname; + } + + public String getCompanyname() + { + return companyname; + } + public void setFactoryuuid(String factoryuuid) + { + this.factoryuuid = factoryuuid; + } + + public String getFactoryuuid() + { + return factoryuuid; + } + public void setFactoryid(String factoryid) + { + this.factoryid = factoryid; + } + + public String getFactoryid() + { + return factoryid; + } + public void setFactoryname(String factoryname) + { + this.factoryname = factoryname; + } + + public String getFactoryname() + { + return factoryname; + } + public void setWarehouseuuid(String warehouseuuid) + { + this.warehouseuuid = warehouseuuid; + } + + public String getWarehouseuuid() + { + return warehouseuuid; + } + public void setWarehouseid(String warehouseid) + { + this.warehouseid = warehouseid; + } + + public String getWarehouseid() + { + return warehouseid; + } + public void setWarehousename(String warehousename) + { + this.warehousename = warehousename; + } + + public String getWarehousename() + { + return warehousename; + } + public void setLocationuuid(String locationuuid) + { + this.locationuuid = locationuuid; + } + + public String getLocationuuid() + { + return locationuuid; + } + public void setLocationid(String locationid) + { + this.locationid = locationid; + } + + public String getLocationid() + { + return locationid; + } + public void setLocationname(String locationname) + { + this.locationname = locationname; + } + + public String getLocationname() + { + return locationname; + } + public void setGooduuid(String gooduuid) + { + this.gooduuid = gooduuid; + } + + public String getGooduuid() + { + return gooduuid; + } + public void setGoodid(String goodid) + { + this.goodid = goodid; + } + + public String getGoodid() + { + return goodid; + } + public void setGoodname(String goodname) + { + this.goodname = goodname; + } + + public String getGoodname() + { + return goodname; + } + public void setUnitname(String unitname) + { + this.unitname = unitname; + } + + public String getUnitname() + { + return unitname; + } + public void setStandard(String standard) + { + this.standard = standard; + } + + public String getStandard() + { + return standard; + } + public void setInamount(Double inamount) + { + this.inamount = inamount; + } + + public Double getInamount() + { + return inamount; + } + public void setOutamount(Double outamount) + { + this.outamount = outamount; + } + + public Double getOutamount() + { + return outamount; + } + public void setAmount(Double amount) + { + this.amount = amount; + } + + public Double getAmount() + { + return amount; + } + public void setFreezeamount(Double freezeamount) + { + this.freezeamount = freezeamount; + } + + public Double getFreezeamount() + { + return freezeamount; + } + public void setIsbatch(Integer isbatch) + { + this.isbatch = isbatch; + } + + public Integer getIsbatch() + { + return isbatch; + } + public void setBatchbillnumber(String batchbillnumber) + { + this.batchbillnumber = batchbillnumber; + } + + public String getBatchbillnumber() + { + return batchbillnumber; + } + public void setSpecialnumber(String specialnumber) + { + this.specialnumber = specialnumber; + } + + public String getSpecialnumber() + { + return specialnumber; + } + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + public void setBilltype(String billtype) + { + this.billtype = billtype; + } + + public String getBilltype() + { + return billtype; + } + public void setCreateuserid(String createuserid) + { + this.createuserid = createuserid; + } + + public String getCreateuserid() + { + return createuserid; + } + public void setCreateusername(String createusername) + { + this.createusername = createusername; + } + + public String getCreateusername() + { + return createusername; + } + public void setBilltypename(String billtypename) + { + this.billtypename = billtypename; + } + + public String getBilltypename() + { + return billtypename; + } + public void setTypename(String typename) + { + this.typename = typename; + } + + public String getTypename() + { + return typename; + } + public void setProductdate(Date productdate) + { + this.productdate = productdate; + } + + public Date getProductdate() + { + return productdate; + } + public void setSalebillnumber(String salebillnumber) + { + this.salebillnumber = salebillnumber; + } + + public String getSalebillnumber() + { + return salebillnumber; + } + public void setProductionarea(String productionarea) + { + this.productionarea = productionarea; + } + + public String getProductionarea() + { + return productionarea; + } + public void setVersionnumber(String versionnumber) + { + this.versionnumber = versionnumber; + } + + public String getVersionnumber() + { + return versionnumber; + } + public void setCustomeruuid(String customeruuid) + { + this.customeruuid = customeruuid; + } + + public String getCustomeruuid() + { + return customeruuid; + } + public void setCustomerid(String customerid) + { + this.customerid = customerid; + } + + public String getCustomerid() + { + return customerid; + } + public void setCustomername(String customername) + { + this.customername = customername; + } + + public String getCustomername() + { + return customername; + } + public void setDetailuuid(String detailuuid) + { + this.detailuuid = detailuuid; + } + + public String getDetailuuid() + { + return detailuuid; + } + public void setSpecialcode(String specialcode) + { + this.specialcode = specialcode; + } + + public String getSpecialcode() + { + return specialcode; + } + public void setBillstatus(String billstatus) + { + this.billstatus = billstatus; + } + + public String getBillstatus() + { + return billstatus; + } + public void setStoredate(Date storedate) + { + this.storedate = storedate; + } + + public Date getStoredate() + { + return storedate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("accountdate", getAccountdate()) + .append("billnumber", getBillnumber()) + .append("companyuuid", getCompanyuuid()) + .append("companyid", getCompanyid()) + .append("companyname", getCompanyname()) + .append("factoryuuid", getFactoryuuid()) + .append("factoryid", getFactoryid()) + .append("factoryname", getFactoryname()) + .append("warehouseuuid", getWarehouseuuid()) + .append("warehouseid", getWarehouseid()) + .append("warehousename", getWarehousename()) + .append("locationuuid", getLocationuuid()) + .append("locationid", getLocationid()) + .append("locationname", getLocationname()) + .append("gooduuid", getGooduuid()) + .append("goodid", getGoodid()) + .append("goodname", getGoodname()) + .append("unitname", getUnitname()) + .append("standard", getStandard()) + .append("inamount", getInamount()) + .append("outamount", getOutamount()) + .append("amount", getAmount()) + .append("freezeamount", getFreezeamount()) + .append("isbatch", getIsbatch()) + .append("batchbillnumber", getBatchbillnumber()) + .append("specialnumber", getSpecialnumber()) + .append("type", getType()) + .append("billtype", getBilltype()) + .append("remark", getRemark()) + .append("createuserid", getCreateuserid()) + .append("createusername", getCreateusername()) + .append("createtime", getCreatetime()) + .append("billtypename", getBilltypename()) + .append("typename", getTypename()) + .append("productdate", getProductdate()) + .append("salebillnumber", getSalebillnumber()) + .append("productionarea", getProductionarea()) + .append("versionnumber", getVersionnumber()) + .append("customeruuid", getCustomeruuid()) + .append("customerid", getCustomerid()) + .append("customername", getCustomername()) + .append("detailuuid", getDetailuuid()) + .append("specialcode", getSpecialcode()) + .append("billstatus", getBillstatus()) + .append("storedate", getStoredate()) + .append("availableamount", getAvailableamount()) + .toString(); + } + + public String getCreatetime() { + return createtime; + } + + public void setCreatetime(String createtime) { + this.createtime = createtime; + } + + public Double getAvailableamount() { + return availableamount; + } + + public void setAvailableamount(Double availableamount) { + this.availableamount = availableamount; + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/data/mapper/DataCurrentinventoryMapper.java b/ruoyi/src/main/java/com/ruoyi/project/mr/data/mapper/DataCurrentinventoryMapper.java new file mode 100644 index 000000000..9b3bbfa8b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/data/mapper/DataCurrentinventoryMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.project.mr.data.mapper; + +import com.ruoyi.project.mr.data.domain.DataCurrentinventory; +import java.util.List; + +/** + * 当前库存存储Mapper接口 + * + * @author mr + * @date 2020-01-14 + */ +public interface DataCurrentinventoryMapper +{ + /** + * 查询当前库存存储 + * + * @param id 当前库存存储ID + * @return 当前库存存储 + */ + public DataCurrentinventory selectDataCurrentinventoryById(String id); + + /** + * 查询当前库存存储列表 + * + * @param dataCurrentinventory 当前库存存储 + * @return 当前库存存储集合 + */ + public List selectDataCurrentinventoryList(DataCurrentinventory dataCurrentinventory); + + /** + * 查询当前库存存储整合列表 + * + * @param dataCurrentinventory 当前库存存储整合 + * @return 当前库存存储集合 + */ + public List selectDataCurrentinventorySum(DataCurrentinventory dataCurrentinventory); + + /** + * 新增当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + public int insertDataCurrentinventory(DataCurrentinventory dataCurrentinventory); + + /** + * 修改当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + public int updateDataCurrentinventory(DataCurrentinventory dataCurrentinventory); + + /** + * 删除当前库存存储 + * + * @param id 当前库存存储ID + * @return 结果 + */ + public int deleteDataCurrentinventoryById(String id); + + /** + * 批量删除当前库存存储 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDataCurrentinventoryByIds(String[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/IDataCurrentinventoryService.java b/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/IDataCurrentinventoryService.java new file mode 100644 index 000000000..ff38957ce --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/IDataCurrentinventoryService.java @@ -0,0 +1,69 @@ +package com.ruoyi.project.mr.data.service; + +import com.ruoyi.project.mr.data.domain.DataCurrentinventory; +import java.util.List; + +/** + * 当前库存存储Service接口 + * + * @author mr + * @date 2020-01-14 + */ +public interface IDataCurrentinventoryService +{ + /** + * 查询当前库存存储 + * + * @param id 当前库存存储ID + * @return 当前库存存储 + */ + public DataCurrentinventory selectDataCurrentinventoryById(String id); + + /** + * 查询当前库存存储列表 + * + * @param dataCurrentinventory 当前库存存储 + * @return 当前库存存储集合 + */ + public List selectDataCurrentinventoryList(DataCurrentinventory dataCurrentinventory); + + /** + * 查询当前库存存储整合 + * + * @param dataCurrentinventory 当前库存存储 + * @return 当前库存存储集合 + */ + public List selectDataCurrentinventorySum(DataCurrentinventory dataCurrentinventory); + + /** + * 新增当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + public int insertDataCurrentinventory(DataCurrentinventory dataCurrentinventory); + + /** + * 修改当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + public int updateDataCurrentinventory(DataCurrentinventory dataCurrentinventory); + + /** + * 批量删除当前库存存储 + * + * @param ids 需要删除的当前库存存储ID + * @return 结果 + */ + public int deleteDataCurrentinventoryByIds(String[] ids); + + /** + * 删除当前库存存储信息 + * + * @param id 当前库存存储ID + * @return 结果 + */ + public int deleteDataCurrentinventoryById(String id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/impl/DataCurrentinventoryServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/impl/DataCurrentinventoryServiceImpl.java new file mode 100644 index 000000000..f5ff3e014 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/data/service/impl/DataCurrentinventoryServiceImpl.java @@ -0,0 +1,106 @@ +package com.ruoyi.project.mr.data.service.impl; + +import com.ruoyi.project.mr.data.domain.DataCurrentinventory; +import com.ruoyi.project.mr.data.mapper.DataCurrentinventoryMapper; +import com.ruoyi.project.mr.data.service.IDataCurrentinventoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 当前库存存储Service业务层处理 + * + * @author mr + * @date 2020-01-14 + */ +@Service +public class DataCurrentinventoryServiceImpl implements IDataCurrentinventoryService +{ + @Autowired + private DataCurrentinventoryMapper dataCurrentinventoryMapper; + + /** + * 查询当前库存存储 + * + * @param id 当前库存存储ID + * @return 当前库存存储 + */ + @Override + public DataCurrentinventory selectDataCurrentinventoryById(String id) + { + return dataCurrentinventoryMapper.selectDataCurrentinventoryById(id); + } + + /** + * 查询当前库存存储列表 + * + * @param dataCurrentinventory 当前库存存储 + * @return 当前库存存储 + */ + @Override + public List selectDataCurrentinventoryList(DataCurrentinventory dataCurrentinventory) + { + return dataCurrentinventoryMapper.selectDataCurrentinventoryList(dataCurrentinventory); + } + + /** + * 查询当前库存存储整合 + * + * @param dataCurrentinventory 当前库存存储 + * @return 当前库存存储 + */ + @Override + public List selectDataCurrentinventorySum(DataCurrentinventory dataCurrentinventory) + { + return dataCurrentinventoryMapper.selectDataCurrentinventorySum(dataCurrentinventory); + } + + /** + * 新增当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + @Override + public int insertDataCurrentinventory(DataCurrentinventory dataCurrentinventory) + { + return dataCurrentinventoryMapper.insertDataCurrentinventory(dataCurrentinventory); + } + + /** + * 修改当前库存存储 + * + * @param dataCurrentinventory 当前库存存储 + * @return 结果 + */ + @Override + public int updateDataCurrentinventory(DataCurrentinventory dataCurrentinventory) + { + return dataCurrentinventoryMapper.updateDataCurrentinventory(dataCurrentinventory); + } + + /** + * 批量删除当前库存存储 + * + * @param ids 需要删除的当前库存存储ID + * @return 结果 + */ + @Override + public int deleteDataCurrentinventoryByIds(String[] ids) + { + return dataCurrentinventoryMapper.deleteDataCurrentinventoryByIds(ids); + } + + /** + * 删除当前库存存储信息 + * + * @param id 当前库存存储ID + * @return 结果 + */ + @Override + public int deleteDataCurrentinventoryById(String id) + { + return dataCurrentinventoryMapper.deleteDataCurrentinventoryById(id); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java b/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java index d12bc55bb..e0f6b50cc 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java @@ -23,8 +23,8 @@ public class TestController extends BaseController { private final static Map users = new LinkedHashMap(); { - users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); - users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); + users.put(1, new UserEntity(1, "admin", "admin123", "15888888888","头像1")); + users.put(2, new UserEntity(2, "ry", "admin123", "15666666666","头像2")); } @ApiOperation("获取用户列表") @@ -111,17 +111,21 @@ class UserEntity @ApiModelProperty("用户手机") private String mobile; + @ApiModelProperty("用户头像") + private String avatar; + public UserEntity() { } - public UserEntity(Integer userId, String username, String password, String mobile) + public UserEntity(Integer userId, String username, String password, String mobile,String avatar) { this.userId = userId; this.username = username; this.password = password; this.mobile = mobile; + this.avatar = avatar; } public Integer getUserId() @@ -163,4 +167,12 @@ class UserEntity { this.mobile = mobile; } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } } diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index 086d2adea..7041eee9d 100644 --- a/ruoyi/src/main/resources/application.yml +++ b/ruoyi/src/main/resources/application.yml @@ -89,7 +89,7 @@ xss: # 排除链接（多个用逗号分隔） excludes: /system/notice/* # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/*,/base/* + urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/data/* # 代码生成 gen: diff --git a/ruoyi/src/main/resources/mybatis/data/DataCurrentinventoryMapper.xml b/ruoyi/src/main/resources/mybatis/data/DataCurrentinventoryMapper.xml new file mode 100644 index 000000000..342b2d6f5 --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/data/DataCurrentinventoryMapper.xml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, AccountDate, Billnumber, CompanyUUID, CompanyID, CompanyName, FactoryUUID, FactoryID, FactoryName, WarehouseUUID, WarehouseID, WarehouseName, LocationUUID, LocationID, LocationName, GoodUUID, GoodID, GoodName, UnitName, Standard, InAmount, OutAmount, Amount, FreezeAmount, IsBatch, BatchBillnumber, SpecialNumber, Type, BillType, Remark, CreateUserID, CreateUserName, CreateTime, BillTypeName, TypeName, ProductDate, SaleBillnumber, ProductionArea, VersionNumber, CustomerUUID, CustomerID, CustomerName, DetailUUID, SpecialCode, BillStatus, StoreDate from data_currentinventory + + + + + + + + + + + insert into data_currentinventory + + ID, + AccountDate, + Billnumber, + CompanyUUID, + CompanyID, + CompanyName, + FactoryUUID, + FactoryID, + FactoryName, + WarehouseUUID, + WarehouseID, + WarehouseName, + LocationUUID, + LocationID, + LocationName, + GoodUUID, + GoodID, + GoodName, + UnitName, + Standard, + InAmount, + OutAmount, + Amount, + FreezeAmount, + IsBatch, + BatchBillnumber, + SpecialNumber, + Type, + BillType, + Remark, + CreateUserID, + CreateUserName, + CreateTime, + BillTypeName, + TypeName, + ProductDate, + SaleBillnumber, + ProductionArea, + VersionNumber, + CustomerUUID, + CustomerID, + CustomerName, + DetailUUID, + SpecialCode, + BillStatus, + StoreDate, + + + #{id}, + #{accountdate}, + #{billnumber}, + #{companyuuid}, + #{companyid}, + #{companyname}, + #{factoryuuid}, + #{factoryid}, + #{factoryname}, + #{warehouseuuid}, + #{warehouseid}, + #{warehousename}, + #{locationuuid}, + #{locationid}, + #{locationname}, + #{gooduuid}, + #{goodid}, + #{goodname}, + #{unitname}, + #{standard}, + #{inamount}, + #{outamount}, + #{amount}, + #{freezeamount}, + #{isbatch}, + #{batchbillnumber}, + #{specialnumber}, + #{type}, + #{billtype}, + #{remark}, + #{createuserid}, + #{createusername}, + #{createtime}, + #{billtypename}, + #{typename}, + #{productdate}, + #{salebillnumber}, + #{productionarea}, + #{versionnumber}, + #{customeruuid}, + #{customerid}, + #{customername}, + #{detailuuid}, + #{specialcode}, + #{billstatus}, + #{storedate}, + + + + + update data_currentinventory + + AccountDate = #{accountdate}, + Billnumber = #{billnumber}, + CompanyUUID = #{companyuuid}, + CompanyID = #{companyid}, + CompanyName = #{companyname}, + FactoryUUID = #{factoryuuid}, + FactoryID = #{factoryid}, + FactoryName = #{factoryname}, + WarehouseUUID = #{warehouseuuid}, + WarehouseID = #{warehouseid}, + WarehouseName = #{warehousename}, + LocationUUID = #{locationuuid}, + LocationID = #{locationid}, + LocationName = #{locationname}, + GoodUUID = #{gooduuid}, + GoodID = #{goodid}, + GoodName = #{goodname}, + UnitName = #{unitname}, + Standard = #{standard}, + InAmount = #{inamount}, + OutAmount = #{outamount}, + Amount = #{amount}, + FreezeAmount = #{freezeamount}, + IsBatch = #{isbatch}, + BatchBillnumber = #{batchbillnumber}, + SpecialNumber = #{specialnumber}, + Type = #{type}, + BillType = #{billtype}, + Remark = #{remark}, + CreateUserID = #{createuserid}, + CreateUserName = #{createusername}, + CreateTime = #{createtime}, + BillTypeName = #{billtypename}, + TypeName = #{typename}, + ProductDate = #{productdate}, + SaleBillnumber = #{salebillnumber}, + ProductionArea = #{productionarea}, + VersionNumber = #{versionnumber}, + CustomerUUID = #{customeruuid}, + CustomerID = #{customerid}, + CustomerName = #{customername}, + DetailUUID = #{detailuuid}, + SpecialCode = #{specialcode}, + BillStatus = #{billstatus}, + StoreDate = #{storedate}, + + where ID = #{id} + + + + delete from data_currentinventory where ID = #{id} + + + + delete from data_currentinventory where ID in + + #{id} + + + +