From 9dcc7ca43f11161edd6f1ca86a2e207fde924028 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 08:59:14 +0800
Subject: [PATCH] 增加临时表用于回显和确认
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 4 +++-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java | 3 +++
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
index 0bf560a..d2da88b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -112,7 +112,7 @@
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class);
List<ApsPartPlanTemp> apsPartPlans = util.importExcel(file.getInputStream());
-
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
if (apsPartPlans.size() > 0) {
String batchNum= IdUtils.fastUUID();
List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
@@ -123,7 +123,9 @@
break;
}
}
+ //鎻掑叆鐗堟湰鍙�
apsPartPlans.get(i).setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
apsPartPlanTempService.insertApsPartPlanTemp(apsPartPlans.get(i));
}
return AjaxResult.success(batchNum);
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
index 1a52542..4b714e6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
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 f722fd0..4a9c763 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
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
index c134035..5e26309 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
index 980cbf9..9bfaca7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
@@ -1,6 +1,8 @@
package com.aps.core.service.impl;
import java.util.List;
+
+import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPartPlanTempMapper;
@@ -52,6 +54,7 @@
@Override
public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp)
{
+ apsPartPlanTemp.setId(IdUtils.fastUUID());
return apsPartPlanTempMapper.insertApsPartPlanTemp(apsPartPlanTemp);
}
--
Gitblit v1.9.3