From 0e7731f7b669c41f8f5e5f55326753fc80456f4e Mon Sep 17 00:00:00 2001 From: wangcl Date: Fri, 24 Dec 2021 20:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=93=8D=E4=BD=9C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusiMaterialOperateController.java | 126 ++++++++++++++++++ .../busi/domain/BusiMaterialOperate.java | 82 ++++++++++++ .../mapper/BusiMaterialOperateMapper.java | 61 +++++++++ .../service/IBusiMaterialOperateService.java | 61 +++++++++ .../impl/BusiMaterialOperateServiceImpl.java | 96 +++++++++++++ .../mapper/busi/BusiMaterialOperateMapper.xml | 80 +++++++++++ .../templates/busi/materialperate/add.html | 52 ++++++++ .../templates/busi/materialperate/edit.html | 53 ++++++++ .../busi/materialperate/materialperate.html | 119 +++++++++++++++++ sql/tmp.sql | 26 ++++ 10 files changed, 756 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialOperate.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiMaterialOperateMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiMaterialOperateService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiMaterialOperateServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/materialperate/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java new file mode 100644 index 000000000..b6f60e1f5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java @@ -0,0 +1,126 @@ +package com.ruoyi.busi.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.busi.domain.BusiMaterialOperate; +import com.ruoyi.busi.service.IBusiMaterialOperateService; +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 WangCL + * @date 2021-12-24 + */ +@Controller +@RequestMapping("/busi/materialperate") +public class BusiMaterialOperateController extends BaseController +{ + private String prefix = "busi/materialperate"; + + @Autowired + private IBusiMaterialOperateService busiMaterialOperateService; + + @RequiresPermissions("busi:materialperate:view") + @GetMapping() + public String materialperate() + { + return prefix + "/materialperate"; + } + + /** + * 查询物料操作流水列表 + */ + @RequiresPermissions("busi:materialperate:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BusiMaterialOperate busiMaterialOperate) + { + startPage(); + List list = busiMaterialOperateService.selectBusiMaterialOperateList(busiMaterialOperate); + return getDataTable(list); + } + + /** + * 导出物料操作流水列表 + */ + @RequiresPermissions("busi:materialperate:export") + @Log(title = "物料操作流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BusiMaterialOperate busiMaterialOperate) + { + List list = busiMaterialOperateService.selectBusiMaterialOperateList(busiMaterialOperate); + ExcelUtil util = new ExcelUtil(BusiMaterialOperate.class); + return util.exportExcel(list, "物料操作流水数据"); + } + + /** + * 新增物料操作流水 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存物料操作流水 + */ + @RequiresPermissions("busi:materialperate:add") + @Log(title = "物料操作流水", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BusiMaterialOperate busiMaterialOperate) + { + return toAjax(busiMaterialOperateService.insertBusiMaterialOperate(busiMaterialOperate)); + } + + /** + * 修改物料操作流水 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BusiMaterialOperate busiMaterialOperate = busiMaterialOperateService.selectBusiMaterialOperateById(id); + mmap.put("busiMaterialOperate", busiMaterialOperate); + return prefix + "/edit"; + } + + /** + * 修改保存物料操作流水 + */ + @RequiresPermissions("busi:materialperate:edit") + @Log(title = "物料操作流水", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BusiMaterialOperate busiMaterialOperate) + { + return toAjax(busiMaterialOperateService.updateBusiMaterialOperate(busiMaterialOperate)); + } + + /** + * 删除物料操作流水 + */ + @RequiresPermissions("busi:materialperate:remove") + @Log(title = "物料操作流水", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(busiMaterialOperateService.deleteBusiMaterialOperateByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialOperate.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialOperate.java new file mode 100644 index 000000000..a61592662 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialOperate.java @@ -0,0 +1,82 @@ +package com.ruoyi.busi.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 物料操作流水对象 busi_material_operate + * + * @author WangCL + * @date 2021-12-24 + */ +public class BusiMaterialOperate extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID主键 */ + private Long id; + + /** 订单 */ + @Excel(name = "订单") + private String materialStockId; + + /** 操作数量 */ + @Excel(name = "操作数量") + private Long amount; + + /** 操作类型 */ + @Excel(name = "操作类型") + private String oprateType; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMaterialStockId(String materialStockId) + { + this.materialStockId = materialStockId; + } + + public String getMaterialStockId() + { + return materialStockId; + } + public void setAmount(Long amount) + { + this.amount = amount; + } + + public Long getAmount() + { + return amount; + } + public void setOprateType(String oprateType) + { + this.oprateType = oprateType; + } + + public String getOprateType() + { + return oprateType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("materialStockId", getMaterialStockId()) + .append("amount", getAmount()) + .append("oprateType", getOprateType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiMaterialOperateMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiMaterialOperateMapper.java new file mode 100644 index 000000000..9ff43acb3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiMaterialOperateMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import com.ruoyi.busi.domain.BusiMaterialOperate; + +/** + * 物料操作流水Mapper接口 + * + * @author WangCL + * @date 2021-12-24 + */ +public interface BusiMaterialOperateMapper +{ + /** + * 查询物料操作流水 + * + * @param id 物料操作流水主键 + * @return 物料操作流水 + */ + public BusiMaterialOperate selectBusiMaterialOperateById(Long id); + + /** + * 查询物料操作流水列表 + * + * @param busiMaterialOperate 物料操作流水 + * @return 物料操作流水集合 + */ + public List selectBusiMaterialOperateList(BusiMaterialOperate busiMaterialOperate); + + /** + * 新增物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate); + + /** + * 修改物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + public int updateBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate); + + /** + * 删除物料操作流水 + * + * @param id 物料操作流水主键 + * @return 结果 + */ + public int deleteBusiMaterialOperateById(Long id); + + /** + * 批量删除物料操作流水 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusiMaterialOperateByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiMaterialOperateService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiMaterialOperateService.java new file mode 100644 index 000000000..1800fe06d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiMaterialOperateService.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import com.ruoyi.busi.domain.BusiMaterialOperate; + +/** + * 物料操作流水Service接口 + * + * @author WangCL + * @date 2021-12-24 + */ +public interface IBusiMaterialOperateService +{ + /** + * 查询物料操作流水 + * + * @param id 物料操作流水主键 + * @return 物料操作流水 + */ + public BusiMaterialOperate selectBusiMaterialOperateById(Long id); + + /** + * 查询物料操作流水列表 + * + * @param busiMaterialOperate 物料操作流水 + * @return 物料操作流水集合 + */ + public List selectBusiMaterialOperateList(BusiMaterialOperate busiMaterialOperate); + + /** + * 新增物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate); + + /** + * 修改物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + public int updateBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate); + + /** + * 批量删除物料操作流水 + * + * @param ids 需要删除的物料操作流水主键集合 + * @return 结果 + */ + public int deleteBusiMaterialOperateByIds(String ids); + + /** + * 删除物料操作流水信息 + * + * @param id 物料操作流水主键 + * @return 结果 + */ + public int deleteBusiMaterialOperateById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiMaterialOperateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiMaterialOperateServiceImpl.java new file mode 100644 index 000000000..a699f11b3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiMaterialOperateServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.busi.mapper.BusiMaterialOperateMapper; +import com.ruoyi.busi.domain.BusiMaterialOperate; +import com.ruoyi.busi.service.IBusiMaterialOperateService; +import com.ruoyi.common.core.text.Convert; + +/** + * 物料操作流水Service业务层处理 + * + * @author WangCL + * @date 2021-12-24 + */ +@Service +public class BusiMaterialOperateServiceImpl implements IBusiMaterialOperateService +{ + @Autowired + private BusiMaterialOperateMapper busiMaterialOperateMapper; + + /** + * 查询物料操作流水 + * + * @param id 物料操作流水主键 + * @return 物料操作流水 + */ + @Override + public BusiMaterialOperate selectBusiMaterialOperateById(Long id) + { + return busiMaterialOperateMapper.selectBusiMaterialOperateById(id); + } + + /** + * 查询物料操作流水列表 + * + * @param busiMaterialOperate 物料操作流水 + * @return 物料操作流水 + */ + @Override + public List selectBusiMaterialOperateList(BusiMaterialOperate busiMaterialOperate) + { + return busiMaterialOperateMapper.selectBusiMaterialOperateList(busiMaterialOperate); + } + + /** + * 新增物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + @Override + public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) + { + busiMaterialOperate.setCreateTime(DateUtils.getNowDate()); + return busiMaterialOperateMapper.insertBusiMaterialOperate(busiMaterialOperate); + } + + /** + * 修改物料操作流水 + * + * @param busiMaterialOperate 物料操作流水 + * @return 结果 + */ + @Override + public int updateBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) + { + return busiMaterialOperateMapper.updateBusiMaterialOperate(busiMaterialOperate); + } + + /** + * 批量删除物料操作流水 + * + * @param ids 需要删除的物料操作流水主键 + * @return 结果 + */ + @Override + public int deleteBusiMaterialOperateByIds(String ids) + { + return busiMaterialOperateMapper.deleteBusiMaterialOperateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除物料操作流水信息 + * + * @param id 物料操作流水主键 + * @return 结果 + */ + @Override + public int deleteBusiMaterialOperateById(Long id) + { + return busiMaterialOperateMapper.deleteBusiMaterialOperateById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml new file mode 100644 index 000000000..f03f697c2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiMaterialOperateMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + select id, material_stock_id, amount, oprate_type, create_by, create_time, remark from busi_material_operate + + + + + + + + insert into busi_material_operate + + material_stock_id, + amount, + oprate_type, + create_by, + create_time, + remark, + + + #{materialStockId}, + #{amount}, + #{oprateType}, + #{createBy}, + #{createTime}, + #{remark}, + + + + + update busi_material_operate + + material_stock_id = #{materialStockId}, + amount = #{amount}, + oprate_type = #{oprateType}, + create_by = #{createBy}, + create_time = #{createTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from busi_material_operate where id = #{id} + + + + delete from busi_material_operate where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html new file mode 100644 index 000000000..8cde6899a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html @@ -0,0 +1,52 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/edit.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/edit.html new file mode 100644 index 000000000..338d04fdf --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/edit.html @@ -0,0 +1,53 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html new file mode 100644 index 000000000..a63425bee --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html @@ -0,0 +1,119 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/sql/tmp.sql b/sql/tmp.sql index e91347409..1ec935f34 100644 --- a/sql/tmp.sql +++ b/sql/tmp.sql @@ -119,3 +119,29 @@ values('产品需求删除', @parentId, '4', '#', 'F', '0', 'busi:productRequi insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) values('产品需求导出', @parentId, '5', '#', 'F', '0', 'busi:productRequire:export', '#', 'admin', sysdate(), '', null, ''); + + + + +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水', '118', '1', '/busi/materialperate', 'C', '0', 'busi:materialperate:view', '#', 'admin', sysdate(), '', null, '物料操作流水菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水查询', @parentId, '1', '#', 'F', '0', 'busi:materialperate:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水新增', @parentId, '2', '#', 'F', '0', 'busi:materialperate:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水修改', @parentId, '3', '#', 'F', '0', 'busi:materialperate:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水删除', @parentId, '4', '#', 'F', '0', 'busi:materialperate:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('物料操作流水导出', @parentId, '5', '#', 'F', '0', 'busi:materialperate:export', '#', 'admin', sysdate(), '', null, '');