From decd9f8bf3e6119efce34e6bbc0c320a2a2446c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:41:50 +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 | 306 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 282 insertions(+), 24 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 f51db16..b692efc 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -6,37 +6,295 @@
<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="order_id" property="orderId"/>
<result column="operation_number" property="operationNumber"/>
+ <result column="quantity" property="quantity"/>
<result column="operate_type" property="operateType"/>
<result column="operator" property="operator"/>
<result column="operate_time" property="operateTime"/>
+ <result column="stater_operation_order_number" property="staterOperationOrderNumber"/>
+ <result column="end_operation_order_number" property="endOperationOrderNumber"/>
+ <result column="status" property="status"/>
+ <result column="type" property="type"/>
+ <result column="reviewed" property="reviewed"/>
+ <result column="reviewed_time" property="reviewedTime"/>
+ <result column="remarks" property="remarks"/>
+ <result column="is_state" property="isState"/>
- <!--<result column="g_typeId" property="glassTypes.typeId"/>
- <result column="g_type" property="glassTypes.type"/>-->
+ <result column="width" property="orderDetail.width"/>
+ <result column="height" property="orderDetail.height"/>
+ <result column="product_id" property="orderDetail.productId"/>
+ <result column="product_name" property="orderDetail.productName"/>
</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 id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
+ select fol.operation_order_number,
+ fol.order_id,
+ fol.operation_number,
+ fol.quantity,
+ fol.operator,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ fol.operate_time,
+ fol.`status`,
+ fol.is_state,
+ fol.reviewed,
+ fol.reviewed_time,
+ fol.type,
+ fol.remarks
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+ <where>
+ <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
+ and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
+ </if>
+ <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
+ and fol.order_id regexp #{finishedOperateLog.orderId}
+ </if>
+ <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
+ and fol.operation_number regexp #{finishedOperateLog.operationNumber}
+ </if>
+ <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
+ and fol.quantity regexp #{finishedOperateLog.quantity}
+ </if>
+ <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
+ and fol.operator regexp #{finishedOperateLog.operator}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
+ and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
+ and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
+ </if>
+ <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
+ and od.width regexp #{finishedOperateLog.orderDetail.width}
+ </if>
+ <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
+ and od.height regexp #{finishedOperateLog.orderDetail.height}
+ </if>
+ <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
+ and fol.operate_time regexp #{finishedOperateLog.operateTime}
+ </if>
+ <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
+ and fol.`status` regexp #{finishedOperateLog.status}
+ </if>
+ <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
+ and fol.reviewed regexp #{finishedOperateLog.reviewed}
+ </if>
+ <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
+ and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
+ </if>
+ <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
+ and fol.type regexp #{finishedOperateLog.type}
+ </if>
+ <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
+ and fol.remarks regexp #{finishedOperateLog.remarksr}
+ </if>
+ </where>
+
+ limit #{offset},#{pageSize};
</select>
+
+ <select id="getSelectOperateRecordLogPageTotal" >
+ select CEILING(count(fol.id)/#{pageSize})
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+ <where>
+ <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
+ and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
+ </if>
+ <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
+ and fol.order_id regexp #{finishedOperateLog.orderId}
+ </if>
+ <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
+ and fol.operation_number regexp #{finishedOperateLog.operationNumber}
+ </if>
+ <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
+ and fol.quantity regexp #{finishedOperateLog.quantity}
+ </if>
+ <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
+ and fol.operator regexp #{finishedOperateLog.operator}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
+ and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
+ and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
+ </if>
+ <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
+ and od.width regexp #{finishedOperateLog.orderDetail.width}
+ </if>
+ <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
+ and od.height regexp #{finishedOperateLog.orderDetail.height}
+ </if>
+ <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
+ and fol.operate_time regexp #{finishedOperateLog.operateTime}
+ </if>
+ <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
+ and fol.`status` regexp #{finishedOperateLog.status}
+ </if>
+ <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
+ and fol.reviewed regexp #{finishedOperateLog.reviewed}
+ </if>
+ <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
+ and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
+ </if>
+ <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
+ and fol.type regexp #{finishedOperateLog.type}
+ </if>
+ <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
+ and fol.remarks regexp #{finishedOperateLog.remarksr}
+ </if>
+ </where>
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
+ select fol.operation_order_number,
+ fol.order_id,
+ fol.operation_number,
+ fol.stater_operation_order_number,
+ fol.end_operation_order_number,
+ fol.quantity,
+ fol.operator,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ fol.operate_time
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = '璋冩嫧') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+ <where>
+ <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
+ and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
+ </if>
+ <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
+ and fol.order_id regexp #{finishedOperateLog.orderId}
+ </if>
+ <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
+ and fol.operation_number regexp #{finishedOperateLog.operationNumber}
+ </if>
+ <if test="finishedOperateLog.staterOperationOrderNumber != null and finishedOperateLog.staterOperationOrderNumber != ''">
+ and fol.stater_operation_order_number regexp #{finishedOperateLog.staterOperationOrderNumber}
+ </if>
+ <if test="finishedOperateLog.endOperationOrderNumber != null and finishedOperateLog.endOperationOrderNumber != ''">
+ and fol.end_operation_order_number regexp #{finishedOperateLog.endOperationOrderNumber}
+ </if>
+ <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
+ and fol.quantity regexp #{finishedOperateLog.quantity}
+ </if>
+ <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
+ and fol.operator regexp #{finishedOperateLog.operator}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
+ and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
+ </if>
+ <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
+ and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
+ </if>
+ <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
+ and od.width regexp #{finishedOperateLog.orderDetail.width}
+ </if>
+ <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
+ and od.height regexp #{finishedOperateLog.orderDetail.height}
+ </if>
+ <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
+ and fol.operate_time regexp #{finishedOperateLog.operateTime}
+ </if>
+ </where>
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getselectAllocateFinishedOperateLogPageTotal" >
+ select CEILING(count(fol.id)/#{pageSize})
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = '璋冩嫧') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.end_operation_order_number = od.order_number
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getselectFinishedOperateLog" >
+ select
+ *
+ from
+ mm.finished_operate_log limit 0,1;
+ </select>
+
+
+
+ <select id="getmaximum" >
+ select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
+ </select>
+
+ <insert id="insertIntFinishedOperateLog" useGeneratedKeys="true" >
+ insert into mm.finished_operate_log(operation_order_number,
+ order_id,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time
+ )
+ values (
+ #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},#{flowCard.inventoryQuantity},now()
+ )
+ </insert>
+
+ <insert id="insertOutFinishedOperateLog" useGeneratedKeys="true" >
+ insert into mm.finished_operate_log(operation_order_number,
+ order_id,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time
+ )
+ values (
+ #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.order_id},#{orderDetail.deliveryDetail.orderNumber}
+ ,"鍑哄簱",#{userName},#{orderDetail.warehouseNum},now()
+ )
+ </insert>
+
+ <insert id="insertFinishedOperateLogTakeOut" useGeneratedKeys="true" >
+ insert into mm.finished_operate_log(operation_order_number,
+ order_id,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time,
+ status,
+ type,
+ remarks
+ )
+ values (
+ #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
+ ,"棰嗗嚭",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",#{operateType},#{remarks}
+ )
+ </insert>
+
+ <insert id="insertFinishedOperateLogAllocate" useGeneratedKeys="true" >
+ insert into mm.finished_operate_log(operation_order_number,
+ order_id,
+ operation_number,
+ operate_type,
+ operator,
+ quantity,
+ operate_time,
+ stater_operation_order_number,
+ end_operation_order_number
+ )
+ values (
+ #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
+ ,"璋冩嫧",#{userName},#{orderDetail.quantity},now(),#{orderDetail.orderId},#{orderDetail.orderNumber}
+ )
+ </insert>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0