From cc6b33248820e1f2af592b732831463290a8c50a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 09:41:22 +0800
Subject: [PATCH] 修改字段名称
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 1 +
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 8 +++++---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 5 +++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 11 ++++++++---
4 files changed, 19 insertions(+), 6 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 f878ca4..9b80bd2 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
@@ -48,6 +48,7 @@
return list;
}
+// @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
@PutMapping("/planDate")
public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
{
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 c19ae34..5bcac8f 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
@@ -30,7 +30,7 @@
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private Long requireTraceId;
+ private Long requireTrackId;
/** 宸ュ崟鍙� */
@Excel(name = "宸ュ崟鍙�")
@@ -94,10 +94,15 @@
/** 闇�姹傝鍒掑紑宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傝鍒掑紑宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date startDay;
+ private Date startDate;
/** 闇�姹傝鍒掑紑瀹屾棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傝鍒掑紑瀹屾棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date completeDay;
+ private Date completeDate;
+
+ /** 鑷畾涔夋棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鑷畾涔夋棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date customTime;
}
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 e0eb84d..65aacf2 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
@@ -189,6 +189,11 @@
@Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderCreateTime;
+ /** 鑷畾涔夋椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鑷畾涔夋椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date customTime;
+
/** 鐢熶骇鍩哄湴 */
@Excel(name = "鐢熶骇鍩哄湴")
private String productionBase;
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 a19381d..97c1a0e 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
@@ -23,6 +23,7 @@
<result property="hasDelayRisk" column="has_delay_risk" />
<result property="startDate" column="start_date" />
<result property="completeDate" column="complete_date" />
+ <result property="customTime" column="custom_time" />
</resultMap>
<select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
@@ -41,12 +42,13 @@
plan.plan_start_day,
plan.plan_end_day,
plan.unmatched_quantity,
+ plan.custom_time,
require.has_delay_risk,
plan.id,
require.start_date,
require.complete_date
from aps_plate_standard_require_bom_order_detail detail
- left join aps_plate_standard_require require on on detail.require_id = require.id
+ left join aps_plate_standard_require require on detail.require_id = require.id
left join aps_plate_plan plan on detail.doc_no = plan.document_number
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
@@ -137,7 +139,7 @@
min(require.start_date) as start_date,
min(require.complete_date) as end_date
from aps_plate_standard_require_bom_order_detail detail
- left join aps_plate_standard_require require on on detail.require_id = require.id
+ left join aps_plate_standard_require require on detail.require_id = require.id
left join aps_plate_plan plan on detail.doc_no = plan.document_number
where plan.id in
<foreach collection="planIds" item="planId" open="(" separator="," close=")">
@@ -157,7 +159,7 @@
<update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
update aps_plate_plan set
- plan_end_day = #{planRequireDate.customDate},
+ custom_time = #{planRequireDate.customDate},
update_by = #{planRequireDate.updateBy},
update_time = now()
where id in
--
Gitblit v1.9.3