From b3e67abc5f7bccfc60f5ea63e81f62c3475ff8b8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 一月 2024 11:50:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 1778fba..f51db16 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -2,8 +2,21 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
- <select id="defaultProduct">
+<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,
@@ -20,7 +33,7 @@
updateTime
from
product as a
- left join basic_glass_type bgt on bgt.typeID = a.glassType
+ left join basic_glass_type bgt on bgt.typeID = a.glassType
order by id desc
limit #{offset},#{pageSize}
--
Gitblit v1.8.0