diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdVendorController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdVendorController.java
index 30653c4..f7bc71e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdVendorController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdVendorController.java
@@ -3,6 +3,7 @@ package com.ktg.mes.md.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.ObjectUtil;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.entity.SysUser;
import com.ktg.mes.wm.utils.WmBarCodeUtil;
@@ -121,10 +122,11 @@ public class MdVendorController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNameUnique(mdVendor))){
return AjaxResult.error("供应商名称已存在!");
}
- if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNickUnique(mdVendor))){
- return AjaxResult.error("供应商简称已存在!");
+ if (ObjectUtil.isNotEmpty(mdVendor.getVendorNick())) {
+ if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNickUnique(mdVendor))){
+ return AjaxResult.error("供应商简称已存在!");
+ }
}
-
mdVendorService.insertMdVendor(mdVendor);
barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_VENDOR,mdVendor.getVendorId(),mdVendor.getVendorCode(),mdVendor.getVendorName());
@@ -145,8 +147,10 @@ public class MdVendorController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNameUnique(mdVendor))){
return AjaxResult.error("供应商名称已存在!");
}
- if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNickUnique(mdVendor))){
- return AjaxResult.error("供应商简称已存在!");
+ if (ObjectUtil.isNotEmpty(mdVendor.getVendorNick())) {
+ if(UserConstants.NOT_UNIQUE.equals(mdVendorService.checkVendorNickUnique(mdVendor))){
+ return AjaxResult.error("供应商简称已存在!");
+ }
}
return toAjax(mdVendorService.updateMdVendor(mdVendor));
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdClientServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdClientServiceImpl.java
index 5a01bf2..1df9037 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdClientServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdClientServiceImpl.java
@@ -2,6 +2,7 @@ package com.ktg.mes.md.service.impl;
import java.util.List;
+import cn.hutool.core.util.ObjectUtil;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.exception.ServiceException;
import com.ktg.common.utils.DateUtils;
@@ -164,12 +165,20 @@ public class MdClientServiceImpl implements IMdClientService
for (MdClient client : clientList)
{
try{
- //是否存在
+ if(ObjectUtil.isEmpty(client.getClientCode())) {
+ failureNum++;
+ failureMsg.append("
" + "必填字段为空");
+ continue;
+ }
+ if(ObjectUtil.isEmpty(client.getClientName())) {
+ failureNum++;
+ failureMsg.append("
" + "必填字段为空");
+ continue;
+ }
+ //是否存在 - (根据客户编码查询)
MdClient v = mdClientMapper.checkClientCodeUnique(client);
if(StringUtils.isNull(v)){
BeanValidators.validateWithException(validator, client);
- String clientCode = autoCodeUtil.genSerialCode(UserConstants.CLIENT_CODE,"");
- client.setClientCode(clientCode);
this.insertMdClient(client);
barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_CLIENT,client.getClientId(),client.getClientCode(),client.getClientName());
successNum++;
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdVendorServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdVendorServiceImpl.java
index 2795fc3..d17be03 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdVendorServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdVendorServiceImpl.java
@@ -2,6 +2,7 @@ package com.ktg.mes.md.service.impl;
import java.util.List;
+import cn.hutool.core.util.ObjectUtil;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.entity.SysUser;
import com.ktg.common.exception.ServiceException;
@@ -107,12 +108,20 @@ public class MdVendorServiceImpl implements IMdVendorService
for (MdVendor vendor : vendorList)
{
try{
+ if(ObjectUtil.isEmpty(vendor.getVendorName())) {
+ failureNum++;
+ failureMsg.append("
" + "必填字段为空");
+ continue;
+ }
+ if(ObjectUtil.isEmpty(vendor.getVendorCode())) {
+ failureNum++;
+ failureMsg.append("
" + "必填字段为空");
+ continue;
+ }
//是否存在
MdVendor v = mdVendorMapper.checkVendorCodeUnique(vendor);
if(StringUtils.isNull(v)){
BeanValidators.validateWithException(validator, vendor);
- String vendorCode = autoCodeUtil.genSerialCode(UserConstants.VENDOR_CODE,"");
- vendor.setVendorCode(vendorCode);
this.insertMdVendor(vendor);
barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_VENDOR,vendor.getVendorId(),vendor.getVendorCode(),vendor.getVendorName());
successNum++;