From bc764428e9a1829ed1732ee32726f599b1079bfc Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 13:15:57 +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/mapper/ApsPartPlanMapper.java | 2 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java | 4 ++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml | 12 ++++++++++++
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java
index c013adb..4369d4c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java
@@ -63,4 +63,6 @@
public int deleteApsPartPlanByIds(String[] ids);
int insertBatch(List<ApsPartPlanTemp> apsPartPlanTemps);
+
+ int removeAllPartPlans();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
index 3baf1a7..86475db 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
@@ -13,6 +13,7 @@
import com.aps.core.mapper.ApsPartPlanMapper;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.service.IApsPartPlanService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 闆朵欢璁″垝绠＄悊Service涓氬姟灞傚鐞�
@@ -102,8 +103,11 @@
return apsPartPlanMapper.deleteApsPartPlanById(id);
}
+ @Transactional
@Override
public int confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+
+ apsPartPlanMapper.removeAllPartPlans();
//鏌ヨ涓存椂琛ㄦ暟鎹�
List<ApsPartPlanTemp> apsPartPlanTemps=apsPartPlanTempMapper.selectApsPartPlanTempList(apsPartPlanTemp);
int count=0;
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
index ce3e188..90bb069 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
@@ -82,6 +82,7 @@
<if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
<if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
<if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
+ and del_flag='0'
</where>
</select>
@@ -271,4 +272,15 @@
,#{item.isStockComplete},#{item.hasTurnback},#{item.hasRisk},#{item.plant})
</foreach>
</insert>
+
+ <update id="selectPartPlanListByDocumentNumbers" parameterType="String" >
+ select id from aps_part_plan where documentNumber in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+ <update id="removeAllPartPlans" parameterType="String">
+ update aps_part_plan set del_flag='1' where del_flag ='0'
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3