From 14017d88af017f4907980c22388295ea9187e3f8 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 11 Jun 2024 09:28:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B0=94=E8=83=80=E8=BD=B4=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9A=E7=94=9F=E4=BA=A7=E5=8C=BA=E5=9F=9F+?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E7=BC=96=E5=8F=B7+=E5=88=86=E5=88=87?=
 =?UTF-8?q?=E7=BB=84+=E6=97=A5=E6=9C=9F+=20=20-=E8=BD=B4=E4=B8=8A=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MdPbPapervehicleServiceImpl.java       |  4 ++--
 .../service/impl/SlitterServiceImpl.java        | 10 ++++++++--
 .../java/org/nl/common/utils/TaskUtils.java     | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
index a60938b57..3b21ac2e7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
@@ -46,7 +46,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
         String now = DateUtil.now();
 
         entity.setIvt_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setUpdate_optid(Long.valueOf(currentUserId));
+        entity.setUpdate_optid(currentUserId);
         entity.setUpdate_optname(nickName);
         entity.setUpdate_time(now);
         mdPbPapervehicleMapper.insert(entity);
@@ -62,7 +62,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
-        entity.setUpdate_optid(Long.valueOf(currentUserId));
+        entity.setUpdate_optid(currentUserId);
         entity.setUpdate_optname(nickName);
         entity.setUpdate_time(now);
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index a65ce06fa..6f3e7dc4b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -46,6 +46,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -256,16 +258,20 @@ public class SlitterServiceImpl implements SlitterService {
             }
             cutPoint = emptyNotTaskPoint.get(0);
         }
+        String resourceName = demoPlan.getResource_name();
         // 枷锁
         RLock lockPoint = redissonClient.getLock(cutPoint.getPoint_code());
         boolean tryLockPoint = lockPoint.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLockPoint) {
                 // 分切计划设置套轴完成
-                String qzzNo = IdUtil.getSnowflake(1, 1).nextIdStr();
+                String qzzNo = resourceName.substring(0, 2)
+                        + resourceName.substring(resourceName.length() - 2)
+                        + demoPlan.getSplit_group()
+                        + TaskUtils.getDateTime("MMddHHmm") + "-";
                 plans.forEach(plan -> {
                     plan.setIs_child_tz_ok(SlitterConstant.SLITTER_YES);
-                    plan.setQzzno(qzzNo);
+                    plan.setQzzno(qzzNo + plan.getUp_or_down());
                     TaskUtils.updateOptMessageBySlitterPlan(plan);
                 });
                 slittingproductionplanService.updateBatchById(plans);
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
index 3d075e044..ae6edee55 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
@@ -9,6 +9,9 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
  * @author: lyd
  * @description: 工具类
@@ -113,4 +116,18 @@ public class TaskUtils {
         point.setUpdate_optname(SecurityUtils.getCurrentUsername());
         point.setUpdate_time(DateUtil.now());
     }
+
+    /**
+     * 获取指定格式的日期时间
+     * @param format 格式
+     * @return 字符串
+     */
+    public static String getDateTime(String format) {
+        // 获取当前日期和时间
+        LocalDateTime now = LocalDateTime.now();
+        // 定义日期时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMddHHmm");
+        // 格式化日期时间
+        return now.format(formatter);
+    }
 }

From 9c84311c22979cf9b2904ce68ba1e331c10bd78f Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 11 Jun 2024 09:29:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=BF=98=E8=AE=B0=E6=8A=8A=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=86=99=E8=BF=9B=E5=8E=BB=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/common/utils/TaskUtils.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
index ae6edee55..c2cbc463f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/TaskUtils.java
@@ -126,7 +126,7 @@ public class TaskUtils {
         // 获取当前日期和时间
         LocalDateTime now = LocalDateTime.now();
         // 定义日期时间格式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMddHHmm");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
         // 格式化日期时间
         return now.format(formatter);
     }