From 877c9a7d2ee34ebf1a1e4c19cd7c1f8560709b0d Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 14:11:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
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 8ef46ca..74f7ae4 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,6 +1,15 @@
package com.aps.core.service.impl;
import java.util.List;
+
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.security.utils.DictUtils;
+import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.mapper.ApsPartPlanTempMapper;
+import com.aps.core.mapper.ApsPlatePlanTempMapper;
+import com.aps.system.api.domain.SysDictData;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlatePlanMapper;
@@ -18,6 +27,11 @@
{
@Autowired
private ApsPlatePlanMapper apsPlatePlanMapper;
+
+ @Autowired
+ private ApsPartPlanTempMapper apsPartPlanTempMapper;
+ @Autowired
+ private ApsPlatePlanTempMapper apsPlatePlanTempMapper;
/**
* 鏌ヨ閽ｉ噾璁″垝绠＄悊
@@ -52,6 +66,7 @@
@Override
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
+ apsPlatePlan.setId(IdUtils.fastUUID());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
@@ -90,4 +105,52 @@
{
return apsPlatePlanMapper.deleteApsPlatePlanById(id);
}
+
+ @Override
+ public int confirmPlan(ApsPlatePlanTemp tempPlan) {
+ //鏌ヨ涓存椂琛ㄦ暟鎹�
+ List<ApsPlatePlanTemp> apsPartPlanTemps=apsPlatePlanTempMapper.selectApsPlatePlanTempList(tempPlan);
+ int count=0;
+ String[] ids=new String[apsPartPlanTemps.size()];
+ for (int i = 0; i <apsPartPlanTemps.size() ; i++) {
+ //璁板綍涓存椂琛╥d
+ ids[i]=apsPartPlanTemps.get(i).getId();
+ ApsPlatePlan platePlan=new ApsPlatePlan();
+ BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
+ platePlan.setId(IdUtils.fastUUID());
+ //鎻掑叆姝ｅ紡琛紝骞惰褰�
+ apsPlatePlanMapper.insertApsPlatePlan(platePlan);
+ count++;
+ }
+ //鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
+ if (count==apsPartPlanTemps.size()) {
+ apsPlatePlanTempMapper.deleteApsPlatePlanTempByIds(ids);
+ }
+ return 1;
+ }
+ @Override
+ public String importData(List<ApsPlatePlanTemp> tempList) throws Exception {
+
+ String batchNum= IdUtils.fastUUID();
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (tempList.size() > 0) {
+ List<SysDictData> dictDataList = DictUtils.getDictCache("aps_is_suspended");
+ for (int i = 0; i < tempList.size(); i++) {
+ ApsPlatePlanTemp planTemp = tempList.get(i);
+ for (int j = 0; j < dictDataList.size(); j++) {
+ if (planTemp.getIsSuspendedTxt().equals(dictDataList.get(j).getDictLabel())) {
+ planTemp.setIsSuspended(Integer.parseInt(dictDataList.get(j).getDictValue()));
+ break;
+ }
+ }
+ //鎻掑叆鐗堟湰鍙�
+ planTemp.setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
+ apsPlatePlanTempMapper.insertApsPlatePlanTemp(planTemp);
+ }
+ return batchNum ;
+ } else {
+ return Strings.EMPTY;
+ }
+ }
}
--
Gitblit v1.9.3