From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/resources/mapper/ViewWorkInMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index e63997b..6b3d6d5 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -108,6 +108,13 @@
 	<include refid="viewWorkInConditionSql"></include>
 </select>
 
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkInERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+	select top 100 * from asr_wrkin_view
+	where 1=1
+	Order by io_time desc
+</select>
+
 <!-- 鍑哄簱缁熻 -->
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
 <select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
@@ -145,4 +152,11 @@
 	Order by a.io_time desc
 </select>
 
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+	select top 100 * from asr_wrkout_view
+	where 1=1
+	Order by io_time desc
+</select>
+
 </mapper>

--
Gitblit v1.9.1