From deb789b123fc47b37859da8a6dd16910cf7c96cb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 16:00:15 +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 | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 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..d69dd89 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -2,28 +2,38 @@
<!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">
- 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
+<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"/>
- order by id desc
- limit #{offset},#{pageSize}
- ;
+ <!--<result column="g_typeId" property="glassTypes.typeId"/>
+ <result column="g_type" property="glassTypes.type"/>-->
+
+ </resultMap>
+ <select id="getselectFinishedOperateLog" >
+ select
+ *
+ from
+ mm.finished_operate_log limit 0,1;
</select>
+
+ <insert id="insertFinishedOperateLog" useGeneratedKeys="true" keyProperty="id" >
+ insert into mm.finished_operate_log(operation_order_number,
+ product_number,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time
+ )
+ values (
+ #{processId} ,#{orderDetail.productId},#{orderNumber},"鍏ュ簱","鐜嬩簲",#{inventoryQuantity},now()
+ )
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0