From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 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
new file mode 100644
index 0000000..73eb044
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.tms.mapper.OutboundOrderMapper">
+
+ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.OutboundOrder">
+ SELECT
+ t.id,
+ t.out_num outNum,
+ t.out_storehouse_type outStorehouseType,
+ t.is_return isReturn,
+ t.handler,
+ t.reviewer,
+ t.order_status orderStatus,
+ t.out_status outStatus,
+ t.audit_date auditDate,
+ 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