From a8a2ea850139b9cccb756989fc70201f6a2a0550 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 15 五月 2025 14:39:43 +0800
Subject: [PATCH] 修改计划管理接口ajax返回值

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml |   79 ++++++++++++++++++++++++++++++++-------
 1 files changed, 65 insertions(+), 14 deletions(-)

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 5c2ae08..a162699 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
@@ -4,9 +4,9 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireMapper">
     
-    <resultMap type="ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
+    <resultMap type="com.aps.core.domain.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
         <result property="id"    column="id"    />
-        <result property="requireId"    column="require_id"    />
+        <result property="requireTrackId"    column="require_track_id"    />
         <result property="bomLineId"    column="bom_line_id"    />
         <result property="bomLineCode"    column="bom_line_code"    />
         <result property="bomLineLevel"    column="bom_line_level"    />
@@ -31,16 +31,22 @@
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="orderCreateTime"    column="order_create_time"    />
     </resultMap>
 
     <sql id="selectApsPlateStandardRequireVo">
-        select id, require_id, 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, org_code, production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require
+        select id, require_track_id, 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, org_code, production_base, match_state, match_mode,
+               unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number,
+               del_flag, create_time, create_by, update_by, update_time,order_create_time
+        from aps_plate_standard_require
     </sql>
 
-    <select id="selectApsPlateStandardRequireList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
+    <select id="selectApsPlateStandardRequireList" parameterType="com.aps.core.domain.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
         <include refid="selectApsPlateStandardRequireVo"/>
         <where>  
-            <if test="requireId != null  and requireId != ''"> and require_id = #{requireId}</if>
+            <if test="requireTrackId != null  and requireTrackId != ''"> and require_track_id = #{requireTrackId}</if>
             <if test="bomLineId != null  and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
             <if test="bomLineCode != null  and bomLineCode != ''"> and bom_line_code = #{bomLineCode}</if>
             <if test="bomLineLevel != null "> and bom_line_level = #{bomLineLevel}</if>
@@ -68,11 +74,11 @@
         where id = #{id}
     </select>
 
-    <insert id="insertApsPlateStandardRequire" parameterType="ApsPlateStandardRequire">
+    <insert id="insertApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlateStandardRequire">
         insert into aps_plate_standard_require
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="requireId != null">require_id,</if>
+            <if test="requireTrackId != null">require_track_id,</if>
             <if test="bomLineId != null">bom_line_id,</if>
             <if test="bomLineCode != null">bom_line_code,</if>
             <if test="bomLineLevel != null">bom_line_level,</if>
@@ -100,7 +106,7 @@
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="requireId != null">#{requireId},</if>
+            <if test="requireTrackId != null">#{requireTrackId},</if>
             <if test="bomLineId != null">#{bomLineId},</if>
             <if test="bomLineCode != null">#{bomLineCode},</if>
             <if test="bomLineLevel != null">#{bomLineLevel},</if>
@@ -128,10 +134,10 @@
          </trim>
     </insert>
 
-    <update id="updateApsPlateStandardRequire" parameterType="ApsPlateStandardRequire">
+    <update id="updateApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlateStandardRequire">
         update aps_plate_standard_require
         <trim prefix="SET" suffixOverrides=",">
-            <if test="requireId != null">require_id = #{requireId},</if>
+            <if test="requireTrackId != null">require_track_id = #{requireTrackId},</if>
             <if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
             <if test="bomLineCode != null">bom_line_code = #{bomLineCode},</if>
             <if test="bomLineLevel != null">bom_line_level = #{bomLineLevel},</if>
@@ -171,10 +177,55 @@
         </foreach>
     </delete>
 
-    <select id="selectPlateSupplyGapList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
-        select id, require_id, bom_line_code, bom_line_level, match_state, match_mode, unmatched_demand_amount, start_date, complete_date, demand_date, org_code, production_base
-        from aps_plate_standard_require where unmatched_demand_amount>0
-        <if test="requireId != null and requireId != ''"> and require_id like '%' || #{requireId} || '%'</if>
+    <select id="selectPlateSupplyGapList" parameterType="com.aps.core.domain.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
+        select id, require_track_id, bom_line_code, bom_line_level,
+               match_state, match_mode, unmatched_demand_amount, start_date,
+               complete_date, demand_date, org_code, production_base
+        from aps_plate_standard_require where unmatched_demand_amount>0 and del_flag='0' and bom_line_level>0
+        <if test="requireTrackId != null and requireTrackId != ''"> and require_track_id like '%' || #{requireTrackId} || '%'</if>
         <if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
     </select>
+
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into aps_plate_standard_require
+        (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,order_create_time)
+        values
+        <foreach collection="list" item="item" separator=",">
+        (
+            #{item.id},
+            #{item.requireTrackId},
+            #{item.docNum},
+            #{item.batchNumber},
+            #{item.orgCode},
+            #{item.bomHeaderCode},
+            #{item.bomLineId},
+            #{item.bomLineCode},
+            #{item.bomLineLevel},
+            #{item.bomUseAmount},
+            #{item.processRouteId},
+            #{item.processRouteHours},
+            #{item.requireAmount},
+            #{item.netRequirement},
+            #{item.startDate},
+            #{item.completeDate},
+            #{item.demandDate},
+            #{item.productionBase},
+            #{item.matchState},
+            #{item.matchMode},
+            #{item.unmatchedDemandAmount},
+            #{item.suggestedCompletionDate},
+            #{item.hasDelayRisk},
+            #{item.delFlag},
+            #{item.createTime},
+            #{item.createBy},
+            #{item.orderCreateTime}
+        )
+        </foreach>
+    </insert>
+    <update id="deleteLastPatch" parameterType="String">
+        update aps_plate_standard_require set del_flag = '1' where batch_number = #{batchNumber}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3