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) { aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -30,7 +30,7 @@ /** 需求追溯ID */ @Excel(name = "需求追溯ID") 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; } 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; 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
