From 3148d17119c401568ffc31664ef54ab34dd41765 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Mon, 23 Dec 2024 16:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BC=96=E7=A0=81=E6=8C=89=E7=85=A7=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98=E3=80=82=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E4=B8=BA=E7=A9=BA=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=98=8E?=
=?UTF-8?q?=E7=A1=AE=E3=80=82=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99=E2=80=9C=E4=BE=9B=E5=BA=94?=
=?UTF-8?q?=E5=95=86=E7=AE=80=E7=A7=B0=E5=B7=B2=E5=AD=98=E5=9C=A8=E2=80=9D?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ktg/mes/md/controller/MdVendorController.java | 14 +++++++++-----
.../mes/md/service/impl/MdClientServiceImpl.java | 15 ++++++++++++---
.../mes/md/service/impl/MdVendorServiceImpl.java | 13 +++++++++++--
3 files changed, 32 insertions(+), 10 deletions(-)
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++;