From 0cc2be243b9523a4cb93608d6f5f83658a5174e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com> Date: Fri, 10 Sep 2021 10:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?= =?UTF-8?q?=20=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BaseMaterialInfoController.java | 129 +++++++++++++++ .../ruoyi/web/controller/tool/UUIDTool.java | 16 ++ .../system/basematerialInfo/add.html | 84 ++++++++++ .../basematerialInfo/basematerialInfo.html | 118 ++++++++++++++ .../system/basematerialInfo/edit.html | 85 ++++++++++ .../ruoyi/system/domain/BaseMaterialInfo.java | 152 ++++++++++++++++++ .../system/mapper/BaseMaterialInfoMapper.java | 61 +++++++ .../service/IBaseMaterialInfoService.java | 61 +++++++ .../impl/BaseMaterialInfoServiceImpl.java | 94 +++++++++++ .../mapper/system/BaseMaterialInfoMapper.xml | 96 +++++++++++ 10 files changed, 896 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/basematerialInfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/basematerialInfo/basematerialInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/basematerialInfo/edit.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialInfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialInfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialInfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/BaseMaterialInfoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialInfoController.java new file mode 100644 index 0000000..205829e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialInfoController.java @@ -0,0 +1,129 @@ +package com.ruoyi.web.controller.basic; + +import java.util.List; + +import com.ruoyi.web.controller.tool.UUIDTool; +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.system.domain.BaseMaterialInfo; +import com.ruoyi.system.service.IBaseMaterialInfoService; +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 Frank zhou + * @date 2021-09-10 + */ +@Controller +@RequestMapping("/system/basematerialInfo") +public class BaseMaterialInfoController extends BaseController +{ + private String prefix = "system/basematerialInfo"; + + @Autowired + private IBaseMaterialInfoService baseMaterialInfoService; + + @RequiresPermissions("system:basematerialInfo:view") + @GetMapping() + public String basematerialInfo() + { + return prefix + "/basematerialInfo"; + } + + /** + * 查询物料信息列表 + */ + @RequiresPermissions("system:basematerialInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseMaterialInfo baseMaterialInfo) + { + startPage(); + List list = baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo); + return getDataTable(list); + } + + /** + * 导出物料信息列表 + */ + @RequiresPermissions("system:basematerialInfo:export") + @Log(title = "物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseMaterialInfo baseMaterialInfo) + { + List list = baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo); + ExcelUtil util = new ExcelUtil(BaseMaterialInfo.class); + return util.exportExcel(list, "物料信息数据"); + } + + /** + * 新增物料信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存物料信息 + */ + @RequiresPermissions("system:basematerialInfo:add") + @Log(title = "物料信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseMaterialInfo baseMaterialInfo) + { + baseMaterialInfo.setObjid(UUIDTool.generate()); + return toAjax(baseMaterialInfoService.insertBaseMaterialInfo(baseMaterialInfo)); + } + + /** + * 修改物料信息 + */ + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") String objid, ModelMap mmap) + { + BaseMaterialInfo baseMaterialInfo = baseMaterialInfoService.selectBaseMaterialInfoByObjid(objid); + mmap.put("baseMaterialInfo", baseMaterialInfo); + return prefix + "/edit"; + } + + /** + * 修改保存物料信息 + */ + @RequiresPermissions("system:basematerialInfo:edit") + @Log(title = "物料信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseMaterialInfo baseMaterialInfo) + { + return toAjax(baseMaterialInfoService.updateBaseMaterialInfo(baseMaterialInfo)); + } + + /** + * 删除物料信息 + */ + @RequiresPermissions("system:basematerialInfo:remove") + @Log(title = "物料信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseMaterialInfoService.deleteBaseMaterialInfoByObjids(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java new file mode 100644 index 0000000..9a92743 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UUIDTool.java @@ -0,0 +1,16 @@ +package com.ruoyi.web.controller.tool; + +/** + * @Author Frankzhou + * @Date 2021/9/10 9:47 + * @Description + */ + +import java.util.UUID; + +public class UUIDTool { + + public static String generate(){ + return String.valueOf(UUID.randomUUID()); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/add.html b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/add.html new file mode 100644 index 0000000..0e6c89d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/add.html @@ -0,0 +1,84 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/basematerialInfo.html b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/basematerialInfo.html new file mode 100644 index 0000000..d7e8e14 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/basematerialInfo.html @@ -0,0 +1,118 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/edit.html new file mode 100644 index 0000000..cd8060b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialInfo/edit.html @@ -0,0 +1,85 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java new file mode 100644 index 0000000..863d64a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialInfo.java @@ -0,0 +1,152 @@ +package com.ruoyi.system.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; + +/** + * 物料信息对象 base_material_info + * + * @author Frank zhou + * @date 2021-09-10 + */ +public class BaseMaterialInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String objid; + + /** 物料类别编码 */ + @Excel(name = "物料类别编码") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料类别 */ + @Excel(name = "物料类别") + private String materialType; + + /** 物料尺寸 */ + @Excel(name = "物料尺寸") + private Long materialSize; + + /** 物料高度 */ + @Excel(name = "物料高度") + private Long materialHeight; + + /** 物料重量 */ + @Excel(name = "物料重量") + private Long materialWeight; + + /** 删除标志 */ + private Long deleteFlag; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date recordTime; + + public void setObjid(String objid) + { + this.objid = objid; + } + + public String getObjid() + { + return objid; + } + public void setMaterialCode(String materialCode) + { + this.materialCode = materialCode; + } + + public String getMaterialCode() + { + return materialCode; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setMaterialSize(Long materialSize) + { + this.materialSize = materialSize; + } + + public Long getMaterialSize() + { + return materialSize; + } + public void setMaterialHeight(Long materialHeight) + { + this.materialHeight = materialHeight; + } + + public Long getMaterialHeight() + { + return materialHeight; + } + public void setMaterialWeight(Long materialWeight) + { + this.materialWeight = materialWeight; + } + + public Long getMaterialWeight() + { + return materialWeight; + } + public void setDeleteFlag(Long deleteFlag) + { + this.deleteFlag = deleteFlag; + } + + public Long getDeleteFlag() + { + return deleteFlag; + } + public void setRecordTime(Date recordTime) + { + this.recordTime = recordTime; + } + + public Date getRecordTime() + { + return recordTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("materialSize", getMaterialSize()) + .append("materialHeight", getMaterialHeight()) + .append("materialWeight", getMaterialWeight()) + .append("remark", getRemark()) + .append("deleteFlag", getDeleteFlag()) + .append("recordTime", getRecordTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialInfoMapper.java new file mode 100644 index 0000000..ac252cb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseMaterialInfo; + +/** + * 物料信息Mapper接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface BaseMaterialInfoMapper +{ + /** + * 查询物料信息 + * + * @param objid 物料信息主键 + * @return 物料信息 + */ + public BaseMaterialInfo selectBaseMaterialInfoByObjid(String objid); + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo); + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 删除物料信息 + * + * @param objid 物料信息主键 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjid(String objid); + + /** + * 批量删除物料信息 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjids(String[] objids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialInfoService.java new file mode 100644 index 0000000..44702d9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseMaterialInfo; + +/** + * 物料信息Service接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface IBaseMaterialInfoService +{ + /** + * 查询物料信息 + * + * @param objid 物料信息主键 + * @return 物料信息 + */ + public BaseMaterialInfo selectBaseMaterialInfoByObjid(String objid); + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo); + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo); + + /** + * 批量删除物料信息 + * + * @param objids 需要删除的物料信息主键集合 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjids(String objids); + + /** + * 删除物料信息信息 + * + * @param objid 物料信息主键 + * @return 结果 + */ + public int deleteBaseMaterialInfoByObjid(String objid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialInfoServiceImpl.java new file mode 100644 index 0000000..c33c764 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialInfoServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseMaterialInfoMapper; +import com.ruoyi.system.domain.BaseMaterialInfo; +import com.ruoyi.system.service.IBaseMaterialInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 物料信息Service业务层处理 + * + * @author Frank zhou + * @date 2021-09-10 + */ +@Service +public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService +{ + @Autowired + private BaseMaterialInfoMapper baseMaterialInfoMapper; + + /** + * 查询物料信息 + * + * @param objid 物料信息主键 + * @return 物料信息 + */ + @Override + public BaseMaterialInfo selectBaseMaterialInfoByObjid(String objid) + { + return baseMaterialInfoMapper.selectBaseMaterialInfoByObjid(objid); + } + + /** + * 查询物料信息列表 + * + * @param baseMaterialInfo 物料信息 + * @return 物料信息 + */ + @Override + public List selectBaseMaterialInfoList(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.selectBaseMaterialInfoList(baseMaterialInfo); + } + + /** + * 新增物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int insertBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.insertBaseMaterialInfo(baseMaterialInfo); + } + + /** + * 修改物料信息 + * + * @param baseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int updateBaseMaterialInfo(BaseMaterialInfo baseMaterialInfo) + { + return baseMaterialInfoMapper.updateBaseMaterialInfo(baseMaterialInfo); + } + + /** + * 批量删除物料信息 + * + * @param objids 需要删除的物料信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialInfoByObjids(String objids) + { + return baseMaterialInfoMapper.deleteBaseMaterialInfoByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除物料信息信息 + * + * @param objid 物料信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialInfoByObjid(String objid) + { + return baseMaterialInfoMapper.deleteBaseMaterialInfoByObjid(objid); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialInfoMapper.xml new file mode 100644 index 0000000..2a7c42d --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialInfoMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + select objid, material_code, material_name, material_type, material_size, material_height, material_weight, remark, delete_flag, record_time from base_material_info + + + + + + + + + insert into base_material_info + + objid, + material_code, + material_name, + material_type, + material_size, + material_height, + material_weight, + remark, + delete_flag, + record_time, + + + #{objid}, + #{materialCode}, + #{materialName}, + #{materialType}, + #{materialSize}, + #{materialHeight}, + #{materialWeight}, + #{remark}, + #{deleteFlag}, + #{recordTime}, + + + + + update base_material_info + + material_code = #{materialCode}, + material_name = #{materialName}, + material_type = #{materialType}, + material_size = #{materialSize}, + material_height = #{materialHeight}, + material_weight = #{materialWeight}, + remark = #{remark}, + delete_flag = #{deleteFlag}, + record_time = #{recordTime}, + + where objid = #{objid} + + + + delete from base_material_info where objid = #{objid} + + + + update base_material_info set delete_flag = 1 + where objid in + + #{objid} + + + \ No newline at end of file