From 201d90b2c1bc6a4ac99886630d9ec1ea6af15c2e Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 10:47:54 +0800
Subject: [PATCH] 修改工单ID类型
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 2 +-
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 8 ++++----
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 5 +++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 65aacf2..d56b49c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -26,7 +26,7 @@
private static final long serialVersionUID = 1L;
/** 涓婚敭id */
- private String id;
+ private Long id;
/** 涓昏鍒掑憳 */
@Excel(name = "涓昏鍒�")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index be58e7a..9da6195 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,5 +1,6 @@
package com.aps.core.service.impl;
+import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
@@ -68,7 +69,7 @@
@Override
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
- apsPlatePlan.setId(IdUtils.fastUUID());
+ apsPlatePlan.setId(IdUtil.getSnowflakeNextId());
apsPlatePlan.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
@@ -122,7 +123,7 @@
ids[i]=apsPartPlanTemps.get(i).getId();
ApsPlatePlan platePlan=new ApsPlatePlan();
BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
- platePlan.setId(IdUtils.fastUUID());
+ platePlan.setId(IdUtil.getSnowflakeNextId());
platePlan.setCreateTime(DateUtils.getNowDate());
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsPlatePlanMapper.insertApsPlatePlan(platePlan);
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 4722333..1c2b7df 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -203,7 +203,7 @@
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
- require.setRequireTrackId(plan.getId());
+ require.setRequireTrackId(plan.getId() + "");
require.setBatchNumber(batchNum);
require.setDocNum(plan.getDocumentNumber());
require.setOrgCode(plant);
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
index b060b3f..be61a98 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
@@ -150,11 +150,11 @@
<update id="updatePlanDateByBatch" parameterType="ApsPlateOrderPlanRequireDate">
update aps_plate_plan set
- plan_start_day = #{planRequireDate.start},
- plan_end_day = #{planRequireDate.end},
- update_by = #{planRequireDate.updateBy},
+ plan_start_day = #{start},
+ plan_end_day = #{end},
+ update_by = #{updateBy},
update_time = now()
- where id = #{planRequireDate.id}
+ where id = #{id}
</update>
<update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
--
Gitblit v1.9.3