From cf6bff3922bbd0624b98834f6ea85c8e619e564f Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期二, 16 一月 2024 12:45:46 +0800 Subject: [PATCH] 修改数据采集 --- guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml index 494c5a3..f9a7765 100644 --- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml +++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml @@ -8,7 +8,7 @@ <result column="work_order_no" property="workOrderNo" /> <result column="production_line" property="productionLine" /> <result column="location_code" property="locationCode" /> - <result column="state" property="state" /> + <result column="status" property="status" /> <result column="spare_field_1" property="spareField1" /> <result column="spare_field_2" property="spareField2" /> <result column="material_code" property="materialCode" /> @@ -20,12 +20,17 @@ <result column="update_time" property="updateTime" /> <result column="loading_code" property="loadingCode" /> + <result column="quantity" property="quantity" /> + <result column="unit" property="unit" /> + <result column="batch" property="batch" /> + <result column="residue_quantity" property="residueQuantity" /> + </resultMap> <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> <sql id="Base_Column_List"> - loading_code AS "loadingCode", bar_code AS "barCode", material_code AS "materialCode", id AS "id", work_order_no AS "workOrderNo", production_line AS "productionLine", location_code AS "locationCode", state AS "state", spare_field_1 AS "spareField1", spare_field_2 AS "spareField2", create_user AS "createUser", update_user AS "updateUser", create_time AS "createTime", update_time AS "updateTime" + residue_quantity AS "residueQuantity", quantity AS "quantity", unit AS "unit", batch AS "batch", loading_code AS "loadingCode", bar_code AS "barCode", material_code AS "materialCode", id AS "id", work_order_no AS "workOrderNo", production_line AS "productionLine", location_code AS "locationCode", status AS "status", spare_field_1 AS "spareField1", spare_field_2 AS "spareField2", create_user AS "createUser", update_user AS "updateUser", create_time AS "createTime", update_time AS "updateTime" </sql> @@ -33,6 +38,12 @@ select <include refid="Base_Column_List"/> from om_production_order_batch_info where 1 = 1 + <if test="paramCondition.workOrderNo != null and paramCondition.workOrderNo != ''"> + and work_order_no like CONCAT('%',#{paramCondition.workOrderNo},'%') + </if> + <if test="paramCondition.locationCode != null and paramCondition.locationCode != ''"> + and location_code like CONCAT('%',#{paramCondition.locationCode},'%') + </if> </select> <select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam"> @@ -57,7 +68,12 @@ <if test="paramCondition.loadingCode != null and paramCondition.loadingCode != ''"> and loading_code like CONCAT('%',#{paramCondition.loadingCode},'%') </if> - + <if test="paramCondition.status != null and paramCondition.status != ''"> + and status like CONCAT('%',#{paramCondition.status},'%') + </if> + <if test="paramCondition.batch != null and paramCondition.batch != ''"> + and batch like CONCAT('%',#{paramCondition.batch},'%') + </if> </select> <select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam"> -- Gitblit v1.9.3