From 939ccc9c254870ed15cdd485b9d303bbb00a23f2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 14:16:27 +0800
Subject: [PATCH] 注释加上上海玻璃公司ip
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index fa3794b..7f89607 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -93,13 +93,14 @@
<result column="create_time" property="deliveryDetail.createTime"/>
<result column="dd_quantity" property="deliveryDetail.quantity"/>
<result column="box_no" property="deliveryDetail.boxNo"/>
+ <result column="area" property="deliveryDetail.area"/>
<result column="project" property="order.project"/>
<result column="creator" property="delivery.creator"/>
<result column="customer_name" property="delivery.customerName"/>
<result column="d_quantity" property="delivery.quantity"/>
- <result column="area" property="delivery.area"/>
+
</resultMap>
@@ -150,8 +151,11 @@
set quantity_available=quantity_available+#{quantity},
update_time=now(),area=actual_signal_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
- <if test="boxNo != null and boxNo != ''">
+ <if test="boxNo != null ">
and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
</if>
</update>
@@ -160,8 +164,11 @@
set quantity_available=quantity_available-#{quantity},
update_time=now(),area=actual_signal_area*quantity_available
where order_id=#{orderId} and order_number=#{orderNumber}
- <if test="boxNo != null and boxNo != ''">
+ <if test="boxNo != null ">
and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
</if>
</update>
@@ -169,18 +176,23 @@
update mm.finished_goods_inventory
set inventory=inventory+#{quantity}
where order_number=#{orderNumber} and order_id=#{orderId}
- <if test="remarks != null and remarks != ''">
+ <if test="remarks != null ">
and trim(box_no) = trim(#{remarks})
</if>
-
+ <if test="remarks == null ">
+ and box_no is null
+ </if>
</update>
<update id="updateInventoryInventoryOut">
update mm.finished_goods_inventory
set inventory=inventory-#{quantity}
where order_number=#{orderNumber} and order_id=#{orderId}
- <if test="boxNo != null and boxNo != ''">
+ <if test="boxNo != null ">
and trim(box_no) = trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
</if>
</update>
@@ -307,8 +319,11 @@
update sd.delivery_detail
set delivery_detail_state=#{state}
where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
- <if test="remarks != null and remarks != ''">
+ <if test="remarks != null ">
and trim(box_no) = trim(#{remarks})
+ </if>
+ <if test="remarks == null ">
+ and box_no is null
</if>
</update>
@@ -396,7 +411,7 @@
dd.quantity as dd_quantity,
od.warehouse_num,
od.delivery_num,
- d.area,
+ dd.area,
od.building_number,
d.creator,
dd.delivery_detail_remakes,
@@ -488,6 +503,10 @@
select ifnull(sum(quantity),0) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
+ <select id="findFinishedOperateLogQuantity" >
+ select sum(quantity) from mm.finished_operate_log where operate_type='鍑哄簱' and status='鏈鏍�' and order_id=#{orderId}
+ </select>
+
<update id="updateOrderWarehousingState">
update sd.`order`
set warehousing=#{state}
@@ -547,12 +566,15 @@
<if test="remark != null and remark != ''">
, remark= #{remark}
</if>
- <if test="container != null and container != ''">
+ <if test="container != null ">
, box_no= #{container}
</if>
where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
- <if test="container != null and container != ''">
+ <if test="container != null ">
and box_no= #{container}
+ </if>
+ <if test="container == null ">
+ and box_no is null
</if>
</update>
@@ -564,6 +586,9 @@
where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
and box_no=#{finishedOperateLog.remarks}
+ </if>
+ <if test="finishedOperateLog.remarks == null ">
+ and box_no is null
</if>
</update>
@@ -596,10 +621,12 @@
select count(*)
from mm.`finished_goods_inventory`
where order_number = #{orderNumber} and order_id=#{orderId}
- <if test="boxNo != null and boxNo != ''">
+ <if test="boxNo != null ">
and box_no=#{boxNo}
</if>
-
+ <if test="boxNo == null ">
+ and box_no is null
+ </if>
</select>
@@ -607,8 +634,11 @@
select count(*)
from mm.`finished_goods_inventory`
where order_number = #{orderNumber} and order_id=#{orderId}
- <if test="container != null and container != ''">
+ <if test="container != null ">
and box_no=#{container}
+ </if>
+ <if test="container == null ">
+ and box_no is null
</if>
</select>
@@ -1070,8 +1100,11 @@
and order_id=#{orderId}
and delivery_id=#{deliveryId}
and delivery_detail_state=0
- <if test="boxNo != null and boxNo != ''">
+ <if test="boxNo != null ">
and box_no=trim(#{boxNo})
+ </if>
+ <if test="boxNo == null ">
+ and box_no is null
</if>
</select>
@@ -1088,11 +1121,12 @@
dd.quantity as dd_quantity,
od.warehouse_num,
od.delivery_num,
- d.area,
+ dd.area,
od.building_number,
d.creator,
dd.delivery_detail_remakes,
- dd.create_time
+ dd.create_time,
+ dd.box_no
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id = d.delivery_id
left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
--
Gitblit v1.8.0