From ccdc77f67e5e6fb0b4e7c4635d72514b5b615cbf Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Fri, 20 Dec 2024 09:59:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DvMachineryServiceImpl.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java
index f6ec996..06122c2 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ktg.mes.dv.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.ktg.common.constant.UserConstants;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
@@ -120,6 +121,27 @@ public class DvMachineryServiceImpl implements IDvMachineryService
         int successCount = 0;
         int failureCount = 0;
         for (DvMachinery machinery : machineryList) {
+            // 判断必填项是否为空
+            if (ObjectUtil.isEmpty(machinery.getMachineryCode())) {
+                failureCount++;
+                continue;
+            }
+            if (ObjectUtil.isEmpty(machinery.getMachineryName())) {
+                failureCount++;
+                continue;
+            }
+            if (ObjectUtil.isEmpty(machinery.getMachineryTypeId())) {
+                failureCount++;
+                continue;
+            }
+            if (ObjectUtil.isEmpty(machinery.getWorkshopId())) {
+                failureCount++;
+                continue;
+            }
+            if (ObjectUtil.isEmpty(machinery.getStatus())) {
+                failureCount++;
+                continue;
+            }
             // 去除空格
             String machineryCode = machinery.getMachineryCode().trim();
             machinery.setCreateTime(new Date());