From da497e4c08c46cbde5dfcd7ea0cf2e455ee6f592 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 20 五月 2024 10:36:44 +0800
Subject: [PATCH] 添加发货报表
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 220 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 165 insertions(+), 55 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 03ee805..7448fbc 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -64,6 +64,7 @@
<result column="product_name" property="productName"/>
<result column="product_id" property="productId"/>
<result column="warehouse_num" property="warehouseNum"/>
+ <result column="delivery_num" property="deliveryNum"/>
<result column="order_number" property="deliveryDetail.orderNumber"/>
<result column="delivery_id" property="deliveryDetail.deliveryId"/>
@@ -71,12 +72,13 @@
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
<result column="order_id" property="deliveryDetail.orderId"/>
<result column="create_time" property="deliveryDetail.createTime"/>
+ <result column="dd_quantity" property="deliveryDetail.quantity"/>
<result column="project" property="order.project"/>
<result column="creator" property="delivery.creator"/>
<result column="customer_name" property="delivery.customerName"/>
- <result column="quantity" property="delivery.quantity"/>
+ <result column="d_quantity" property="delivery.quantity"/>
<result column="area" property="delivery.area"/>
@@ -117,6 +119,32 @@
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
+ <update id="updateInventoryquantityInt">
+ update mm.finished_goods_inventory
+ set quantity_available=quantity_available+#{quantity},
+ update_time=now(),area=actual_signal_area*quantity_available
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
+ <update id="updateInventoryquantityOut">
+ update mm.finished_goods_inventory
+ set quantity_available=quantity_available-#{quantity},
+ update_time=now(),area=actual_signal_area*quantity_available
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
+ <update id="updateInventoryInventoryInt">
+ update mm.finished_goods_inventory
+ set inventory=inventory+#{quantity}
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
+ <update id="updateInventoryInventoryOut">
+ update mm.finished_goods_inventory
+ set inventory=inventory-#{quantity}
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
<select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
select fgi.order_id,
o.project,
@@ -134,6 +162,60 @@
from mm.finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
left join sd.`order` o on fgi.order_id = o.order_id
+ <where>
+ and fgi.status = 0 and fgi.quantity_available>0
+ <if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
+ and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}
+ </if>
+ <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
+ and o.project regexp #{orderDetail.order.project}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.orderNumber != null and orderDetail.finishedGoodsInventory.orderNumber != ''">
+ and fgi.order_number regexp #{orderDetail.finishedGoodsInventory.orderNumber}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="orderDetail.productId != null and orderDetail.productId != ''">
+ and od.product_id regexp #{orderDetail.productId}
+ </if>
+ <if test="orderDetail.productName != null and orderDetail.productName != ''">
+ and od.product_name regexp #{orderDetail.productName}
+ </if>
+ <if test="orderDetail.width != null and orderDetail.width != ''">
+ and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
+ </if>
+ <if test="orderDetail.height != null and orderDetail.height != ''">
+ and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
+ </if>
+ <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
+ and o.customer_id regexp #{orderDetail.order.customerId}
+ </if>
+ <if test="orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
+ and o.customer_name regexp #{orderDetail.order.customerName}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">
+ and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ </where>
+ group by fgi.order_id, fgi.order_number
+
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectAllocatePageTotal" >
+ select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from
+ (select fgi.order_number as order_number
+ from mm.finished_goods_inventory fgi
+ left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
+ left join sd.`order` o on fgi.order_id = o.order_id
<where>
and fgi.quantity_available>0
<if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
@@ -155,10 +237,10 @@
and od.product_name regexp #{orderDetail.productName}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp #{orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
<if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp #{orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
<if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
and o.customer_id regexp #{orderDetail.order.customerId}
@@ -167,26 +249,15 @@
and o.customer_name regexp #{orderDetail.order.customerName}
</if>
<if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp #{orderDetail.finishedGoodsInventory.actualSignalArea}
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
</if>
<if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">
- and fgi.area regexp #{orderDetail.finishedGoodsInventory.area}
+ and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
</if>
</where>
- group by fgi.order_id, fgi.order_number
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectAllocatePageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from
- (select fgi.order_number as order_number
- from mm.finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
- left join sd.`order` o on fgi.order_id = o.order_id
group by fgi.order_id, fgi.order_number) as zu
limit #{offset},#{pageSize};
@@ -195,7 +266,7 @@
<update id="updateDeliveryDetailState">
update sd.delivery_detail
set delivery_detail_state=#{state}
- where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
</update>
<update id="updateInventoryquantityavailable">
@@ -206,13 +277,15 @@
</update>
- <select id="getseletdeliveryDetailPageTotal" >
- select CEILING(count(dd.id)/#{pageSize})
+ <select id="getSelectDeliveryDetailPageTotal" >
+ select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
+ count(dd.id) as 'total'
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
left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -232,22 +305,22 @@
and d.customer_name regexp #{orderDetail.delivery.customerName}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp #{orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
<if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp #{orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
<if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
and d.quantity regexp #{orderDetail.delivery.quantity}
</if>
<if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
- and od.warehouseNum regexp #{orderDetail.warehouseNum}
+ and od.warehouse_num regexp #{orderDetail.warehouseNum}
</if>
<if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
and od.building_number regexp #{orderDetail.buildingNumber}
</if>
<if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
- and d.area regexp #{orderDetail.delivery.area}
+ and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
</if>
<if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
@@ -262,12 +335,12 @@
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
- <select id="getseletdeliveryDetail" resultMap="selectDelivery">
+ <select id="getSelectDeliveryDetail" resultMap="selectDelivery">
select dd.delivery_id,
dd.order_number,
dd.order_id,
@@ -277,8 +350,9 @@
d.customer_name,
od.width,
od.height,
- d.quantity,
+ dd.quantity as dd_quantity,
od.warehouse_num,
+ od.delivery_num,
d.area,
od.building_number,
d.creator,
@@ -287,9 +361,10 @@
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
- left join sd.`order` o on o.order_id = dd.order_id where dd.delivery_detail_state=1
+ left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1 and d.delivery_state=2
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -309,22 +384,22 @@
and d.customer_name regexp #{orderDetail.delivery.customerName}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp #{orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
<if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp #{orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
<if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
and d.quantity regexp #{orderDetail.delivery.quantity}
</if>
<if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
- and od.warehouseNum regexp #{orderDetail.warehouseNum}
+ and od.warehouse_num regexp #{orderDetail.warehouseNum}
</if>
<if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
and od.building_number regexp #{orderDetail.buildingNumber}
</if>
<if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
- and d.area regexp #{orderDetail.delivery.area}
+ and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
</if>
<if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
@@ -340,7 +415,7 @@
</if>
</where>
- order by dd.id
+ order by dd.id desc
limit #{offset},#{pageSize};
</select>
@@ -351,6 +426,18 @@
<select id="findOrderNumberdsum" >
select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <select id="findOrderDeliveryQuantitySum" >
+ select sum(delivery_num) from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <select id="findDeliveryQuantity" >
+ select quantity from sd.`delivery` where delivery_id=#{deliveryId}
+ </select>
+
+ <select id="findDeliverydetailsum" >
+ select sum(quantity) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
<update id="updateOrderWarehousingState">
@@ -364,6 +451,13 @@
set delivery=#{state}
where order_id=#{orderId}
</update>
+
+ <update id="updateDeliveryDeliveryState">
+ update sd.`delivery`
+ set stock_state=#{state}
+ where delivery_id=#{deliveryId}
+ </update>
+
<update id="updateIntOrderNumberConut">
update sd.order_detail
@@ -379,8 +473,14 @@
<update id="updateflowcard">
update pp.flow_card
- set received_quantity=received_quantity+${inventoryQuantity}
+ set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
+ </update>
+
+ <update id="updateflowcardOut">
+ update pp.flow_card
+ set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()
+ where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}
</update>
<update id="updateInventory">
@@ -396,9 +496,17 @@
where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
</update>
+ <update id="updateInventoryOut">
+ update mm.finished_goods_inventory
+ set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
+ update_time=now(),area=actual_signal_area*quantity_available
+ where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
+ </update>
+
<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
insert into mm.finished_goods_inventory (order_id,
order_number,
+ process_id,
inventory,
actual_signal_area,
area,
@@ -412,7 +520,7 @@
remark
)
values (
- #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
+ #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
#{flowCard.inventoryQuantity},null,#{storageRegion},
0,now(),now(),null,#{remark}
@@ -434,7 +542,7 @@
</select>
- <select id="getseletwarehousing" resultMap="selectFlowCard">
+ <select id="getSelectWarehousing" resultMap="selectFlowCard">
select
fc.id,
o.order_id,
@@ -447,7 +555,7 @@
o.project,
fc.order_number,
od.quantity,
- fc.inventory_quantity,
+ fc.inventory_quantity-fc.received_quantity as inventory_quantity,
o.area,
fc.process_id,
fc.received_quantity,
@@ -469,10 +577,10 @@
and od.product_name regexp #{flowCard.orderDetail.productName}
</if>
<if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
- and od.width regexp #{flowCard.orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
</if>
<if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
- and od.height regexp #{flowCard.orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
</if>
<if test="flowCard.order.creator != null and flowCard.order.creator != ''">
and o.creator regexp #{flowCard.order.creator}
@@ -490,7 +598,7 @@
and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
</if>
<if test="flowCard.order.area != null and flowCard.order.area != ''">
- and o.area regexp #{flowCard.order.area}
+ and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
</if>
<if test="flowCard.order.batch != null and flowCard.order.batch != ''">
and o.batch regexp #{flowCard.order.batch}
@@ -503,11 +611,13 @@
</if>
</where>
- group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
+ group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time desc
limit #{offset},#{pageSize};
</select>
- <select id="getseletwarehousingPageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from (
+ <select id="getSelectWarehousingPageTotal" >
+ select
+ CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from (
select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
<where>
@@ -525,10 +635,10 @@
and od.product_name regexp #{flowCard.orderDetail.productName}
</if>
<if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
- and od.width regexp #{flowCard.orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
</if>
<if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
- and od.height regexp #{flowCard.orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
</if>
<if test="flowCard.order.creator != null and flowCard.order.creator != ''">
and o.creator regexp #{flowCard.order.creator}
@@ -546,7 +656,7 @@
and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
</if>
<if test="flowCard.order.area != null and flowCard.order.area != ''">
- and o.area regexp #{flowCard.order.area}
+ and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
</if>
<if test="flowCard.order.batch != null and flowCard.order.batch != ''">
and o.batch regexp #{flowCard.order.batch}
@@ -610,7 +720,7 @@
and o.order_type regexp #{finishedGoodsInventory.order.orderType}
</if>
<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height regexp #{finishedGoodsInventory.orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
and fgi.inventory regexp #{finishedGoodsInventory.inventory}
@@ -619,10 +729,10 @@
and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp #{finishedGoodsInventory.actualSignalArea}
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area regexp #{finishedGoodsInventory.area}
+ and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
@@ -647,16 +757,16 @@
</if>
</where>
- order by fgi.id
+ order by fgi.id desc
- limit #{offset},#{pageSize}
- ;
+ limit #{offset},#{pageSize};
</select>
<select id="getPageTotal">
select
- CEILING(count(fgi.id)/#{pageSize})
+ CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
+ count(fgi.id) as 'total'
from finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
left join sd.`order` o on fgi.order_id = o.order_id
@@ -684,7 +794,7 @@
and o.order_type regexp #{finishedGoodsInventory.order.orderType}
</if>
<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height regexp #{finishedGoodsInventory.orderDetail.height}
+ and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
and fgi.inventory regexp #{finishedGoodsInventory.inventory}
@@ -693,10 +803,10 @@
and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp #{finishedGoodsInventory.actualSignalArea}
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area regexp #{finishedGoodsInventory.area}
+ and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
--
Gitblit v1.8.0