diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java index e37532bb..4d55e5ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java @@ -1,6 +1,8 @@ package com.ruoyi.erp.controller; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -123,4 +125,14 @@ public class ErpMaterialController extends BaseController { return toAjax(erpMaterialService.deleteErpMaterialByIds(ids)); } + + /** + * 校验用户名 + */ + @PostMapping("/checkMaterialNoUnique") + @ResponseBody + public String checkMaterialNoUnique(ErpMaterial material) + { + return erpMaterialService.checkMaterialNoUnique(material.getMaterialNo()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java index b54e5c2e..a96ce708 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java @@ -58,4 +58,6 @@ public interface ErpMaterialMapper * @return 结果 */ public int deleteErpMaterialByIds(String[] ids); + + int checkMaterialNoUnique(String materialNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java index fd24678c..8c88a4cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java @@ -58,4 +58,6 @@ public interface IErpMaterialService * @return 结果 */ public int deleteErpMaterialById(Long id); + + String checkMaterialNoUnique(String materialNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index 1acc30b5..186b0a9a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.erp.service.impl; import java.util.List; + +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -94,4 +97,14 @@ public class ErpMaterialServiceImpl implements IErpMaterialService { return erpMaterialMapper.deleteErpMaterialById(id); } + + @Override + public String checkMaterialNoUnique(String materialNo) { + int count = erpMaterialMapper.checkMaterialNoUnique(materialNo); + if (count > 0) + { + return "1"; + } + return "0"; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml index 679e31dd..1a5a972e 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, del_flag, create_by, create_time, update_by, update_time, remark, material_no, material_name, audit_status, use_status, hava_product_tem, material_type, process_method, unit, brand, describe, warehouse_dept from erp_material + select id, del_flag, create_by, create_time, update_by, update_time, remark, material_no, material_name, audit_status, use_status, hava_product_tem, material_type, process_method, unit, brand, `describe`, warehouse_dept from erp_material @@ -52,7 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + insert into erp_material @@ -71,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_method, unit, brand, - describe, + `describe`, warehouse_dept, @@ -113,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_method = #{processMethod}, unit = #{unit}, brand = #{brand}, - describe = #{describe}, + `describe` = #{describe}, warehouse_dept = #{warehouseDept}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js index eca7a131..613f2f06 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js @@ -4,7 +4,12 @@ $(document).ready(function(){ submitHandler: function(form) { form.submit(); } - }); + }); + //校验整数 + jQuery.validator.addMethod("isInteger",function(value,element){ + var isInteferRegExp = /^\d+$/; + return this.optional(element) || (isInteferRegExp).test(value); + },"请输入10位整数"); //手机号码验证身份证正则合并:(^\d{15}$)|(^\d{17}([0-9]|X)$) jQuery.validator.addMethod("isPhone",function(value,element){ var length = value.length; diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html index 61c8829a..e74ccaad 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html @@ -9,13 +9,13 @@
- +
- +