From 26a103aa2ed0453d3a0314015c6c9e3c81ff4131 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期三, 14 五月 2025 17:38:03 +0800 Subject: [PATCH] 优化mabatis xml --- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml | 10 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml | 12 ++-- aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 10 +- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 2 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 10 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml | 6 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml | 8 +- aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml | 12 ++-- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 20 ++++++ 16 files changed, 83 insertions(+), 63 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java index 50a10ef..624d390 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java +++ b/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 = "鍑嗗宸ユ椂") diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java index 341d233..0796a29 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java +++ b/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; diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml index fe78db3..aaa2a8e 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml index a25b782..2cac72f 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml +++ b/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" /> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml index 277d982..10ae43f 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml index 45731fd..329ee58 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml index 2dfe64a..6d57b8e 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml +++ b/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 diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml index a25f221..dc0c9d7 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanTempMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml index 55a6efc..250e09d 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml index 6a5ebe5..7482975 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml index fe547a9..e16c809 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml +++ b/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} diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml index 77781d3..2aef848 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml +++ b/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" /> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml index bfb3a43..8d34ca9 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlantMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml index ea3ecbe..1a7b8de 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml index f78c192..8951097 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml +++ b/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> diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml index cb97682..97d1d08 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml +++ b/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, -- Gitblit v1.9.3