[fix]

委外加工 委外工序
修改委外工序列表页面、添加、编辑页面；
修改委外工序controller、mapper、service接口；

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java

@@ -10,11 +10,7 @@ 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.controller.BaseController;
@@ -98,7 +94,7 @@ public class OutsourceProcessController extends BaseController
     @ResponseBody
     public AjaxResult addSave(OutsourceProcess outsourceProcess)
     {
-        if(!outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess)){
+        if(outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess)){
             return error("添加委外工序'" + outsourceProcess.getOutsourceProcessNo() + "'失败，工序编号已存在");
         };
         outsourceProcess.setCreateTime(DateUtils.getNowDate());
@@ -109,7 +105,7 @@ public class OutsourceProcessController extends BaseController
      */
     @PostMapping("/checkoutsourceProcessNoUnique")
     @ResponseBody
-    public boolean checkoutsourceProcessNoUnique(OutsourceProcess outsourceProcess)
+    public boolean checkoutsourceProcessNoUnique(@RequestBody OutsourceProcess outsourceProcess)
     {
         return outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess);
     }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java

@@ -103,9 +103,9 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
 
 
         if(outsourceProcessMapper.selectOutsourceProcessByOutsourceProcessNo(outsourceProcess.getOutsourceProcessNo())!=null){
-            return false;
+            return true;
         }
-        return true;
+        return false;
     }
 
     /**
@@ -117,6 +117,7 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
     @Override
     public int updateOutsourceProcess(OutsourceProcess outsourceProcess)
     {
+        outsourceProcess.setUpdateBy(ShiroUtils.getLoginName());
         outsourceProcess.setUpdateTime(DateUtils.getNowDate());
         return outsourceProcessMapper.updateOutsourceProcess(outsourceProcess);
     }

ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="outsourceProcessCode != null and outsourceProcessCode != ''">outsource_process_code,</if>
+            <if test="outsourceProcessCode != null and outsourceProcessCode != ''">#{outsourceProcessCode},</if>
             <if test="outsourceProcessNo != null and outsourceProcessNo != ''">#{outsourceProcessNo},</if>
             <if test="outsourceProcessName != null">#{outsourceProcessName},</if>
             <if test="remark != null">#{remark},</if>

ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html

@@ -10,7 +10,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label is-required">委外工序编号：</label>
                     <div class="col-sm-8">
-                        <input name="outsourceProcessNo" class="form-control" id="outsourceProcessNo" type="text" required readonly>
+                        <input name="outsourceProcessNo" class="form-control" id="outsourceProcessNo" type="text" required>
                     </div>
                 </div>
             </div>
@@ -35,44 +35,61 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "system/outsource_process"
-        // $("#form-outsource_process-add").validate({
-        //     focusCleanup: true,
-        //     rules: {
-        //         outsourceProcessNo: {
-        //             remote: {
-        //                 url: prefix + "/checkoutsourceProcessNoUnique",
-        //                 type: "post",
-        //                 dataType: "json",
-        //                 data: {
-        //                     "outsourceProcessNo": function () {
-        //                         return $.common.trim($("#outsourceProcessNo").val());
-        //                     }
-        //                 }
-        //             }
-        //         },
-        //
-        //     },
-        //     messages: {
-        //         "outsourceProcessNo": {
-        //             remote: "该工序编号已经存在"
-        //         }
-        //     }
-        // });
+        $("#form-outsource_process-add").validate({
+            focusCleanup: true,
+            rules: {
+                outsourceProcessNo: {
+                    required: true,
+                },
+                outsourceProcessName: {
+                    required: true,
+                }
+            },
+            messages: {
+                "outsourceProcessNo": {
+                    required: "请输入工序编号",
+                    // remote: "该工序编号已经存在",
+                },
+                "outsourceProcessName": {
+                    required: "请输入工序名称",
+                }
+            }
+        });
 
 
         //获取单号
-        $.ajax({
-            url: prefix + "/generateOutsourceProcessNo",
-            type: "GET",
-            dateType: "json",
-            success: function (resp) {
-                console.log(resp)
-                if (resp != null) {$("input[name='outsourceProcessNo']").val(resp);} else {$.modal.msgError("失败啦");}
-            }
-        });
+        // $.ajax({
+        //     url: prefix + "/generateOutsourceProcessNo",
+        //     type: "GET",
+        //     dateType: "json",
+        //     success: function (resp) {
+        //         console.log(resp)
+        //         if (resp != null) {$("input[name='outsourceProcessNo']").val(resp);} else {$.modal.msgError("失败啦");}
+        //     }
+        // });
 
+        function checkoutsourceProcessNoUnique(){
+            var outsousrceProcess = {};
+            var outsousrceProcessNo = $("#outsourceProcessNo").val();
+            outsousrceProcess.outsourceProcessNo = outsousrceProcessNo;
+            $.ajax({
+                url: prefix + "/checkoutsourceProcessNoUnique",
+                type: "post",
+                dataType: "json",
+                data: outsousrceProcess,
+                success:function (res){
+                    return res;
+                },
+
+            })
+        }
         function submitHandler() {
             if ($.validate.form()) {
+                // console.log(checkoutsourceProcessNoUnique());
+                // if(checkoutsourceProcessNoUnique() === true){
+                //     $.modal.msgError("该编号已存在！");
+                //     return;
+                // };
                 $.operate.save(prefix + "/add", $('#form-outsource_process-add').serialize());
             }
         }

ruoyi-admin/src/main/resources/templates/system/outsource_process/edit.html

@@ -11,13 +11,13 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label is-required">委外工序编号：</label>
                     <div class="col-sm-8">
-                        <input name="outsourceProcessNo" th:field="*{outsourceProcessNo}" id="outsourceProcessNo" class="form-control" type="text" required>
+                        <input name="outsourceProcessNo" th:field="*{outsourceProcessNo}" id="outsourceProcessNo" class="form-control" type="text" required readonly>
                     </div>
                 </div>
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">委外工序名称：</label>
+                    <label class="col-sm-3 control-label is-required">委外工序名称：</label>
                     <div class="col-sm-8">
                         <input name="outsourceProcessName" th:field="*{outsourceProcessName}" class="form-control" type="text">
                     </div>
@@ -36,10 +36,20 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "system/outsource_process";
+        var outsourceProcessNo = [[${outsourceProcess.outsourceProcessNo}]];
         $("#form-outsource_process-edit").validate({
             focusCleanup: true,
+            rules: {
+                outsourceProcessName: {
+                    required: true,
+                }
+            },
+            messages: {
+                "outsourceProcessName": {
+                    required: "请输入工序名称",
+                }
+            }
         });
-        var outsourceProcess = [[${outsourceProcess}]];
 
         function submitHandler() {
             if ($.validate.form()) {

ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html

@@ -74,7 +74,6 @@
                 {
                     field: 'outsourceProcessCode',
                     title: '委外工序ID',
-                    visible: false
                 },
                 {
                     field: 'outsourceProcessNo',