From 457e468312c247ef078b2db7de336baf8cc398d5 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 17:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 14 ++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 85 +++++++++++++++++++++++++--
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java | 9 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java | 6 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java | 3 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 5 +
6 files changed, 111 insertions(+), 11 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
index 1d1fa17..e6bc32c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
@@ -4,6 +4,7 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,7 +29,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
- @RequiresPermissions("ApsPlatOrderPlanManager:list")
+// @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
@@ -37,4 +38,15 @@
return getDataTable(list);
}
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
+ */
+// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @GetMapping("/requirement/list")
+ public List<ApsPlateStandardRequire> list(String workOrderNo)
+ {
+ List<ApsPlateStandardRequire> list = iapPlateOrderPlanManagerService.selectApsPlanStandardRequire(workOrderNo);
+ return list;
+ }
+
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
index e391b63..d88b2d4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -22,11 +22,11 @@
/** 闇�姹侷D */
@Excel(name = "闇�姹侷D")
- private String requireId;
+ private Long requireId;
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private String requireTraceId;
+ private Long requireTraceId;
/** 宸ュ崟鍙� */
@Excel(name = "宸ュ崟鍙�")
@@ -79,6 +79,7 @@
private Date planEndDay;
/** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+ @Excel(name = "鏈尮閰嶇殑鐢熶骇鏁伴噺")
private BigDecimal unmatchedQuantity;
/** 宸ュ崟鍒涘缓鏃堕棿 */
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
index b46fc96..8a8be60 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
@@ -1,6 +1,7 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlateStandardRequire;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -22,4 +23,12 @@
* @return 閽ｉ噾宸ュ崟璁″垝绠＄悊
*/
List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
+
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
+ *
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
+ */
+ List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
index 05da025..32da57d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
@@ -1,6 +1,7 @@
package com.aps.core.service;
import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlateStandardRequire;
import java.util.List;
@@ -14,4 +15,6 @@
{
List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
+
+ List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
index 001c0d9..ada802f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
@@ -5,6 +5,7 @@
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsPlant;
import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlantMapper;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.IApsPlantService;
@@ -36,4 +37,9 @@
public List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager) {
return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
}
+
+ @Override
+ public List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo) {
+ return apsPlateOrderPlanManagerMapper.selectApsPlanStandardRequire(workOrderNo);
+ }
}
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 506010d..ab86a94 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
@@ -7,19 +7,19 @@
<resultMap type="ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
<result property="require_id" column="requireId" />
<result property="requireTrackId" column="require_track_id" />
- <result property="docNo" column="doc_no" />
+ <result property="workOrderNo" column="doc_no" />
<result property="deductionAmount" column="deduction_amount" />
- <result property="workOrderType" column="work_order_type" />
+ <result property="workOrderType" column="professional_affiliation" />
<result property="mainPartNumber" column="main_part_number" />
<result property="mainPartDrawingNumber" column="main_part_drawing_number" />
<result property="customer" column="customer" />
<result property="productionQuantity" column="production_quantity" />
- <result property="applicableFactories" column="applicable_factories" />
+ <result property="applicableFactories" column="plant" />
<result property="productionBase" column="production_base" />
<result property="planStartDay" column="plan_start_day" />
<result property="planEndDay" column="plan_end_day" />
<result property="unmatchedQuantity" column="unmatched_quantity" />
- <result property="hasDelayRisk" column="has_delay_risk" />
+ <result property="hasDelayRisk" column="has_risk" />
</resultMap>
<select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
@@ -28,17 +28,17 @@
detail.require_track_id,
detail.doc_no,
detail.deduction_amount,
- plan.professional_affiliation as workOrderType,
- plan.main_part_number as item_number,
+ plan.professional_affiliation,
+ plan.main_part_number,
plan.main_part_drawing_number,
plan.customer,
plan.production_quantity,
- plan.plant as applicable_factories,
+ plan.plant,
plan.production_base,
plan.plan_start_day,
plan.plan_end_day,
plan.unmatched_quantity,
- plan.has_risk as has_delay_risk
+ plan.has_risk
from aps_plate_standard_require_bom_order_detail detail
left join aps_plate_plan plan on detail.doc_no = plan.document_number
<where>
@@ -49,4 +49,73 @@
</where>
</select>
+
+ <resultMap type="ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
+ <result property="id" column="id" />
+ <result property="requireId" column="require_id" />
+ <result property="bomLineId" column="bom_line_id" />
+ <result property="bomLineCode" column="bom_line_code" />
+ <result property="bomLineLevel" column="bom_line_level" />
+ <result property="bomUseAmount" column="bom_use_amount" />
+ <result property="processRouteId" column="process_route_id" />
+ <result property="processRouteHours" column="process_route_hours" />
+ <result property="requireAmount" column="require_amount" />
+ <result property="netRequirement" column="net_requirement" />
+ <result property="startDate" column="start_date" />
+ <result property="completeDate" column="complete_date" />
+ <result property="demandDate" column="demand_date" />
+ <result property="orgCode" column="org_code" />
+ <result property="productionBase" column="production_base" />
+ <result property="matchState" column="match_state" />
+ <result property="matchMode" column="match_mode" />
+ <result property="unmatchedDemandAmount" column="unmatched_demand_amount" />
+ <result property="suggestedCompletionDate" column="suggested_completion_date" />
+ <result property="hasDelayRisk" column="has_delay_risk" />
+ <result property="batchNumber" column="batch_number" />
+ <result property="delFlag" column="del_flag" />
+ <result property="createTime" column="create_time" />
+ <result property="createBy" column="create_by" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectApsPlateStandardRequireVo">
+ select require.id,
+ require.require_id,
+ require.bom_line_id,
+ require.bom_line_code,
+ require.bom_line_level,
+ require.bom_use_amount,
+ require.process_route_id,
+ require.process_route_hours,
+ require.require_amount,
+ require.net_requirement,
+ require.start_date,
+ require.complete_date,
+ require.demand_date,
+ require.org_code,
+ require.production_base,
+ require.match_state,
+ require.match_mode,
+ require.unmatched_demand_amount,
+ require.suggested_completion_date,
+ require.has_delay_risk,
+ require.batch_number,
+ require.del_flag,
+ require.create_time,
+ require.create_by,
+ require.update_by,
+ require.update_time
+ from
+ aps_plate_standard_require require
+ left join aps_plate_standard_require_bom_order_detail detail on detail.require_id = require.id
+ </sql>
+
+ <select id="selectApsPlanStandardRequire" parameterType="String" resultMap="ApsPlateStandardRequireResult">
+ <include refid="selectApsPlateStandardRequireVo"/>
+ <where>
+ <if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3