From 8821a4d7bfb4e0eaed9a40a2fd317f6b2b256bb4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 11 九月 2025 18:08:23 +0800
Subject: [PATCH] 提交 入库箱号判断条件
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 fc0dc12..6c97975 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -150,7 +150,7 @@
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 ">
@@ -163,7 +163,7 @@
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 ">
@@ -175,7 +175,7 @@
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 ">
@@ -187,7 +187,7 @@
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 ">
@@ -318,7 +318,7 @@
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 ">
@@ -565,11 +565,11 @@
<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 ">
@@ -620,7 +620,7 @@
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 ">
@@ -633,7 +633,7 @@
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 ">
@@ -1099,7 +1099,7 @@
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 ">
@@ -1124,7 +1124,8 @@
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