From 77b9b1492b8578b280bd61e15896de5bdc8e5213 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 09 五月 2025 13:22:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 3 ++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 6 ++++--
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 31 ++++++++++++++++++++-----------
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 8 ++++----
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java | 2 +-
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml | 3 ++-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 5 +++--
8 files changed, 37 insertions(+), 23 deletions(-)
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 65aacf2..d56b49c 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
@@ -26,7 +26,7 @@
private static final long serialVersionUID = 1L;
/** 涓婚敭id */
- private String id;
+ private Long id;
/** 涓昏鍒掑憳 */
@Excel(name = "涓昏鍒�")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
index 580b70c..510df6b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
@@ -31,7 +31,8 @@
private String requireTrackId;
/**鍗曞彿*/
private String docNum;
-
+ /**涓婄骇鐗╂枡缂栫爜*/
+ private String bomHeaderCode;
/** bom_line_id */
// @Excel(name = "bom_line_id")
private String bomLineId;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
index f354088..a456135 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
@@ -77,7 +77,7 @@
/**
* 鑾峰彇鏈尮閰嶇殑瀛愯鍒�
* */
- ApsPlatePlan selectUnMatchPlateSubPlan(String plant);
+ ApsPlatePlan selectUnMatchPlateSubPlan(String plant,String itemNumber);
/**
* 鏇存柊瀛愯鍒掓湭鍖归厤鏁伴噺
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 be58e7a..9da6195 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,5 +1,6 @@
package com.aps.core.service.impl;
+import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
@@ -68,7 +69,7 @@
@Override
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
- apsPlatePlan.setId(IdUtils.fastUUID());
+ apsPlatePlan.setId(IdUtil.getSnowflakeNextId());
apsPlatePlan.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
@@ -122,7 +123,7 @@
ids[i]=apsPartPlanTemps.get(i).getId();
ApsPlatePlan platePlan=new ApsPlatePlan();
BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
- platePlan.setId(IdUtils.fastUUID());
+ platePlan.setId(IdUtil.getSnowflakeNextId());
platePlan.setCreateTime(DateUtils.getNowDate());
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsPlatePlanMapper.insertApsPlatePlan(platePlan);
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 8466aaa..e27bd1e 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
@@ -178,7 +178,7 @@
List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
- getBomRequires(plantCode, "0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
+ getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!requiresList.isEmpty()) {
@@ -196,6 +196,7 @@
* 鏋勫缓闇�姹備俊鎭�
*
* @param plant 宸ュ巶浠ｇ爜
+ * @param bomHeaderCode BOM涓婄骇鐗╂枡缂栫爜
* @param bomLineId BOM琛孖D
* @param itemCode 鐗╂枡浠ｇ爜
* @param itemNum 鐗╂枡鏁伴噺
@@ -205,14 +206,15 @@
* @param allRequires 鎵�鏈夐渶姹傜殑鍒楄〃
* @param level 灞傜骇
*/
- private void getBomRequires(String plant, String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
+ private void getBomRequires(String plant, String bomHeaderCode, String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
- require.setRequireTrackId(plan.getId());
+ require.setRequireTrackId(plan.getId() + "");
require.setBatchNumber(batchNum);
require.setDocNum(plan.getDocumentNumber());
require.setOrgCode(plant);
+ require.setBomHeaderCode(bomHeaderCode);
require.setBomLineId(bomLineId);
require.setBomLineCode(itemCode);
require.setBomLineLevel(level);
@@ -259,6 +261,8 @@
bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId());
}
}
+ /*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
+ require.setUnmatchedDemandAmount(require.getNetRequirement());
/*宸ヨ壓璺嚎鎬婚渶姹�*/
ApsStandardProcessRouteLine routeHeader = routeLineService.getRouteLineTotalTime(require);
String routeId = routeHeader.getRouteId();
@@ -310,7 +314,7 @@
List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemCode);
if (!bomLineList.isEmpty()) {
bomLineList.forEach(line -> {
- getBomRequires(plant, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
+ getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
});
}
}
@@ -344,39 +348,44 @@
private void matchRequireAndSubPlan(ApsPlateStandardRequire require) {
BigDecimal netRequirement = require.getNetRequirement();
+ require.setMatchMode("宸ュ崟鍖归厤");
if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
- ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
+ ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
/*瀛愪欢宸ュ崟鐨勬湭鍖归厤鏁伴噺 浣滀负褰撳墠鐨勫簱瀛�*/
while (platePlan != null && netRequirement.compareTo(BigDecimal.ZERO) > 0) {
BigDecimal stock = platePlan.getUnmatchedQuantity();
if (netRequirement.compareTo(stock) < 0) {
/* 搴撳瓨鏁伴噺 澶т簬 鍑�闇�姹傛暟閲�*/
/* 鍑�闇�姹傛暟閲�=0 锛屽瓙浠跺伐鍗曟湭鍖归厤鏁伴噺= 搴撳瓨-鍑�闇�姹�*/
- netRequirement = BigDecimal.ZERO;
- require.setNetRequirement(netRequirement);
BigDecimal subtract = stock.subtract(netRequirement);
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
+ netRequirement = BigDecimal.ZERO;
+ require.setMatchState("宸插尮閰�");
+ require.setUnmatchedDemandAmount(netRequirement);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
} else if (netRequirement.compareTo(stock) == 0) {
/*鍑�闇�姹傛暟閲� == 搴撳瓨鏁伴噺*/
- netRequirement = BigDecimal.ZERO;
- require.setNetRequirement(netRequirement);
+
BigDecimal subtract = BigDecimal.ZERO;
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
+ netRequirement = BigDecimal.ZERO;
+ require.setMatchState("宸插尮閰�");
+ require.setUnmatchedDemandAmount(netRequirement);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
}
if (netRequirement.compareTo(stock) > 0) {
/*闇�姹傚ぇ浜庡簱瀛�*/
/*鍑�闇�姹� 琚儴鍒嗘弧瓒� */
BigDecimal rest = netRequirement.subtract(stock);
- require.setNetRequirement(rest);
require.setMatchState("鍖归厤涓�");
/*宸ュ崟 鏈尮閰嶆暟閲忎负0 鍏ㄩ儴鐢ㄤ簬鍖归厤闇�姹�*/
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement);
/*鍑�闇�姹傛湭琚弧瓒筹紝闇�瑕佺户缁尮閰�*/
- platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
+ platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
+ /*鍓╀綑鍑�闇�姹�*/
netRequirement = rest;
+ require.setUnmatchedDemandAmount(netRequirement);
}
}
}
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 8a96cd8..7d407f4 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
@@ -271,8 +271,9 @@
<select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
- unmatched_quantity,version, production_base
+ unmatched_quantity,version, production_base,
(case when custom_time is null then plan_end_day else custom_time end ) as plan_end_day
+ from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
<if test="professionalAffiliation != null "> and professional_affiliation = #{professionalAffiliation}</if>
@@ -286,7 +287,8 @@
unmatched_quantity,version
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>
+ <if test="plant != null and plant !='' "> and plant = #{plant}</if>
+ <if test="itemNumber != null and itemNumber !='' "> and item_number = #{itemNumber}</if>
order by document_number asc,id asc
limit 1
</select>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
index b060b3f..be61a98 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
@@ -150,11 +150,11 @@
<update id="updatePlanDateByBatch" parameterType="ApsPlateOrderPlanRequireDate">
update aps_plate_plan set
- plan_start_day = #{planRequireDate.start},
- plan_end_day = #{planRequireDate.end},
- update_by = #{planRequireDate.updateBy},
+ plan_start_day = #{start},
+ plan_end_day = #{end},
+ update_by = #{updateBy},
update_time = now()
- where id = #{planRequireDate.id}
+ where id = #{id}
</update>
<update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
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 4998b0a..92ccff6 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
@@ -187,7 +187,7 @@
<insert id="batchInsert" parameterType="java.util.List">
insert into aps_plate_standard_require
- (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,
+ (id, require_track_id,doc_num,batch_number, org_code, bom_header_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, del_flag, create_time, create_by)
@@ -199,6 +199,7 @@
#{item.docNum},
#{item.batchNumber},
#{item.orgCode},
+ #{item.bomHeaderCode},
#{item.bomLineId},
#{item.bomLineCode},
#{item.bomLineLevel},
--
Gitblit v1.9.3