From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
index b0ce510..73eb044 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
@@ -16,10 +16,59 @@
t.approval_opinion approvalOpinion,
t.subject_matter subjectMatter,
t.outbound_time outboundTime,
+ t.part_drawing_no partDrawingNo,
+ t.part_name partName,
+ t.part_material partMaterial,
+ t.production_processes_no productionProcessesNo,
+ t.batch_code batchCode,
+ t.machining_count machiningCount,
+ t.equipment_code equipmentCode,
+ t.nc_name ncName,
t.remark,
t.create_by createBy,
t.create_time createTime
FROM tms_outbound_order t
${ew.customSqlSegment}
</select>
+ <select id="querySharpenOutboundToolPageList"
+ resultType="org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo">
+ SELECT
+ t1.id,
+ t2.id toolLedgerDetailId,
+ t1.tool_code toolCode,
+ t3.tool_code toolNum,
+ t3.accuracy_class accuracyClass,
+ t1.tool_id toolId,
+ t3.chinese_name toolName,
+ t3.tool_model toolModel,
+ t2.quantity,
+ t2.warehouse_id warehouseId,
+ ISNULL(t4.warehouse_id, '') + '/' + ISNULL(t4.warehouse_name, '') warehouseName,
+ t2.position_code positionCode
+ FROM tms_tool_sharpening t1
+ INNER JOIN tms_tool_ledger_detail t2 on t1.tool_id = t2.tool_id
+ LEFT JOIN tms_base_tools t3 on t1.tool_code = t3.id
+ LEFT JOIN tms_warehouse t4 on t2.warehouse_id = t4.id
+ ${ew.customSqlSegment}
+ </select>
+ <select id="queryBorrowOutboundToolPageList"
+ resultType="org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo">
+ SELECT
+ t.id,
+ t.id toolLedgerDetailId,
+ t.tool_code toolCode,
+ p.tool_code toolNum,
+ p.accuracy_class accuracyClass,
+ t.tool_id toolId,
+ p.chinese_name toolName,
+ p.tool_model toolModel,
+ t.quantity,
+ t.warehouse_id warehouseId,
+ ISNULL(q.warehouse_id, '') + '/' + ISNULL(q.warehouse_name, '') warehouseName,
+ t.position_code positionCode
+ FROM tms_tool_ledger_detail t
+ LEFT JOIN tms_base_tools p on t.tool_code = p.id
+ LEFT JOIN tms_warehouse q on t.warehouse_id = q.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3