From e0529614c187a5457ca3f587a16edeec51d69d15 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期一, 16 六月 2025 10:41:16 +0800 Subject: [PATCH] 刀具寿命 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml index 59e9ae8..834d642 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml @@ -5,18 +5,30 @@ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutStoreDetailVo"> SELECT t1.id, - t1.tool_code toolCode, + t2.tool_code toolCode, t1.tool_id toolId, t1.out_storehouse_type outStorehouseType, t1.goods_shelves_code goodsShelvesCode, t1.out_number outNumber, t1.out_storehouse_id outStorehouseId, - t1.operate_type operateType, + case t1.operate_type + when '1' then '鐢宠鍗�' + when '2' then '鎵嬪伐鎿嶄綔' + else '' + end operateType, t1.create_by createBy, t1.create_time createTime, + t1.rated_life ratedLife, + t1.use_life useLife, + t1.remaining_percentage remainingPercentage, t2.chinese_name chineseName, t2.tool_model toolModel, t2.parama_table_name paramaTableName, + case t3.application_type + when '1' then '閫氱敤宸ュ叿' + when '2' then '涓撶敤宸ュ叿' + else '' + end applicationType, <choose> <when test="ew.paramNameValuePairs.paramaTableName == '1'"> t4.tool_material toolMaterial, @@ -75,4 +87,42 @@ </choose> ${ew.customSqlSegment} </select> + + <select id="outStoreDetailList" resultType="map" parameterType="String"> + SELECT + t1.id, + t1.tool_id onlyCode, + t1.out_storehouse_type outStorehouseType, + t1.out_number outNumber, + t1.out_storehouse_id outStorehouseId, + t4.outbound_time outboundTime, + t1.create_by createBy, + t1.create_time createTime, + t1.update_by updateBy, + t1.update_time updateTime, + t2.tool_code toolCode, + t2.chinese_name chineseName, + t2.tool_model toolModel, + t3.classify_id classifyNum, + t4.out_num outNum, + t4.subject_matter subjectMatter, + t5.realname handler, + t6.realname reviewer, + t7.item_text inStatus, + t8.item_text orderStatus, + t9.item_text outStorehouseTypeName, + t10.item_text operateType + FROM + tms_out_store_detail t1 + LEFT JOIN tms_base_tools t2 ON t2.id = t1.tool_code + LEFT JOIN tms_tools_classify t3 ON t3.id = t2.classify_id + LEFT JOIN tms_outbound_order t4 ON t4.id = t1.out_storehouse_id + LEFT JOIN sys_user t5 ON t5.username = t4.handler + LEFT JOIN sys_user t6 ON t6.username = t4.reviewer + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_status' ) t7 ON t7.item_value = t4.out_status + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_bill_status' ) t8 ON t8.item_value = t4.order_status + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'out_storehouse_type' ) t9 ON t9.item_value = t1.out_storehouse_type + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'inbound_operate_type' ) t10 ON t10.item_value = t1.operate_type + ${ew.customSqlSegment} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3