From f095619e00f149b538e8cdafa16513a7a70c6b47 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 13:15:46 +0800
Subject: [PATCH] 工艺路线工序序号调整
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java | 6 +++---
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java | 4 ++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java | 6 +++---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 3 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 7 +++----
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
index 1cd1cab..5cb4ae5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
@@ -30,7 +30,7 @@
/** 宸ュ簭搴忓彿 */
@Excel(name = "宸ュ簭搴忓彿")
- private Long processNumber;
+ private String processNumber;
/** 宸ュ簭鍚嶇О */
@Excel(name = "宸ュ簭鍚嶇О")
@@ -101,12 +101,12 @@
return workOrderNo;
}
- public void setProcessNumber(Long processNumber)
+ public void setProcessNumber(String processNumber)
{
this.processNumber = processNumber;
}
- public Long getProcessNumber()
+ public String getProcessNumber()
{
return processNumber;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
index 802d7a1..c46f809 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
@@ -30,7 +30,7 @@
/** 宸ュ簭搴忓彿 */
@Excel(name = "宸ュ簭搴忓彿")
- private Long processNumber;
+ private String processNumber;
/** 宸ュ簭鍚嶇О */
@Excel(name = "宸ュ簭鍚嶇О")
@@ -105,12 +105,12 @@
return workOrderNo;
}
- public void setProcessNumber(Long processNumber)
+ public void setProcessNumber(String processNumber)
{
this.processNumber = processNumber;
}
- public Long getProcessNumber()
+ public String getProcessNumber()
{
return processNumber;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
index 8b50ad4..11e6cb0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.aps.core.domain.ApsWeldSeam;
+import com.aps.core.domain.ApsWeldSeamStatistics;
+import com.aps.core.domain.ApsWeldSeamTemp;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -67,4 +69,6 @@
* @return 缁撴灉
*/
public int deleteApsWeldSeamByIds(String[] ids);
+
+ List<ApsWeldSeamStatistics> weldSeamStat(List<ApsWeldSeamTemp> apsWeldSeamTemps);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index 24d3f36..172c122 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -5,15 +5,12 @@
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
-import com.aps.core.domain.ApsPartPlan;
-import com.aps.core.domain.ApsPartPlanTemp;
-import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.domain.*;
import com.aps.core.mapper.ApsWeldSeamTempMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamMapper;
-import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.service.IApsWeldSeamService;
import org.springframework.transaction.annotation.Transactional;
@@ -133,6 +130,8 @@
if (count==apsWeldSeamTemps.size()) {
apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
}
+ //鎻掑叆鐒婄紳缁熻琛�
+ List<ApsWeldSeamStatistics> apsWeldSeamStatistics=apsWeldSeamMapper.weldSeamStat(apsWeldSeamTemps);
return 1;
}
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index fbdd6e2..f0564b2 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -153,4 +153,7 @@
#{id}
</foreach>
</delete>
+ <select id="weldSeamStat" >
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3