From d01fa9d49a8c8a723493aecb681d4e1f3e25fce5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 14:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml
new file mode 100644
index 0000000..f51db16
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml
@@ -0,0 +1,42 @@
+<?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="com.example.erp.mapper.mm.FinishedOperateLogMapper">
+    <resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedOperateLog" >
+        <id column="id" property="id"/>
+        <result column="operation_order_number" property="operationOrderNumber"/>
+        <result column="product_number" property="productNumber"/>
+        <result column="operation_number" property="operationNumber"/>
+        <result column="operate_type" property="operateType"/>
+        <result column="operator" property="operator"/>
+        <result column="operate_time" property="operateTime"/>
+
+        <!--<result column="g_typeId" property="glassTypes.typeId"/>
+        <result column="g_type" property="glassTypes.type"/>-->
+
+    </resultMap>
+    <select id="defaultFinishedGoodsInventory" resultMap="selectFinishedGoodsInventory">
+        select
+            a.id,
+            prodID,
+            product,
+            glassType,
+            typeName,
+            totalThickness,
+            thickness,
+            Query,
+            remarks,
+            state,
+            creator,
+            date(a.createTime) as 'createTime',
+            updateTime
+        from
+            product as a
+                left join basic_glass_type bgt on bgt.typeID = a.glassType
+
+        order by id desc
+        limit #{offset},#{pageSize}
+        ;
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.8.0