diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
index 1d1e3a11..d31d35c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
+++ b/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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
index f029e5c6..24e71ee2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
+++ b/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);
}
diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
index 8decac4e..ee7f52c3 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
- outsource_process_code,
+ #{outsourceProcessCode},
#{outsourceProcessNo},
#{outsourceProcessName},
#{remark},
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
index 40b45e3f..70dd7e04 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
@@ -10,7 +10,7 @@
@@ -35,44 +35,61 @@