From 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 09:52:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 6 +-
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml | 5 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 6 +-
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java | 6 ++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml | 5 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java | 1
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 16 ++++---
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 17 ++++----
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml | 2
12 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index 4e3caf4..1419343 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -18,7 +18,7 @@
*/
@EqualsAndHashCode(callSuper = true)
@Data
-@Builder
+
public class ApsBom extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java
index c147e2c..e75a25d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java
@@ -18,7 +18,6 @@
@EqualsAndHashCode(callSuper = true)
@Data
-@Builder
public class ApsStandardProcessRouteLine extends BaseEntity
{
@Serial
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
index 33794ce..4bfad1e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
@@ -63,7 +63,7 @@
public int deleteApsMaterialStorageManagementByIds(String[] ids);
- int updateMaterialStorageByVersion(BigDecimal remainderStock, Integer version);
+ int updateMaterialStorageByVersion(String id, BigDecimal remainderStock, Integer version);
/**
* 鍒濆鍖栧墿浣欏簱瀛樻暟閲�
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
index 0acb385..8d85a6e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
@@ -112,7 +112,11 @@
Optional<ApsBomHeader> first = bomHeaderMapper.selectApsBomHeaderList(headerParam).stream().findFirst();
if (first.isPresent()){
ApsBomHeader apsBomHeader = first.get();
- bomLineList = apsBomMapper.selectApsBomLineList(plant, apsBomHeader.getBomHeaderId());
+ ApsBom build = new ApsBom();
+ build.setBomHeaderId(apsBomHeader.getBomHeaderId());
+ build.setOrgCode(apsBomHeader.getOrgCode());
+ List<ApsBom> apsBoms = apsBomMapper.selectApsBomList(build);
+ return apsBoms;
}
return bomLineList;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
index e1acf03..4ecc74d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -111,7 +111,7 @@
@Override
public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
/*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
- itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
+ itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
/*璁板綍鎵ｅ噺鏄庣粏*/
ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
.id(IdUtil.getSnowflakeNextId())
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 d44a30b..4722333 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
@@ -166,7 +166,7 @@
/*瀹氫箟宸ュ巶涓哄崡閫� */
String plantCode="FORTUNA";
/*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
- String mainOrderType = "閽ｉ噾涓讳欢";
+ String mainOrderType = "0";
/*鐢熸垚鏂版壒娆″彿*/
String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
@@ -277,10 +277,10 @@
require.setStartDate(startDay);
/*璁＄畻鏄惁鏈夐闄�*/
- require.setHasDelayRisk("鏃犻闄�");
+ require.setHasDelayRisk("0");
Date dateZero = getDateZero(DateUtils.getNowDate());
if (startDay.before(dateZero)) {
- require.setHasDelayRisk("鏈夐闄�");
+ require.setHasDelayRisk("1");
}
/*鐢熶骇鍩哄湴*/
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
index d49ca13..dcb1503 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Optional;
+import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -123,18 +124,18 @@
// 鐗╂枡鍙�
String itemNumber=require.getBomLineCode();
long routId=0L;
- ApsStandardProcessRouteLine ret=ApsStandardProcessRouteLine.builder()
- .routeId(String.valueOf(routId))
- .routeTime(BigDecimal.ZERO)
- .build();
+ ApsStandardProcessRouteLine ret=new ApsStandardProcessRouteLine();
+ ret.setRouteId(String.valueOf(routId));
+ ret.setRouteTime(BigDecimal.ZERO);
+
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemNumber).stream().findFirst();
if (firstProcessRoute.isPresent()) {
ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get();
// 鏋勫缓宸ヨ壓璺嚎琛屽弬鏁板璞�
- ApsStandardProcessRouteLine routeLineParam = ApsStandardProcessRouteLine.builder()
- .routeId(routeHeader.getRouteId())
- .build();
+ ApsStandardProcessRouteLine routeLineParam =new ApsStandardProcessRouteLine();
+ routeLineParam.setRouteId(routeHeader.getRouteId());
+
// 鏌ヨ鏍囧噯宸ヨ壓璺嚎琛屼俊鎭�
List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = apsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
/*宸ヨ壓璺嚎Line 鎬诲伐鏃�*/
@@ -165,6 +166,7 @@
private void saveRequireError(ApsPlateStandardRequire require,String message) {
ApsPlateStandardRequireError data = ApsPlateStandardRequireError.builder()
+ .id(IdUtil.getSnowflakeNextId())
.requireId(require.getId())
.batchNumber(require.getBatchNumber())
.docNum(require.getDocNum())
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index 56269ce..a25b782 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -139,23 +139,22 @@
</delete>
<resultMap type="ApsBom" id="ApsBomLineResult">
+ <result property="id" column="id" />
<result property="bomLineId" column="bom_line_id" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
<result property="num" column="num" />
</resultMap>
<sql id="selectApsBomLineVo">
- select bom_line_id, item_code, item_name, num
+ select id, bom_line_id, item_code, item_name, num
from aps_bom_line
</sql>
- <select id="selectApsBomLineList" parameterType="ApsBom" resultMap="ApsBomLineResult">
- <include refid="selectApsBomLineVo"/>
- <where>
- <if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
- <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
- and del_flag='0'
- </where>
- order by bom_header_id,bom_line_id
+ <select id="selectApsBomLineList" parameterType="String" resultMap="ApsBomLineResult">
+ select id, bom_line_id, item_code, num
+ from aps_bom_line where del_flag='0'
+ and org_code = #{orgCode}
+ and bom_header_id = #{bomHeaderId}
+ order by bom_line_id
</select>
</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
index 2d391a7..e1a4ec0 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
@@ -22,7 +22,7 @@
<sql id="selectApsMaterialStorageManagementVo">
select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by,
- create_time, update_by, update_time ,remainderStock,version
+ create_time, update_by, update_time ,remainder_stock,version
from aps_material_storage_management
</sql>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index 99f4e68..9e4b7ce 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -269,7 +269,7 @@
</update>
<select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
- select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id
+ select id,document_number,plan_end_day, main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
@@ -281,7 +281,7 @@
<select id="selectUnMatchPlateSubPlan" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
- ,unmatched_quantity
+ unmatched_quantity
from aps_plate_plan
where del_flag='0' and professional_affiliation !='0' and unmatched_quantity > 0
<if test="plant != null and plan !='' "> and plant = #{plant}</if>
@@ -292,7 +292,7 @@
<update id="updatePlanUnMatchQtyByVersion" parameterType="ApsPlatePlan">
update aps_plate_plan
- set unmatched_quantity=#{unmatched_quantity},version=version+1
+ set unmatched_quantity=#{unmatchedQuantity},version=version+1
where id=#{id} and version=#{version}
</update>
<select id="selectPlateRedundantOrderList" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
index 04751b5..4998b0a 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
@@ -190,11 +190,11 @@
(id, require_track_id,doc_num,batch_number, org_code, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id,
process_route_hours, require_amount, net_requirement, start_date, complete_date, demand_date,
production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date,
- has_delay_risk, batch_number, del_flag, create_time, create_by)
+ has_delay_risk, del_flag, create_time, create_by)
values
<foreach collection="list" item="item" separator=",">
(
- #{item.Id},
+ #{item.id},
#{item.requireTrackId},
#{item.docNum},
#{item.batchNumber},
@@ -216,7 +216,6 @@
#{item.unmatchedDemandAmount},
#{item.suggestedCompletionDate},
#{item.hasDelayRisk},
- #{item.batchNumber},
#{item.delFlag},
#{item.createTime},
#{item.createBy}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
index 4afd715..9f94cbf 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
@@ -23,7 +23,10 @@
</resultMap>
<sql id="selectApsStandardProcessRouteLineVo">
- select id, route_id, route_num, route_name, start_date, end_date, create_time, org_code, shop_code, productivity_model, design_capacity, del_flag, create_by, update_by, update_time from aps_standard_process_route_line
+ select id, route_id, route_num, route_name, start_date, end_date, create_time, org_code,
+ shop_code, productivity_model, design_capacity, del_flag, create_by, update_by,
+ update_time
+ from aps_standard_process_route_line
</sql>
<select id="selectApsStandardProcessRouteLineList" parameterType="ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
--
Gitblit v1.9.3