From 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:17 +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/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 6 ++++--
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 10 ++++++----
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java | 21 ++++++++++++++++++---
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 ++++++++---
6 files changed, 44 insertions(+), 12 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..065b168 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
@@ -3,6 +3,7 @@
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanDate;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -28,7 +29,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
@@ -40,7 +41,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
@GetMapping("/requirement/list")
public List<ApsPlateStandardRequire> list(String workOrderNo)
{
@@ -48,6 +49,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/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
index e7f6293..708c875 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
@@ -2,6 +2,7 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -96,6 +97,8 @@
private BigDecimal unmatchedDemandAmount;
/** 寤鸿瀹屾垚鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寤鸿瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date suggestedCompletionDate;
/** 寤惰繜椋庨櫓鏍囪瘑 */
private String hasDelayRisk;
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 db7202a..fde2037 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
@@ -7,6 +7,7 @@
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
+import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,9 @@
@Autowired
private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;
+ @Autowired
+ private IApsPlateStandardRequireService apsPlateStandardRequireService;
+
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
*
@@ -35,23 +39,34 @@
return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
}
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟璁″垝鏍囧噯闇�姹�
+ *
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return
+ */
@Override
public List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo) {
return apsPlateOrderPlanManagerMapper.selectApsPlanStandardRequire(workOrderNo);
}
+ /**
+ * 鎵归噺鏇存柊璁″垝鏃堕棿
+ *
+ * @param apsPlateOrderPlanDate
+ */
@Transactional(rollbackFor = Exception.class)
@Override
public void updatePlanDate(ApsPlateOrderPlanDate apsPlateOrderPlanDate) {
- if (apsPlateOrderPlanDate.getIsCustom()){
+ if (apsPlateOrderPlanDate.getIsCustom()) {
apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
- }else{
+ } else {
List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
planRequireDates.forEach(planRequireDate -> {
planRequireDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
});
}
-
+// apsPlateStandardRequireService.generatorPlan();
}
}
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..b060b3f 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>
@@ -87,7 +89,7 @@
</resultMap>
<sql id="selectApsPlateStandardRequireVo">
- select require.id,
+ select distinct require.id,
require.require_track_id,
require.bom_line_id,
require.bom_line_code,
@@ -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