瀏覽代碼

修复 添加农机具提示重复的问题

zhaiyifei 11 月之前
父節點
當前提交
ad07da3cde

+ 6 - 6
src/main/java/com/yunfeiyun/agmp/fms/controller/FmsMachController.java

@@ -6,7 +6,9 @@ import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
+import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.fms.domain.FmsMach;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsMachListReqVo;
@@ -135,12 +137,10 @@ public class FmsMachController extends BaseController
     @Log(title = "机具", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody FmsMach fmsMach) {
-        FmsMachListReqVo reqVo = new FmsMachListReqVo();
-        reqVo.setMachName(fmsMach.getMachName());
-        reqVo.setMachType(fmsMach.getMachType());
-        List<FmsMach> list = fmsMachService.selectFmsMachList(reqVo);
-        if (!list.isEmpty()) {
-            return AjaxResult.error(ErrorCode.FMS_MACH_EXIST.getCode(), ErrorCode.FMS_MACH_EXIST.getMessage());
+        String machName = fmsMach.getMachName();
+        String machType = fmsMach.getMachType();
+        if(StringUtils.isEmpty(machName) || StringUtils.isEmpty(machType)){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"机具名称或类型不能为空");
         }
         return toAjax(fmsMachService.insertFmsMach(fmsMach));
     }

+ 1 - 6
src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsMachServiceImpl.java

@@ -119,12 +119,7 @@ public class FmsMachServiceImpl implements IFmsMachService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertFmsMach(FmsMach fmsMach) {
-        String tid = fmsMach.getTid();
-        String machNo = fmsMach.getMachNo();
-        FmsMach oldFmsMach = selectFmsMachByMachNo(machNo, tid);
-        if (!ObjectUtils.isEmpty(oldFmsMach)){
-            throw new BizException(ErrorCode.FMS_MACH_RECORD_EXIST);
-        }
+        String tid = SecurityUtils.getTid();
         fmsMach.setMachId(fmsMach.getId());
         fmsMach.setTid(tid);
         fmsMach.setMachUsestatus(MachStatus.UNUSED.getCode());