From a683f2a91403cfd015c6a72bbc1520b33a1e4286 Mon Sep 17 00:00:00 2001
From: wangziyangyang <707231019@qq.com>
Date: Fri, 20 Mar 2020 09:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=89=A9=E6=96=99=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basedata/controller/SpFlowController.java | 20 ++
.../SpFlowOperRelationController.java | 1 +
.../controller/SpMaterileController.java | 87 ++++++
.../mes/basedata/entity/SpMaterile.java | 263 ++++++++++++++++++
.../mes/basedata/mapper/SpMaterileMapper.java | 16 ++
.../basedata/service/ISpMaterileService.java | 16 ++
.../service/impl/SpMaterileServiceImpl.java | 20 ++
.../mapper/basedata/SpMaterileMapper.xml | 5 +
.../basedata/materile/addOrUpdate.ftl | 161 +++++++++++
.../templates/basedata/materile/list.ftl | 183 ++++++++++++
10 files changed, 772 insertions(+)
create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java
create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/entity/SpMaterile.java
create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpMaterileMapper.java
create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/service/ISpMaterileService.java
create mode 100644 mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpMaterileServiceImpl.java
create mode 100644 mes/src/main/resources/mapper/basedata/SpMaterileMapper.xml
create mode 100644 mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
create mode 100644 mes/src/main/resources/templates/basedata/materile/list.ftl
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowController.java
index 32a62e1..be5fdac 100644
--- a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowController.java
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowController.java
@@ -1,7 +1,9 @@
package com.wangziyang.mes.basedata.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.wangziyang.mes.basedata.entity.SpFlow;
import com.wangziyang.mes.basedata.request.SpFlowReq;
import com.wangziyang.mes.basedata.service.ISpFlowService;
import com.wangziyang.mes.common.BaseController;
@@ -11,10 +13,13 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.List;
+
/**
*
* 流程控制器
@@ -46,4 +51,19 @@ public class SpFlowController extends BaseController {
}
+ /**
+ * 流程全部信息查询
+ *
+ * @return Result 执行结果
+ */
+ @ApiOperation("流程全部信息查询")
+ @GetMapping("/list")
+ @ResponseBody
+ public Result list() {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ //queryWrapper.eq("is_deleted", "0");
+ List list = iSpFlowService.list(queryWrapper);
+ return Result.success(list);
+ }
+
}
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowOperRelationController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowOperRelationController.java
index 605761f..78d85e4 100644
--- a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowOperRelationController.java
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpFlowOperRelationController.java
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
+
import java.util.List;
/**
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java
new file mode 100644
index 0000000..55b43f9
--- /dev/null
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java
@@ -0,0 +1,87 @@
+package com.wangziyang.mes.basedata.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.wangziyang.mes.basedata.entity.SpMaterile;
+import com.wangziyang.mes.basedata.entity.SpTableManager;
+import com.wangziyang.mes.basedata.request.SpFlowReq;
+import com.wangziyang.mes.basedata.service.ISpMaterileService;
+import com.wangziyang.mes.common.Result;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import com.wangziyang.mes.common.BaseController;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ *
+ * 物料控制器
+ *
+ *
+ * @author WangZiYang
+ * @since 2020-03-19
+ */
+@Controller
+@RequestMapping("/basedata/materile")
+public class SpMaterileController extends BaseController {
+
+ /**
+ * 物料服务
+ */
+ @Autowired
+ private ISpMaterileService iSpMaterileService;
+ /**
+ * 物料管理界面
+ *
+ * @param model 模型
+ * @return 物料管理界面
+ */
+ @ApiOperation("物料管理界面UI")
+ @ApiImplicitParams({@ApiImplicitParam(name = "model", value = "模型", defaultValue = "模型")})
+ @GetMapping("/list-ui")
+ public String listUI(Model model) {
+ return "basedata/materile/list";
+ }
+
+
+ /**
+ * 物料管理修改界面
+ *
+ * @param model 模型
+ * @param record 平台表对象
+ * @return 更改界面
+ */
+ @ApiOperation("物料管理修改界面")
+ @GetMapping("/add-or-update-ui")
+ public String addOrUpdateUI(Model model, SpTableManager record) {
+ if (StringUtils.isNotEmpty(record.getId())) {
+ SpMaterile SpMaterile = iSpMaterileService.getById(record.getId());
+ model.addAttribute("result", SpMaterile);
+ }
+ return "basedata/materile/addOrUpdate";
+ }
+
+
+ /**
+ * 物料管理界面分页查询
+ *
+ * @param req 请求参数
+ * @return Result 执行结果
+ */
+ @ApiOperation("物料管理界面分页查询")
+ @ApiImplicitParams({@ApiImplicitParam(name = "req", value = "请求参数", defaultValue = "请求参数")})
+ @PostMapping("/page")
+ @ResponseBody
+ public Result page(SpFlowReq req) {
+ IPage result = iSpMaterileService.page(req);
+ return Result.success(result);
+ }
+}
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpMaterile.java b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpMaterile.java
new file mode 100644
index 0000000..5617dfb
--- /dev/null
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/entity/SpMaterile.java
@@ -0,0 +1,263 @@
+package com.wangziyang.mes.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.sun.istack.internal.NotNull;
+import com.wangziyang.mes.common.BaseEntity;
+
+/**
+ *
+ * 物料实体
+ *
+ *
+ * @author WangZiYang
+ * @since 2020-03-19
+ */
+public class SpMaterile extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 物料编码
+ */
+ private String materiel;
+
+ /**
+ * 物料描述
+ */
+ private String materielDesc;
+
+ /**
+ * 基本单位
+ */
+ private String unit;
+
+ /**
+ * 产品组
+ */
+ private String productGroup;
+
+ /**
+ * 物料类型
+ */
+ private String matType;
+
+ /**
+ * 尺寸
+ */
+ @NotNull
+ private String size;
+
+ /**
+ * 流程ID
+ */
+ private String flowId;
+ /**
+ * 流程描述
+ */
+ private String flowDesc;
+ /**
+ * 型号
+ */
+ private String model;
+
+ /**
+ * 状态(00:删除;01:正常;02:禁用)
+ */
+ @TableField(value = "is_deleted")
+ private String deleted;
+
+
+ @Override
+ public String toString() {
+ return "SpMaterile{" +
+ "materiel=" + materiel +
+ ", materielDesc=" + materielDesc +
+ ", unit=" + unit +
+ ", productGroup=" + productGroup +
+ ", matType=" + matType +
+ ", size=" + size +
+ ", flow=" + flowId +
+ "}";
+ }
+
+ /**
+ * 获取 物料编码
+ *
+ * @return materiel 物料编码
+ */
+ public String getMateriel() {
+ return this.materiel;
+ }
+
+ /**
+ * 设置 物料编码
+ *
+ * @param materiel 物料编码
+ */
+ public void setMateriel(String materiel) {
+ this.materiel = materiel;
+ }
+
+ /**
+ * 获取 物料描述
+ *
+ * @return materielDesc 物料描述
+ */
+ public String getMaterielDesc() {
+ return this.materielDesc;
+ }
+
+ /**
+ * 设置 物料描述
+ *
+ * @param materielDesc 物料描述
+ */
+ public void setMaterielDesc(String materielDesc) {
+ this.materielDesc = materielDesc;
+ }
+
+ /**
+ * 获取 基本单位
+ *
+ * @return unit 基本单位
+ */
+ public String getUnit() {
+ return this.unit;
+ }
+
+ /**
+ * 设置 基本单位
+ *
+ * @param unit 基本单位
+ */
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ /**
+ * 获取 产品组
+ *
+ * @return productGroup 产品组
+ */
+ public String getProductGroup() {
+ return this.productGroup;
+ }
+
+ /**
+ * 设置 产品组
+ *
+ * @param productGroup 产品组
+ */
+ public void setProductGroup(String productGroup) {
+ this.productGroup = productGroup;
+ }
+
+ /**
+ * 获取 物料类型
+ *
+ * @return matType 物料类型
+ */
+ public String getMatType() {
+ return this.matType;
+ }
+
+ /**
+ * 设置 物料类型
+ *
+ * @param matType 物料类型
+ */
+ public void setMatType(String matType) {
+ this.matType = matType;
+ }
+
+ /**
+ * 获取 尺寸
+ *
+ * @return size 尺寸
+ */
+ public String getSize() {
+ return this.size;
+ }
+
+ /**
+ * 设置 尺寸
+ *
+ * @param size 尺寸
+ */
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+
+ /**
+ * 获取 状态(00:删除;01:正常;02:禁用)
+ *
+ * @return deleted 状态(00:删除;01:正常;02:禁用)
+ */
+ public String getDeleted() {
+ return this.deleted;
+ }
+
+ /**
+ * 设置 状态(00:删除;01:正常;02:禁用)
+ *
+ * @param deleted 状态(00:删除;01:正常;02:禁用)
+ */
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ /**
+ * 获取 型号
+ *
+ * @return model 型号
+ */
+ public String getModel() {
+ return this.model;
+ }
+
+ /**
+ * 设置 型号
+ *
+ * @param model 型号
+ */
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ /**
+ * 获取 流程
+ *
+ * @return flowId 流程
+ */
+ public String getFlowId() {
+ return this.flowId;
+ }
+
+ /**
+ * 设置 流程
+ *
+ * @param flowId 流程
+ */
+ public void setFlowId(String flowId) {
+ this.flowId = flowId;
+ }
+
+ /**
+ * 获取 流程描述
+ *
+ * @return flowDesc 流程描述
+ */
+ public String getFlowDesc() {
+ return this.flowDesc;
+ }
+
+ /**
+ * 设置 流程描述
+ *
+ * @param flowDesc 流程描述
+ */
+ public void setFlowDesc(String flowDesc) {
+ this.flowDesc = flowDesc;
+ }
+}
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpMaterileMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpMaterileMapper.java
new file mode 100644
index 0000000..bdc7c77
--- /dev/null
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/mapper/SpMaterileMapper.java
@@ -0,0 +1,16 @@
+package com.wangziyang.mes.basedata.mapper;
+
+import com.wangziyang.mes.basedata.entity.SpMaterile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author WangZiYang
+ * @since 2020-03-19
+ */
+public interface SpMaterileMapper extends BaseMapper {
+
+}
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpMaterileService.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpMaterileService.java
new file mode 100644
index 0000000..c8ed707
--- /dev/null
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/ISpMaterileService.java
@@ -0,0 +1,16 @@
+package com.wangziyang.mes.basedata.service;
+
+import com.wangziyang.mes.basedata.entity.SpMaterile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author WangZiYang
+ * @since 2020-03-19
+ */
+public interface ISpMaterileService extends IService {
+
+}
diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpMaterileServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpMaterileServiceImpl.java
new file mode 100644
index 0000000..2b2c97a
--- /dev/null
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/service/impl/SpMaterileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.wangziyang.mes.basedata.service.impl;
+
+import com.wangziyang.mes.basedata.entity.SpMaterile;
+import com.wangziyang.mes.basedata.mapper.SpMaterileMapper;
+import com.wangziyang.mes.basedata.service.ISpMaterileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author WangZiYang
+ * @since 2020-03-19
+ */
+@Service
+public class SpMaterileServiceImpl extends ServiceImpl implements ISpMaterileService {
+
+}
diff --git a/mes/src/main/resources/mapper/basedata/SpMaterileMapper.xml b/mes/src/main/resources/mapper/basedata/SpMaterileMapper.xml
new file mode 100644
index 0000000..6e1f018
--- /dev/null
+++ b/mes/src/main/resources/mapper/basedata/SpMaterileMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
new file mode 100644
index 0000000..91e4952
--- /dev/null
+++ b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
@@ -0,0 +1,161 @@
+
+
+
+
+ 添加用户
+
+
+
+ <#include "${request.contextPath}/common/common.ftl">
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mes/src/main/resources/templates/basedata/materile/list.ftl b/mes/src/main/resources/templates/basedata/materile/list.ftl
new file mode 100644
index 0000000..548212f
--- /dev/null
+++ b/mes/src/main/resources/templates/basedata/materile/list.ftl
@@ -0,0 +1,183 @@
+
+
+
+
+ 系统角色列表
+
+
+
+ <#include "${request.contextPath}/common/common.ftl">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file