From c267b1e645b04ee598d7cc68770aabab6ef2b931 Mon Sep 17 00:00:00 2001
From: wangziyangyang <707231019@qq.com>
Date: Mon, 23 Mar 2020 12:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=89=A9=E6=96=99=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SpMaterileController.java      | 43 +++++++++++---
 .../basedata/materile/addOrUpdate.ftl         | 56 +++++++++++--------
 .../templates/basedata/materile/list.ftl      | 23 +++++++-
 3 files changed, 89 insertions(+), 33 deletions(-)

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
index 55b43f9..9468a0a 100644
--- a/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java
+++ b/mes/src/main/java/com/wangziyang/mes/basedata/controller/SpMaterileController.java
@@ -6,24 +6,20 @@ 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.BaseController;
 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;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
- *  物料控制器
+ * 物料控制器
  * </p>
  *
  * @author WangZiYang
@@ -38,6 +34,7 @@ public class SpMaterileController extends BaseController {
      */
     @Autowired
     private ISpMaterileService iSpMaterileService;
+
     /**
      * 物料管理界面
      *
@@ -84,4 +81,34 @@ public class SpMaterileController extends BaseController {
         IPage result = iSpMaterileService.page(req);
         return Result.success(result);
     }
+
+    /**
+     * 物料管理修改、新增
+     *
+     * @param record 物料实体类
+     * @return 执行结果
+     */
+    @ApiOperation("物料管理修改、新增")
+    @PostMapping("/add-or-update")
+    @ResponseBody
+    public Result addOrUpdate( SpMaterile record) {
+        iSpMaterileService.saveOrUpdate(record);
+        return Result.success();
+    }
+
+
+    /**
+     * 删除物料信息
+     *
+     * @param req 请求参数
+     * @return Result 执行结果
+     */
+    @ApiOperation("删除物料信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "req", value = "物料实体", defaultValue = "物料实体")})
+    @PostMapping("/delete")
+    @ResponseBody
+    public Result deleteByTableNameId(SpMaterile req) throws Exception {
+        iSpMaterileService.removeById(req.getId());
+        return Result.success();
+    }
 }
diff --git a/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
index 8689168..3d90bc1 100644
--- a/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
+++ b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl
@@ -73,15 +73,14 @@
                                    class="layui-input" value="${result.size}">
                         </div>
                     </div>
-                    <div class="layui-form-item"style="width: 1000px;" >
+                    <div class="layui-form-item" style="width: 1000px;">
                         <label for="js-flowId" class="layui-form-label sp-required">工艺流程
                         </label>
                         <div class="layui-input-inline">
-                            <select id="js-flowId" name="flowId" lay-filter="flow-filter" lay-verify="required"
-                                    value="${result.flowDesc}">
+                            <select id="js-flowId" name="flowId" lay-filter="flow-filter" lay-verify="required">
                             </select>
                         </div>
-                        <p id="js-flowProcess" style="font-size:23px">测试->dd->dd</p>
+                        <p id="js-flowProcess" style="font-size:23px"></p>
                     </div>
                     <div class="layui-form-item">
                         <label for="js-is-deleted" class="layui-form-label sp-required">状态
@@ -104,26 +103,17 @@
                     </div>
                 </div>
             </div>
+
+        </form>
     </div>
-    </form>
-</div>
 </div>
 <script>
     layui.use(['form', 'util'], function () {
         var form = layui.form,
             util = layui.util;
         var flowRows = [];
+        //流程添加下拉框
         getFlowData();
-        $.each(flowRows, function (index, item) {
-            $('#js-flowId').append(new Option(item.flowDesc, item.id));
-        });
-        //给表单赋值
-        form.val("formTest", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值
-            "size": "100*100*100",// "name": "value"
-            "flowId": 3
-        });
-//获取表单区域所有值
-        var data1 = form.val("formTest");
 
         /**
          * 初始化流程数据
@@ -143,20 +133,42 @@
                     flowRows = data.data;
                 }
             });
+
+            $.each(flowRows, function (index, item) {
+                $('#js-flowId').append(new Option(item.flowDesc, item.id));
+            });
+            //编辑时候根据回显的ID 绘制流程
+            flowProssbyId("${result.flowId}")
         }
+        //初始化 物料类型
 
         //下拉框选择 绘制流程时序图
         form.on('select(flow-filter)', function (data) {
-            var newArr = flowRows.filter(function (obj) {
-                return obj.id == data.value;
-            });
-            var lb_p = document.getElementById("js-flowProcess");
-            lb_p.innerHTML = newArr[0].process;
+            flowProssbyId(data.value)
         });
+
+        //通过ID 获取流程时序 绘制
+        function flowProssbyId(flowId) {
+            var newArr = flowRows.filter(function (obj) {
+                return obj.id == flowId;
+            });
+            if (newArr.length > 0) {
+                var lb_p = document.getElementById("js-flowProcess");
+                lb_p.innerHTML = newArr[0].process;
+            }
+
+        }
+
+        //给表单赋值
+        form.val("formTest", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值
+            "flowId": "${result.flowId}"
+        });
+
+
         //监听提交
         form.on('submit(js-submit-filter)', function (data) {
             spUtil.submitForm({
-                url: "${request.contextPath}/admin/sys/role/add-or-update",
+                url: "${request.contextPath}/basedata/materile/add-or-update",
                 data: data.field
             });
 
diff --git a/mes/src/main/resources/templates/basedata/materile/list.ftl b/mes/src/main/resources/templates/basedata/materile/list.ftl
index 548212f..55f93a3 100644
--- a/mes/src/main/resources/templates/basedata/materile/list.ftl
+++ b/mes/src/main/resources/templates/basedata/materile/list.ftl
@@ -162,7 +162,7 @@
             if (obj.event === 'edit') {
                 spLayer.open({
                     title: '编辑',
-                    area: ['800px', '400px'],
+                    area: ['90%', '90%'],
                     // 请求url参数
                     spWhere: {id: data.id},
                     content: '${request.contextPath}/basedata/materile/add-or-update-ui'
@@ -172,8 +172,25 @@
             // 删除
             if (obj.event === 'delete') {
                 layer.confirm('确认要删除吗？', function (index) {
-                    obj.del();
-                    layer.close(index);
+                    spUtil.ajax({
+                        url: '${request.contextPath}/basedata/materile/delete',
+                        async: false,
+                        type: 'POST',
+                        // 是否显示 loading
+                        showLoading: true,
+                        // 是否序列化参数
+                        serializable: false,
+                        // 参数
+                        data: {
+                            id: data.id
+                        },
+                        success: function (data) {
+                            tableIns.reload();
+                            layer.close(index);
+                        },
+                        error: function () {
+                        }
+                    });
                 });
             }
         });