From 52954eb7512c15d792071fb231974d744447c39e Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Fri, 20 Dec 2024 09:24:54 +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=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 334b8be..f6ec996 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
@@ -10,6 +10,7 @@ import com.ktg.mes.wm.utils.WmBarCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -66,8 +67,9 @@ public class DvMachineryServiceImpl implements IDvMachineryService
             return AjaxResult.error("设备编码重复");
         }
         dvMachinery.setCreateTime(DateUtils.getNowDate());
+        dvMachineryMapper.insertDvMachinery(dvMachinery);
         wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_MACHINERY,dvMachinery.getMachineryId(),dvMachinery.getMachineryCode(),dvMachinery.getMachineryName());
-        return AjaxResult.success(dvMachineryMapper.insertDvMachinery(dvMachinery));
+        return AjaxResult.success("操作成功");
     }
 
     /**
@@ -120,6 +122,7 @@ public class DvMachineryServiceImpl implements IDvMachineryService
         for (DvMachinery machinery : machineryList) {
             // 去除空格
             String machineryCode = machinery.getMachineryCode().trim();
+            machinery.setCreateTime(new Date());
             List<DvMachinery> existing = dvMachineryMapper.selectByMachineryCode(machineryCode);
             if (existing != null && existing.size() > 0) {
                 if (isUpdateSupport) {