Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

hongjli

2025-05-14 533bccb991763a5c2db8a958fa5003b90b196cfc

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java

@@ -58,7 +58,7 @@

    /** 总数量 */
    @Excel(name = "总数量")
    private BigDecimal total_num;
    private BigDecimal totalNum;

    /** 准备工时 */
    @Excel(name = "准备工时")

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java

@@ -177,6 +177,26 @@
    @Excel(name = "下一工序名称")
    private String nextOpName;

    public BigDecimal getUnmatchedQuantity() {
        return unmatchedQuantity;
    }

    public void setUnmatchedQuantity(BigDecimal unmatchedQuantity) {
        this.unmatchedQuantity = unmatchedQuantity;
    }

    public String getProfessionalAffiliation() {
        return professionalAffiliation;
    }

    public void setProfessionalAffiliation(String professionalAffiliation) {
        this.professionalAffiliation = professionalAffiliation;
    }

    /** 未匹配的生产数量*/
    private BigDecimal unmatchedQuantity;
    /** 专业归属*/
    private String professionalAffiliation;

    public String getOpStatus() {
        return opStatus;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java

@@ -5,8 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.io.Serial;
import java.math.BigDecimal;
@@ -217,6 +215,9 @@
    private String requireId;

    private Integer version;

    /** 低阶码*/
    private String lowOrderCode;
/*
    public String getOpStatus() {
        return opStatus;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java

@@ -154,6 +154,9 @@
    @Excel(name = "下一工序名称")
    private String nextOpName;

    /** 低阶码*/
    @Excel(name = "低阶码")
    private String lowOrderCode;

    private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsBomHeaderMapper">
    
    <resultMap type="ApsBomHeader" id="ApsBomHeaderResult">
    <resultMap type="com.aps.core.domain.ApsBomHeader" id="ApsBomHeaderResult">
        <result property="id"    column="id"    />
        <result property="bomHeaderId"    column="bom_header_id"    />
        <result property="itemCode"    column="item_code"    />
@@ -25,7 +25,7 @@
        from aps_bom_header
    </sql>

    <select id="selectApsBomHeaderList" parameterType="ApsBomHeader" resultMap="ApsBomHeaderResult">
    <select id="selectApsBomHeaderList" parameterType="com.aps.core.domain.ApsBomHeader" resultMap="ApsBomHeaderResult">
        <include refid="selectApsBomHeaderVo"/>
        <where>  
            <if test="bomHeaderId != null  and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
@@ -42,7 +42,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsBomHeader" parameterType="ApsBomHeader">
    <insert id="insertApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
        insert into aps_bom_header
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -74,7 +74,7 @@
         </trim>
    </insert>

    <update id="updateApsBomHeader" parameterType="ApsBomHeader">
    <update id="updateApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
        update aps_bom_header
        <trim prefix="SET" suffixOverrides=",">
            <if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsBomMapper">
    
    <resultMap type="ApsBom" id="ApsBomResult">
    <resultMap type="com.aps.core.domain.ApsBom" id="ApsBomResult">
        <result property="id"    column="id"    />
        <result property="bomLineId"    column="bom_line_id"    />
        <result property="bomHeaderId"    column="bom_header_id"    />
@@ -34,7 +34,7 @@
        from aps_bom_line
    </sql>

    <select id="selectApsBomList" parameterType="ApsBom" resultMap="ApsBomResult">
    <select id="selectApsBomList" parameterType="com.aps.core.domain.ApsBom" resultMap="ApsBomResult">
        <include refid="selectApsBomVo"/>
        <where>  
            <if test="bomLineId != null  and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
@@ -55,7 +55,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsBom" parameterType="ApsBom" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertApsBom" parameterType="com.aps.core.domain.ApsBom" useGeneratedKeys="true" keyProperty="id">
        insert into aps_bom_line
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="bomLineId != null">bom_line_id,</if>
@@ -101,7 +101,7 @@
         </trim>
    </insert>

    <update id="updateApsBom" parameterType="ApsBom">
    <update id="updateApsBom" parameterType="com.aps.core.domain.ApsBom">
        update aps_bom_line
        <trim prefix="SET" suffixOverrides=",">
            <if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
@@ -138,7 +138,7 @@
        </foreach>
    </delete>

    <resultMap type="ApsBom" id="ApsBomLineResult">
    <resultMap type="com.aps.core.domain.ApsBom" id="ApsBomLineResult">
        <result property="id"    column="id"    />
        <result property="bomLineId"    column="bom_line_id"    />
        <result property="itemCode"    column="item_code"    />

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml

@@ -3,7 +3,7 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasMaterialUsageMapper">
    <resultMap type="ApsGasMaterialUsage" id="ApsGasMaterialUsageResult">
    <resultMap type="com.aps.core.domain.ApsGasMaterialUsage" id="ApsGasMaterialUsageResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="drawingNo"    column="drawing_no"    />
@@ -20,7 +20,7 @@
        select id, item_number, drawing_no, version, process_name, standard_amount, org_code, create_by, create_time, del_flag from aps_gas_material_usage
    </sql>

    <select id="selectApsGasMaterialUsageList" parameterType="ApsGasMaterialUsage" resultMap="ApsGasMaterialUsageResult">
    <select id="selectApsGasMaterialUsageList" parameterType="com.aps.core.domain.ApsGasMaterialUsage" resultMap="ApsGasMaterialUsageResult">
        <include refid="selectApsGasMaterialUsageVo"/>
        <where>
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -38,7 +38,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsGasMaterialUsage" parameterType="ApsGasMaterialUsage" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertApsGasMaterialUsage" parameterType="com.aps.core.domain.ApsGasMaterialUsage" useGeneratedKeys="true" keyProperty="id">
        insert into aps_gas_material_usage
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="itemNumber != null">item_number,</if>
@@ -64,7 +64,7 @@
        </trim>
    </insert>

    <update id="updateApsGasMaterialUsage" parameterType="ApsGasMaterialUsage">
    <update id="updateApsGasMaterialUsage" parameterType="com.aps.core.domain.ApsGasMaterialUsage">
        update aps_gas_material_usage
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasPipelineCapacityPlanMapper">
    
    <resultMap type="ApsGasPipelineCapacityPlan" id="ApsGasPipelineCapacityPlanResult">
    <resultMap type="com.aps.core.domain.ApsGasPipelineCapacityPlan" id="ApsGasPipelineCapacityPlanResult">
        <result property="id"    column="id"    />
        <result property="processName"    column="process_name"    />
        <result property="year"    column="year"    />
@@ -29,7 +29,7 @@
        select id, process_name, year, month, major, day_produce_type, day_produce_num, day_produce_unit, personnel_number, day_produce_all_num, days, month_produce_all_num, remark, create_by, create_time, update_by, update_time, org_code from aps_gas_pipeline_capacity_plan
    </sql>

    <select id="selectApsGasPipelineCapacityPlanList" parameterType="ApsGasPipelineCapacityPlan" resultMap="ApsGasPipelineCapacityPlanResult">
    <select id="selectApsGasPipelineCapacityPlanList" parameterType="com.aps.core.domain.ApsGasPipelineCapacityPlan" resultMap="ApsGasPipelineCapacityPlanResult">
        <include refid="selectApsGasPipelineCapacityPlanVo"/>
        <where>  
            <if test="processName != null  and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
@@ -55,7 +55,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsGasPipelineCapacityPlan" parameterType="ApsGasPipelineCapacityPlan">
    <insert id="insertApsGasPipelineCapacityPlan" parameterType="com.aps.core.domain.ApsGasPipelineCapacityPlan">
        insert into aps_gas_pipeline_capacity_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -99,7 +99,7 @@
         </trim>
    </insert>

    <update id="updateApsGasPipelineCapacityPlan" parameterType="ApsGasPipelineCapacityPlan">
    <update id="updateApsGasPipelineCapacityPlan" parameterType="com.aps.core.domain.ApsGasPipelineCapacityPlan">
        update aps_gas_pipeline_capacity_plan
        <trim prefix="SET" suffixOverrides=",">
            <if test="processName != null">process_name = #{processName},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasPipingPlanMapper">
    
    <resultMap type="ApsGasPipingPlan" id="ApsGasPipingPlanResult">
    <resultMap type="com.aps.core.domain.ApsGasPipingPlan" id="ApsGasPipingPlanResult">
        <result property="id"    column="id"    />
        <result property="masterPlanner"    column="master_planner"    />
        <result property="weekDay"    column="week_day"    />
@@ -71,7 +71,7 @@
<!--        </collection>-->
    </resultMap>

    <resultMap type="ApsGasPipingPlan" id="ApsGasPipingPlanResultWithProcess">
    <resultMap type="com.aps.core.domain.ApsGasPipingPlan" id="ApsGasPipingPlanResultWithProcess">
        <result property="documentNumber"    column="document_number"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="productionQuantity"    column="production_quantity"    />
@@ -99,7 +99,7 @@
        from aps_gas_piping_plan
    </sql>

    <select id="selectApsGasPipingPlanList" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResult">
    <select id="selectApsGasPipingPlanList" parameterType="com.aps.core.domain.ApsGasPipingPlan" resultMap="ApsGasPipingPlanResult">
        <include refid="selectApsGasPipingPlanVo"/>
        <where>  
            <if test="masterPlanner != null  and masterPlanner != ''"> and master_planner like concat('%', #{masterPlanner}, '%')</if>
@@ -144,7 +144,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsGasPipingPlan" parameterType="ApsGasPipingPlan">
    <insert id="insertApsGasPipingPlan" parameterType="com.aps.core.domain.ApsGasPipingPlan">
        insert into aps_gas_piping_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">id,</if>
@@ -228,7 +228,7 @@
         </trim>
    </insert>

    <update id="updateApsGasPipingPlan" parameterType="ApsGasPipingPlan">
    <update id="updateApsGasPipingPlan" parameterType="com.aps.core.domain.ApsGasPipingPlan">
        update aps_gas_piping_plan
        <trim prefix="SET" suffixOverrides=",">
            <if test="masterPlanner != null">master_planner = #{masterPlanner},</if>
@@ -287,7 +287,7 @@
        update  aps_gas_piping_plan  set del_flag='1' where del_flag ='0'
    </update>

    <select id="selectApsGasPipingPlanWithProcess" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResultWithProcess">
    <select id="selectApsGasPipingPlanWithProcess" parameterType="com.aps.core.domain.ApsGasPipingPlan" resultMap="ApsGasPipingPlanResultWithProcess">
        select c.* from (select a.document_number,a.item_number,a.process_number,a.production_quantity,a.plan_type,a.plan_end_day,a.std_op,b.process_name,b.process_number as process_number_sub,b.standard_time,b.process_plan_start_day,b.process_plan_end_day from aps_gas_piping_plan a
           left join aps_process_route b on a.document_number = b.work_order_no
        where a.document_status in ('0','1','2','4') and a.op_status!='完工' and b.process_plan_start_day is not null and b.process_name in(select process_name from aps_standard_process where major='气柜' or major='管路') ORDER BY a.document_number,b.process_number) c GROUP BY c.document_number,c.item_number,c.process_number,c.production_quantity,c.process_name,c.process_number_sub,c.standard_time,c.process_plan_start_day,c.plan_type,c.process_plan_end_day,c.plan_end_day,c.std_op

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasPipingPlanTempMapper">
    
    <resultMap type="ApsGasPipingPlanTemp" id="ApsGasPipingPlanTempResult">
    <resultMap type="com.aps.core.domain.ApsGasPipingPlanTemp" id="ApsGasPipingPlanTempResult">
        <result property="id"    column="id"    />
        <result property="masterPlanner"    column="master_planner"    />
        <result property="weekDay"    column="week_day"    />
@@ -47,7 +47,7 @@
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk, batch_number from aps_gas_piping_plan_temp
    </sql>

    <select id="selectApsGasPipingPlanTempList" parameterType="ApsGasPipingPlanTemp" resultMap="ApsGasPipingPlanTempResult">
    <select id="selectApsGasPipingPlanTempList" parameterType="com.aps.core.domain.ApsGasPipingPlanTemp" resultMap="ApsGasPipingPlanTempResult">
        <include refid="selectApsGasPipingPlanTempVo"/>
        <where>  
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -60,7 +60,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsGasPipingPlanTemp" parameterType="ApsGasPipingPlanTemp">
    <insert id="insertApsGasPipingPlanTemp" parameterType="com.aps.core.domain.ApsGasPipingPlanTemp">
        insert into aps_gas_piping_plan_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">id,</if>
@@ -140,7 +140,7 @@
         </trim>
    </insert>

    <update id="updateApsGasPipingPlanTemp" parameterType="ApsGasPipingPlanTemp">
    <update id="updateApsGasPipingPlanTemp" parameterType="com.aps.core.domain.ApsGasPipingPlanTemp">
        update aps_gas_piping_plan_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="masterPlanner != null">master_planner = #{masterPlanner},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasPipingRouteStatMapper">
    
    <resultMap type="ApsGasPipingRouteStat" id="ApsGasPipingRouteStatResult">
    <resultMap type="com.aps.core.domain.ApsGasPipingRouteStat" id="ApsGasPipingRouteStatResult">
        <result property="id"    column="id"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="roadProcessNumber"    column="road_process_number"    />
@@ -42,7 +42,7 @@
        from aps_gas_piping_route_stat
    </sql>

    <select id="selectApsGasPipingRouteStatList" parameterType="ApsGasPipingRouteStat" resultMap="ApsGasPipingRouteStatResult">
    <select id="selectApsGasPipingRouteStatList" parameterType="com.aps.core.domain.ApsGasPipingRouteStat" resultMap="ApsGasPipingRouteStatResult">
        <include refid="selectApsGasPipingRouteStatVo"/>
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
@@ -75,7 +75,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsGasPipingRouteStat" parameterType="ApsGasPipingRouteStat">
    <insert id="insertApsGasPipingRouteStat" parameterType="com.aps.core.domain.ApsGasPipingRouteStat">
        insert into aps_gas_piping_route_stat
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -133,7 +133,7 @@
         </trim>
    </insert>

    <update id="updateApsGasPipingRouteStat" parameterType="ApsGasPipingRouteStat">
    <update id="updateApsGasPipingRouteStat" parameterType="com.aps.core.domain.ApsGasPipingRouteStat">
        update aps_gas_piping_route_stat
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsMaterialManagementMapper">
    
    <resultMap type="ApsMaterialManagement" id="ApsMaterialManagementResult">
    <resultMap type="com.aps.core.domain.ApsMaterialManagement" id="ApsMaterialManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="materialDescription"    column="material_description"    />
@@ -31,7 +31,7 @@
        select id, item_number, material_description, material_status, material_type, professional_affiliation, drawing_no, version_number, advance_production_days, split_batch, self_made, applicable_factories, applicable_workshop, effective_date, expiring_date, integration_date, create_by, create_time, update_by, update_time from aps_material_management
    </sql>

    <select id="selectApsMaterialManagementList" parameterType="ApsMaterialManagement" resultMap="ApsMaterialManagementResult">
    <select id="selectApsMaterialManagementList" parameterType="com.aps.core.domain.ApsMaterialManagement" resultMap="ApsMaterialManagementResult">
        <include refid="selectApsMaterialManagementVo"/>
        <where>  
            <if test="itemNumber != null "> and item_number = #{itemNumber}</if>
@@ -43,7 +43,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsMaterialManagement" parameterType="ApsMaterialManagement">
    <insert id="insertApsMaterialManagement" parameterType="com.aps.core.domain.ApsMaterialManagement">
        insert into aps_material_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -91,7 +91,7 @@
         </trim>
    </insert>

    <update id="updateApsMaterialManagement" parameterType="ApsMaterialManagement">
    <update id="updateApsMaterialManagement" parameterType="com.aps.core.domain.ApsMaterialManagement">
        update aps_material_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsMaterialStorageManagementMapper">
    
    <resultMap type="ApsMaterialStorageManagement" id="ApsMaterialStorageManagementResult">
    <resultMap type="com.aps.core.domain.ApsMaterialStorageManagement" id="ApsMaterialStorageManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="num"    column="num"    />
@@ -26,7 +26,7 @@
        from aps_material_storage_management
    </sql>

    <select id="selectApsMaterialStorageManagementList" parameterType="ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
    <select id="selectApsMaterialStorageManagementList" parameterType="com.aps.core.domain.ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
        <include refid="selectApsMaterialStorageManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -39,7 +39,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
    <insert id="insertApsMaterialStorageManagement" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
        insert into aps_material_storage_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -67,7 +67,7 @@
         </trim>
    </insert>

    <update id="updateApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
    <update id="updateApsMaterialStorageManagement" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
        update aps_material_storage_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>
@@ -93,7 +93,7 @@
            #{id}
        </foreach>
    </delete>
    <update id="updateMaterialStorageByVersion" parameterType="ApsMaterialStorageManagement">
    <update id="updateMaterialStorageByVersion" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
        update aps_material_storage_management
        set remainder_stock=#{remainderStock},version=version+1
        where id=#{id} and version=#{version}
@@ -105,7 +105,7 @@
        where 1=1
    </update>

    <update id="updateRemainderStock" parameterType="ApsMaterialStorageManagement">
    <update id="updateRemainderStock" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
        update aps_material_storage_management
        set remainder_stock=#{remainderStock},version=#{version}
        where id=#{id}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPartRouteStatMapper">
    
    <resultMap type="ApsPartRouteStat" id="ApsPartRouteStatResult">
    <resultMap type="com.aps.core.domain.ApsPartRouteStat" id="ApsPartRouteStatResult">
        <result property="id"    column="id"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="roadProcessNumber"    column="road_process_number"    />
@@ -24,7 +24,7 @@
        select id, work_order_no, road_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_start_day, design_times, del_flag, create_by, batch_number ,resource_group_name from aps_part_route_stat
    </sql>

    <select id="selectApsPartRouteStatList" parameterType="ApsPartRouteStat" resultMap="ApsPartRouteStatResult">
    <select id="selectApsPartRouteStatList" parameterType="com.aps.core.domain.ApsPartRouteStat" resultMap="ApsPartRouteStatResult">
        <include refid="selectApsPartRouteStatVo"/>
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
@@ -44,7 +44,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPartRouteStat" parameterType="ApsPartRouteStat">
    <insert id="insertApsPartRouteStat" parameterType="com.aps.core.domain.ApsPartRouteStat">
        insert into aps_part_route_stat
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -78,7 +78,7 @@
         </trim>
    </insert>

    <update id="updateApsPartRouteStat" parameterType="ApsPartRouteStat">
    <update id="updateApsPartRouteStat" parameterType="com.aps.core.domain.ApsPartRouteStat">
        update aps_part_route_stat
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
@@ -128,7 +128,7 @@
            order by rt.work_order_no,process_plan_start_day
    </select>

    <resultMap type="ApsResourceDateStat" id="ApsResourceDateStatResult">
    <resultMap type="com.aps.core.domain.ApsResourceDateStat" id="ApsResourceDateStatResult">
        <result property="planDay"    column="plan_day"    />
        <result property="resourceName"    column="resource_name"    />
        <result property="requireTimes"    column="require_times"    />

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml

@@ -19,7 +19,7 @@
        select id, plant_name, plant_code, status, create_by, create_time, update_by, update_time from aps_plant
    </sql>

    <select id="selectApsPlantList" parameterType="ApsPlant" resultMap="ApsPlantResult">
    <select id="selectApsPlantList" parameterType="com.aps.core.domain.ApsPlant" resultMap="ApsPlantResult">
        <include refid="selectApsPlantVo"/>
        <where>  
            <if test="plantName != null  and plantName != ''"> and plant_name = #{plantName}</if>
@@ -33,7 +33,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlant" parameterType="ApsPlant" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertApsPlant" parameterType="com.aps.core.domain.ApsPlant" useGeneratedKeys="true" keyProperty="id">
        insert into aps_plant
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null  and id != ''" >id,</if>
@@ -57,7 +57,7 @@
         </trim>
    </insert>

    <update id="updateApsPlant" parameterType="ApsPlant">
    <update id="updateApsPlant" parameterType="com.aps.core.domain.ApsPlant">
        update aps_plant
        <trim prefix="SET" suffixOverrides=",">
            <if test="plantName != null">plant_name = #{plantName},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml

@@ -51,6 +51,7 @@
        <result property="version"    column="version"    />
        <result property="approveOn" column="approve_on"    />
        <result property="startWorkDate" column="start_work_date"    />
        <result property="lowOrderCode" column="low_order_code"    />
    </resultMap>

    <sql id="selectApsPlatePlanVo">
@@ -61,7 +62,7 @@
               standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
               advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
               has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation,
                   require_id, version,production_base, order_create_time, approve_on, start_work_date
                   require_id, version,production_base, order_create_time, approve_on, start_work_date, low_order_code
        from aps_plate_plan
    </sql>

@@ -106,6 +107,7 @@
            <if test="stdOp != null "> and std_op = #{stdOp}</if>
            <if test="opStatus != null  and opStatus != ''"> and op_status = #{opStatus}</if>
            <if test="nextOpName != null  and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
            <if test="lowOrderCode != null  and lowOrderCode != ''"> and low_order_code = #{lowOrderCode}</if>
             and del_flag='0'
        </where>
    </select>
@@ -157,6 +159,7 @@
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
            <if test="unmatchedQuantity != null">unmatched_quantity,</if>
            <if test="lowOrderCode != null">low_order_code,</if>
            create_time,
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,6 +202,7 @@
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
            <if test="unmatchedQuantity != null">#{unmatchedQuantity},</if>
            <if test="lowOrderCode != null">#{lowOrderCode},</if>
            #{createTime},
         </trim>
    </insert>
@@ -244,6 +248,7 @@
            <if test="opStatus != null"> op_status= #{opStatus},</if>
            <if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
            <if test="unmatchedQuantity != null"> unmatched_quantity = #{unmatchedQuantity},</if>
            <if test="lowOrderCode != null"> low_order_code = #{lowOrderCode},</if>
        </trim>
        where id = #{id}
    </update>
@@ -273,7 +278,7 @@

    <select id="selectPlatePlanByPlantMajor" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
        select  id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
        unmatched_quantity,version, production_base,plan_end_day,order_create_time
        unmatched_quantity,version, production_base,plan_end_day,order_create_time,low_order_code
        from aps_plate_plan
        <where>
            <if test="plant != null "> and plant = #{plant} </if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlatePlanTempMapper">
    
    <resultMap type="ApsPlatePlanTemp" id="ApsPlatePlanTempResult">
    <resultMap type="com.aps.core.domain.ApsPlatePlanTemp" id="ApsPlatePlanTempResult">
        <result property="id"    column="id"    />
        <result property="masterPlanner"    column="master_planner"    />
        <result property="weekDay"    column="week_day"    />
@@ -47,7 +47,7 @@
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk, batch_number from aps_plate_plan_temp
    </sql>

    <select id="selectApsPlatePlanTempList" parameterType="ApsPlatePlanTemp" resultMap="ApsPlatePlanTempResult">
    <select id="selectApsPlatePlanTempList" parameterType="com.aps.core.domain.ApsPlatePlanTemp" resultMap="ApsPlatePlanTempResult">
        <include refid="selectApsPlatePlanTempVo"/>
        <where>  
            <if test="nextProcessDeparment != null  and nextProcessDeparment != ''"> and next_process_deparment = #{nextProcessDeparment}</if>
@@ -70,7 +70,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlatePlanTemp" parameterType="ApsPlatePlanTemp">
    <insert id="insertApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlatePlanTemp">
        insert into aps_plate_plan_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">id,</if>
@@ -150,7 +150,7 @@
         </trim>
    </insert>

    <update id="updateApsPlatePlanTemp" parameterType="ApsPlatePlanTemp">
    <update id="updateApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlatePlanTemp">
        update aps_plate_plan_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="masterPlanner != null">master_planner = #{masterPlanner},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateProcessShopStatMapper">
    
    <resultMap type="ApsPlateProcessShopStat" id="ApsPlateProcessShopStatResult">
    <resultMap type="com.aps.core.domain.ApsPlateProcessShopStat" id="ApsPlateProcessShopStatResult">
        <result property="id"    column="id"    />
        <result property="docNo"    column="doc_no"    />
        <result property="shopCode"    column="shop_code"    />
@@ -27,7 +27,7 @@
        from aps_plate_process_shop_stat
    </sql>

    <select id="selectApsPlateProcessShopStatList" parameterType="ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
    <select id="selectApsPlateProcessShopStatList" parameterType="com.aps.core.domain.ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
        <include refid="selectApsPlateProcessShopStatVo"/>
        <where>  
            <if test="docNo != null  and docNo != ''"> and doc_no = #{docNo}</if>
@@ -47,7 +47,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlateProcessShopStat" parameterType="ApsPlateProcessShopStat" useGeneratedKeys="true" keyProperty="id">
    <insert id="insertApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlateProcessShopStat" useGeneratedKeys="true" keyProperty="id">
        insert into aps_plate_process_shop_stat
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="docNo != null">doc_no,</if>
@@ -79,7 +79,7 @@
         </trim>
    </insert>

    <update id="updateApsPlateProcessShopStat" parameterType="ApsPlateProcessShopStat">
    <update id="updateApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlateProcessShopStat">
        update aps_plate_process_shop_stat
        <trim prefix="SET" suffixOverrides=",">
            <if test="docNo != null">doc_no = #{docNo},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateProcessStatMapper">
    
    <resultMap type="ApsPlateProcessStat" id="ApsPlateProcessStatResult">
    <resultMap type="com.aps.core.domain.ApsPlateProcessStat" id="ApsPlateProcessStatResult">
        <result property="id"    column="id"    />
        <result property="workOrderNo"    column="work_order_no"    />
        <result property="processName"    column="process_name"    />
@@ -34,7 +34,7 @@
        from aps_plate_process_stat
    </sql>

    <select id="selectApsPlateProcessStatList" parameterType="ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
    <select id="selectApsPlateProcessStatList" parameterType="com.aps.core.domain.ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
        <include refid="selectApsPlateProcessStatVo"/>
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
@@ -58,7 +58,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlateProcessStat" parameterType="ApsPlateProcessStat">
    <insert id="insertApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
        insert into aps_plate_process_stat
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -100,7 +100,7 @@
         </trim>
    </insert>

    <update id="updateApsPlateProcessStat" parameterType="ApsPlateProcessStat">
    <update id="updateApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
        update aps_plate_process_stat
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
@@ -153,7 +153,7 @@
        delete from aps_plate_process_stat where batch_number != #{batchNumber}
    </update>

    <insert id="batchInsertPlateStat" parameterType="ApsPlateProcessStat">
    <insert id="batchInsertPlateStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
        insert into aps_plate_process_stat
        (
            id,

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBatchMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireBatchMapper">
    
    <resultMap type="ApsPlateStandardRequireBatch" id="ApsPlateStandardRequireBatchResult">
    <resultMap type="com.aps.core.domain.ApsPlateStandardRequireBatch" id="ApsPlateStandardRequireBatchResult">
        <result property="id"    column="id"    />
        <result property="batchNumber"    column="batch_number"    />
        <result property="delFlag"    column="del_flag"    />
@@ -18,7 +18,7 @@
        select id, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require_batch
    </sql>

    <select id="selectApsPlateStandardRequireBatchList" parameterType="ApsPlateStandardRequireBatch" resultMap="ApsPlateStandardRequireBatchResult">
    <select id="selectApsPlateStandardRequireBatchList" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch" resultMap="ApsPlateStandardRequireBatchResult">
        <include refid="selectApsPlateStandardRequireBatchVo"/>
        <where>  
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -30,7 +30,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlateStandardRequireBatch" parameterType="ApsPlateStandardRequireBatch">
    <insert id="insertApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch">
        insert into aps_plate_standard_require_batch
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -52,7 +52,7 @@
         </trim>
    </insert>

    <update id="updateApsPlateStandardRequireBatch" parameterType="ApsPlateStandardRequireBatch">
    <update id="updateApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch">
        update aps_plate_standard_require_batch
        <trim prefix="SET" suffixOverrides=",">
            <if test="batchNumber != null">batch_number = #{batchNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper">
    
    <resultMap type="ApsPlateStandardRequireBomStockDetail" id="ApsPlateStandardRequireBomStockDetailResult">
    <resultMap type="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail" id="ApsPlateStandardRequireBomStockDetailResult">
        <result property="id"    column="id"    />
        <result property="requireId"    column="require_id"    />
        <result property="requireTrackId"    column="require_track_id"    />
@@ -29,7 +29,7 @@
        from aps_plate_standard_require_bom_stock_detail
    </sql>

    <select id="selectApsPlateStandardRequireBomStockDetailList" parameterType="ApsPlateStandardRequireBomStockDetail" resultMap="ApsPlateStandardRequireBomStockDetailResult">
    <select id="selectApsPlateStandardRequireBomStockDetailList" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail" resultMap="ApsPlateStandardRequireBomStockDetailResult">
        <include refid="selectApsPlateStandardRequireBomStockDetailVo"/>
        <where>  
            <if test="requireId != null  and requireId != ''"> and require_id = #{requireId}</if>
@@ -49,7 +49,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlateStandardRequireBomStockDetail" parameterType="ApsPlateStandardRequireBomStockDetail">
    <insert id="insertApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
        insert into aps_plate_standard_require_bom_stock_detail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -87,7 +87,7 @@
         </trim>
    </insert>

    <update id="updateApsPlateStandardRequireBomStockDetail" parameterType="ApsPlateStandardRequireBomStockDetail">
    <update id="updateApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
        update aps_plate_standard_require_bom_stock_detail
        <trim prefix="SET" suffixOverrides=",">
            <if test="requireId != null">require_id = #{requireId},</if>
@@ -123,7 +123,7 @@
        update aps_plate_standard_require_bom_stock_detail set del_flag = '1' where batch_number = #{batchNumber}
    </update>

    <insert id="batchInsert" parameterType="ApsPlateStandardRequireBomStockDetail">
    <insert id="batchInsert" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
        insert into aps_plate_standard_require_bom_stock_detail
        (id,require_id, require_track_id, bom_line_id, bom_line_code, before_stock_amount, deduction_amount
        , after_stock_amount, org_code, batch_number, del_flag, create_time, create_by)

 aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessCapacityManagementMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessCapacityManagementMapper">
    
    <resultMap type="ApsProcessCapacityManagement" id="ApsProcessCapacityManagementResult">
    <resultMap type="com.aps.core.domain.ApsProcessCapacityManagement" id="ApsProcessCapacityManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="capacityType"    column="capacity_type"    />
@@ -25,7 +25,7 @@
        select id, item_number, capacity_type, process_number, process_name, process_route_id, work_time, effective_date, expiring_date, integration_date, create_by, create_time, update_by, update_time from aps_process_capacity_management
    </sql>

    <select id="selectApsProcessCapacityManagementList" parameterType="ApsProcessCapacityManagement" resultMap="ApsProcessCapacityManagementResult">
    <select id="selectApsProcessCapacityManagementList" parameterType="com.aps.core.domain.ApsProcessCapacityManagement" resultMap="ApsProcessCapacityManagementResult">
        <include refid="selectApsProcessCapacityManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -37,7 +37,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsProcessCapacityManagement" parameterType="ApsProcessCapacityManagement">
    <insert id="insertApsProcessCapacityManagement" parameterType="com.aps.core.domain.ApsProcessCapacityManagement">
        insert into aps_process_capacity_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -73,7 +73,7 @@
         </trim>
    </insert>

    <update id="updateApsProcessCapacityManagement" parameterType="ApsProcessCapacityManagement">
    <update id="updateApsProcessCapacityManagement" parameterType="com.aps.core.domain.ApsProcessCapacityManagement">
        update aps_process_capacity_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null and itemNumber != ''">item_number = #{itemNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteMapper">

    <resultMap type="ApsProcessRoute" id="ApsProcessRouteResult">
    <resultMap type="com.aps.core.domain.ApsProcessRoute" id="ApsProcessRouteResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
@@ -35,7 +35,7 @@
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order,work_center from aps_process_route
    </sql>

    <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
    <select id="selectApsProcessRouteList" parameterType="com.aps.core.domain.ApsProcessRoute" resultMap="ApsProcessRouteResult">
        <include refid="selectApsProcessRouteVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no like  '%' || #{itemNo} || '%' </if>
@@ -58,7 +58,7 @@
    <select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
    </select>

    <insert id="insertApsProcessRoute" parameterType="ApsProcessRoute">
    <insert id="insertApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
        insert into aps_process_route
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -106,7 +106,7 @@
        </trim>
    </insert>

    <update id="updateApsProcessRoute" parameterType="ApsProcessRoute">
    <update id="updateApsProcessRoute" parameterType="com.aps.core.domain.ApsProcessRoute">
        update aps_process_route
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProcessRouteTempMapper">

    <resultMap type="ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
    <resultMap type="com.aps.core.domain.ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
        <result property="id"    column="id"    />
        <result property="itemNo"    column="item_no"    />
        <result property="workOrderNo"    column="work_order_no"    />
@@ -31,7 +31,7 @@
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order from aps_process_route_temp
    </sql>

    <select id="selectApsProcessRouteTempList" parameterType="ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
    <select id="selectApsProcessRouteTempList" parameterType="com.aps.core.domain.ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
        <include refid="selectApsProcessRouteTempVo"/>
        <where>
            <if test="itemNo != null  and itemNo != ''"> and item_no = #{itemNo}</if>
@@ -52,7 +52,7 @@
    <select id="selectApsProcessRouteTempById" parameterType="String" resultMap="ApsProcessRouteTempResult">
    </select>

    <insert id="insertApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
    <insert id="insertApsProcessRouteTemp" parameterType="com.aps.core.domain.ApsProcessRouteTemp">
        insert into aps_process_route_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -100,7 +100,7 @@
        </trim>
    </insert>

    <update id="updateApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
    <update id="updateApsProcessRouteTemp" parameterType="com.aps.core.domain.ApsProcessRouteTemp">
        update aps_process_route_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNo != null">item_no = #{itemNo},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsProfessionalFixedCycleManagementMapper">
    
    <resultMap type="ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
    <resultMap type="com.aps.core.domain.ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="professionalDescription"    column="professional_description"    />
@@ -22,7 +22,7 @@
        select id, item_number, professional_description, professional, professional_fixed_cycle, integration_date, applicable_factories, create_by, create_time, update_by, update_time from aps_professional_fixed_cycle_management
    </sql>

    <select id="selectApsProfessionalFixedCycleManagementList" parameterType="ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
    <select id="selectApsProfessionalFixedCycleManagementList" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
        <include refid="selectApsProfessionalFixedCycleManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -34,7 +34,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
    <insert id="insertApsProfessionalFixedCycleManagement" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement">
        insert into aps_professional_fixed_cycle_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -64,7 +64,7 @@
         </trim>
    </insert>

    <update id="updateApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
    <update id="updateApsProfessionalFixedCycleManagement" parameterType="com.aps.core.domain.ApsProfessionalFixedCycleManagement">
        update aps_professional_fixed_cycle_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsResourceGroupMapper">
    
    <resultMap type="ApsResourceGroup" id="ApsResourceGroupResult">
    <resultMap type="com.aps.core.domain.ApsResourceGroup" id="ApsResourceGroupResult">
        <result property="id"    column="id"    />
        <result property="resourceGroupName"    column="resource_group_name"    />
        <result property="devicesQuantity"    column="devices_quantity"    />
@@ -24,7 +24,7 @@
        select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, plant from aps_resource_group
    </sql>

    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroup" resultMap="ApsResourceGroupResult">
    <select id="selectApsResourceGroupList" parameterType="com.aps.core.domain.ApsResourceGroup" resultMap="ApsResourceGroupResult">
        <include refid="selectApsResourceGroupVo"/>
        <where>  
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName}|| '%'</if>
@@ -44,7 +44,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsResourceGroup" parameterType="ApsResourceGroup">
    <insert id="insertApsResourceGroup" parameterType="com.aps.core.domain.ApsResourceGroup">
        insert into aps_resource_group
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -78,7 +78,7 @@
         </trim>
    </insert>

    <update id="updateApsResourceGroup" parameterType="ApsResourceGroup">
    <update id="updateApsResourceGroup" parameterType="com.aps.core.domain.ApsResourceGroup">
        update aps_resource_group
        <trim prefix="SET" suffixOverrides=",">
            <if test="resourceGroupName != null">resource_group_name = #{resourceGroupName},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsResourceGroupTempMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsResourceGroupTempMapper">
    
    <resultMap type="ApsResourceGroupTemp" id="ApsResourceGroupTempResult">
    <resultMap type="com.aps.core.domain.ApsResourceGroupTemp" id="ApsResourceGroupTempResult">
        <result property="id"    column="id"    />
        <result property="resourceGroupName"    column="resource_group_name"    />
        <result property="devicesQuantity"    column="devices_quantity"    />
@@ -25,7 +25,7 @@
        select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, batch_number, plant from aps_resource_group_temp
    </sql>

    <select id="selectApsResourceGroupTempList" parameterType="ApsResourceGroupTemp" resultMap="ApsResourceGroupTempResult">
    <select id="selectApsResourceGroupTempList" parameterType="com.aps.core.domain.ApsResourceGroupTemp" resultMap="ApsResourceGroupTempResult">
        <include refid="selectApsResourceGroupTempVo"/>
        <where>  
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like concat('%', #{resourceGroupName}, '%')</if>
@@ -45,7 +45,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsResourceGroupTemp" parameterType="ApsResourceGroupTemp">
    <insert id="insertApsResourceGroupTemp" parameterType="com.aps.core.domain.ApsResourceGroupTemp">
        insert into aps_resource_group_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -81,7 +81,7 @@
         </trim>
    </insert>

    <update id="updateApsResourceGroupTemp" parameterType="ApsResourceGroupTemp">
    <update id="updateApsResourceGroupTemp" parameterType="com.aps.core.domain.ApsResourceGroupTemp">
        update aps_resource_group_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="resourceGroupName != null">resource_group_name = #{resourceGroupName},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsShopMapper">
    
    <resultMap type="ApsShop" id="ApsShopResult">
    <resultMap type="com.aps.core.domain.ApsShop" id="ApsShopResult">
        <result property="id"    column="id"    />
        <result property="shopName"    column="shop_name"    />
        <result property="shopCode"    column="shop_code"    />
@@ -20,7 +20,7 @@
        select id, shop_name, shop_code, plant_code, status, create_by, create_time, update_by, update_time from aps_shop
    </sql>

    <select id="selectApsShopList" parameterType="ApsShop" resultMap="ApsShopResult">
    <select id="selectApsShopList" parameterType="com.aps.core.domain.ApsShop" resultMap="ApsShopResult">
        <include refid="selectApsShopVo"/>
        <where>  
            <if test="shopName != null  and shopName != ''"> and shop_name = #{shopName}</if>
@@ -37,7 +37,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsShop" parameterType="ApsShop">
    <insert id="insertApsShop" parameterType="com.aps.core.domain.ApsShop">
        insert into aps_shop
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -63,7 +63,7 @@
         </trim>
    </insert>

    <update id="updateApsShop" parameterType="ApsShop">
    <update id="updateApsShop" parameterType="com.aps.core.domain.ApsShop">
        update aps_shop
        <trim prefix="SET" suffixOverrides=",">
            <if test="shopName != null">shop_name = #{shopName},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessMapper">
    
    <resultMap type="ApsStandardProcess" id="ApsStandardProcessResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcess" id="ApsStandardProcessResult">
        <result property="id"    column="id"    />
        <result property="processNumber"    column="process_number"    />
        <result property="processName"    column="process_name"    />
@@ -30,7 +30,7 @@
        select id, process_number, process_name, resource_group_name, model, design_capacity, plant_id, plant, work_shop_id, work_shop, work_calender_id, del_flag, create_by, create_time, update_by, update_time, model_id, work_calender,major from aps_standard_process
    </sql>

    <select id="selectApsStandardProcessList" parameterType="ApsStandardProcess" resultMap="ApsStandardProcessResult">
    <select id="selectApsStandardProcessList" parameterType="com.aps.core.domain.ApsStandardProcess" resultMap="ApsStandardProcessResult">
        <include refid="selectApsStandardProcessVo"/>
        <where>  
            <if test="processNumber != null  and processNumber != ''"> and process_number = #{processNumber}</if>
@@ -54,7 +54,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsStandardProcess" parameterType="ApsStandardProcess">
    <insert id="insertApsStandardProcess" parameterType="com.aps.core.domain.ApsStandardProcess">
        insert into aps_standard_process
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="processNumber != null">process_number,</if>
@@ -98,7 +98,7 @@
         </trim>
    </insert>

    <update id="updateApsStandardProcess" parameterType="ApsStandardProcess">
    <update id="updateApsStandardProcess" parameterType="com.aps.core.domain.ApsStandardProcess">
        update aps_standard_process
        <trim prefix="SET" suffixOverrides=",">
            <if test="processNumber != null">process_number = #{processNumber},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper">
    
    <resultMap type="ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcessRouteHeader" id="ApsStandardProcessRouteHeaderResult">
        <result property="id"    column="id"    />
        <result property="itemCode"    column="item_code"    />
        <result property="drawingNumber"    column="drawing_number"    />
@@ -27,7 +27,7 @@
        from aps_standard_process_route_header
    </sql>

    <select id="selectApsStandardProcessRouteHeaderList" parameterType="ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
    <select id="selectApsStandardProcessRouteHeaderList" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
        <include refid="selectApsStandardProcessRouteHeaderVo"/>
        <where>  
            <if test="routeId != null  and routeId != ''"> and route_id = #{routeId}</if>
@@ -47,7 +47,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
    <insert id="insertApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
        insert into aps_standard_process_route_header
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -77,7 +77,7 @@
         </trim>
    </insert>

    <update id="updateApsStandardProcessRouteHeader" parameterType="ApsStandardProcessRouteHeader">
    <update id="updateApsStandardProcessRouteHeader" parameterType="com.aps.core.domain.ApsStandardProcessRouteHeader">
        update aps_standard_process_route_header
        <trim prefix="SET" suffixOverrides=",">
            <if test="routeId != null">route_id = #{routeId},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessRouteLineMapper">
    
    <resultMap type="ApsStandardProcessRouteLine" id="ApsStandardProcessRouteLineResult">
    <resultMap type="com.aps.core.domain.ApsStandardProcessRouteLine" id="ApsStandardProcessRouteLineResult">
        <result property="id"    column="id"    />
        <result property="routeId"    column="route_id"    />
        <result property="routeNum"    column="route_num"    />
@@ -31,7 +31,7 @@
        from aps_standard_process_route_line
    </sql>

    <select id="selectApsStandardProcessRouteLineList" parameterType="ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
    <select id="selectApsStandardProcessRouteLineList" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine" resultMap="ApsStandardProcessRouteLineResult">
        <include refid="selectApsStandardProcessRouteLineVo"/>
        <where>
            <if test="routeId != null  and routeId != ''"> and route_id = #{routeId}</if>
@@ -53,7 +53,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsStandardProcessRouteLine" parameterType="ApsStandardProcessRouteLine">
    <insert id="insertApsStandardProcessRouteLine" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine">
        insert into aps_standard_process_route_line
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -91,7 +91,7 @@
         </trim>
    </insert>

    <update id="updateApsStandardProcessRouteLine" parameterType="ApsStandardProcessRouteLine">
    <update id="updateApsStandardProcessRouteLine" parameterType="com.aps.core.domain.ApsStandardProcessRouteLine">
        update aps_standard_process_route_line
        <trim prefix="SET" suffixOverrides=",">
            <if test="routeId != null">route_id = #{routeId},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamMapper">
    
    <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeam" id="ApsWeldSeamResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
@@ -32,7 +32,7 @@
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
    </sql>

    <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
    <select id="selectApsWeldSeamList" parameterType="com.aps.core.domain.ApsWeldSeam" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -66,7 +66,7 @@
        <include refid="selectApsWeldSeamVo"/>
        where work_order_no = #{workOrderNo}
    </select>
    <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
    <insert id="insertApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
        insert into aps_weld_seam
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -116,7 +116,7 @@
         </trim>
    </insert>

    <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
    <update id="updateApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
        update aps_weld_seam
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamStatisticsMapper">
    
    <resultMap type="ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
        <result property="id"    column="id"    />
        <result property="year"    column="year"    />
        <result property="month"    column="month"    />
@@ -30,7 +30,7 @@
        select id, year, month, production_base, piping_order_requirement, gas_order_requirement, piping_prediction_requirement, gas_prediction_requirement, reserve_emergency_order_output, total, days, requirement_day_weld_seam, production_day_weld_seam, is_satisfy, del_flag, create_by, create_time, update_by, update_time from aps_weld_seam_statistics
    </sql>

    <select id="selectApsWeldSeamStatisticsList" parameterType="ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
    <select id="selectApsWeldSeamStatisticsList" parameterType="com.aps.core.domain.ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
        <include refid="selectApsWeldSeamStatisticsVo"/>
        <where>  
            <if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
@@ -46,7 +46,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
    <insert id="insertApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
        insert into aps_weld_seam_statistics
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -92,7 +92,7 @@
         </trim>
    </insert>

    <update id="updateApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
    <update id="updateApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
        update aps_weld_seam_statistics
        <trim prefix="SET" suffixOverrides=",">
            <if test="year != null">year = #{year},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamTempMapper">
    
    <resultMap type="ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
    <resultMap type="com.aps.core.domain.ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
        <result property="id"    column="id"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="materialCode"    column="material_code"    />
@@ -33,7 +33,7 @@
        select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant, batch_number from aps_weld_seam_temp
    </sql>

    <select id="selectApsWeldSeamTempList" parameterType="ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
    <select id="selectApsWeldSeamTempList" parameterType="com.aps.core.domain.ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
        <include refid="selectApsWeldSeamTempVo"/>
        <where>  
            <if test="workOrderType != null  and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -65,7 +65,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
    <insert id="insertApsWeldSeamTemp" parameterType="com.aps.core.domain.ApsWeldSeamTemp">
        insert into aps_weld_seam_temp
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -117,7 +117,7 @@
         </trim>
    </insert>

    <update id="updateApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
    <update id="updateApsWeldSeamTemp" parameterType="com.aps.core.domain.ApsWeldSeamTemp">
        update aps_weld_seam_temp
        <trim prefix="SET" suffixOverrides=",">
            <if test="workOrderType != null">work_order_type = #{workOrderType},</if>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkCalendarMapper">

    <resultMap type="ApsWorkCalendar" id="ApsWorkCalendarResult">
    <resultMap type="com.aps.core.domain.ApsWorkCalendar" id="ApsWorkCalendarResult">
        <result property="id"    column="id"    />
        <result property="description"    column="description"    />
        <result property="type"    column="type"    />
@@ -27,7 +27,7 @@
        select id, description, type, effective_date, expiring_date, content, applicable_factory, applicable_workshop, applicable_process, create_by, create_time, update_by, update_time, holidays, applicable, applicable_translate from aps_work_calendar
    </sql>

    <select id="selectApsWorkCalendarList" parameterType="ApsWorkCalendar" resultMap="ApsWorkCalendarResult">
    <select id="selectApsWorkCalendarList" parameterType="com.aps.core.domain.ApsWorkCalendar" resultMap="ApsWorkCalendarResult">
        <include refid="selectApsWorkCalendarVo"/>
        <where>  
            <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
@@ -51,7 +51,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsWorkCalendar" parameterType="ApsWorkCalendar">
    <insert id="insertApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        insert into aps_work_calendar
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -91,7 +91,7 @@
         </trim>
    </insert>

    <update id="updateApsWorkCalendar" parameterType="ApsWorkCalendar">
    <update id="updateApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        update aps_work_calendar
        <trim prefix="SET" suffixOverrides=",">
            <if test="description != null">description = #{description},</if>
@@ -117,14 +117,14 @@
        delete from aps_work_calendar where id = #{id}
    </delete>

    <delete id="deleteApsWorkCalendarByIds" parameterType="ApsWorkCalendar">
    <delete id="deleteApsWorkCalendarByIds" parameterType="com.aps.core.domain.ApsWorkCalendar">
        delete from aps_work_calendar where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

    <delete id="deleteApsWorkCalendar" parameterType="ApsWorkCalendar">
    <delete id="deleteApsWorkCalendar" parameterType="com.aps.core.domain.ApsWorkCalendar">
        delete from aps_work_calendar where effective_date=#{effectiveDate} and expiring_date=#{expiringDate} and applicable_factory=#{applicableFactory} and applicable_workshop=#{applicableWorkshop} and applicable_process=#{applicableProcess}
    </delete>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkEventMapper">
    
    <resultMap type="ApsWorkEvent" id="ApsWorkEventResult">
    <resultMap type="com.aps.core.domain.ApsWorkEvent" id="ApsWorkEventResult">
        <result property="id"    column="id"    />
        <result property="description"    column="description"    />
        <result property="duration"    column="duration"    />
@@ -26,7 +26,7 @@
        select id, description, duration, start_date, end_date, start_time, end_time, applicable_factory, applicable_workshop, applicable_process, applicable_calendar, create_by, create_time, update_by, update_time from aps_work_event
    </sql>

    <select id="selectApsWorkEventList" parameterType="ApsWorkEvent" resultMap="ApsWorkEventResult">
    <select id="selectApsWorkEventList" parameterType="com.aps.core.domain.ApsWorkEvent" resultMap="ApsWorkEventResult">
        <include refid="selectApsWorkEventVo"/>
        <where>  
            <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
@@ -47,7 +47,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsWorkEvent" parameterType="ApsWorkEvent">
    <insert id="insertApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
        insert into aps_work_event
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -85,7 +85,7 @@
         </trim>
    </insert>

    <update id="updateApsWorkEvent" parameterType="ApsWorkEvent">
    <update id="updateApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
        update aps_work_event
        <trim prefix="SET" suffixOverrides=",">
            <if test="description != null and description != ''">description = #{description},</if>

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml

@@ -407,7 +407,7 @@
            plan_start_day,plan_end_day,next_process_deparment,
            is_suspended,is_outsourcing,account,
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
            professional_affiliation,order_create_time,approve_on,start_work_date
            professional_affiliation,order_create_time,approve_on,start_work_date,low_order_code
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -421,7 +421,8 @@
            (case when low_order_code='0' then 'main' else 'sub' end ) as professional_affiliation,
            order_create_time,
            approve_on,
            start_work_date
            start_work_date,
            low_order_code
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
                and (item_code like 'M03%' or item_code like 'M04%'or item_code like 'A75%')