From 41631eec06251ec8f858765af6a0858b180e720d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 08:22:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 250 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml b/north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml
index 795ec35..8feedfa 100644
--- a/north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml
@@ -56,7 +56,7 @@
</resultMap>
<update id="updateOrderDetailDeliveryNum">
- update sd.order_detail set delivery_num=#{finishedGoodsInventory.quantityAvailable} where order_id=#{orderId} and order_number=#{orderNumber}
+ update sd.order_detail set delivery_num=#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
</update>
<select id="getdeliveryDetailmaximum" >
@@ -69,8 +69,8 @@
area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,create_time)
values (
#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
- #{orderDetail.orderId},#{orderDetail.finishedGoodsInventory.quantityAvailable},
- #{orderDetail.price}*#{orderDetail.finishedGoodsInventory.quantityAvailable},'',1,now()
+ #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
+ #{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
)
</insert>
@@ -90,6 +90,72 @@
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
+ <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+ and od.order_id regexp #{orderDetail.orderId}
+ </if>
+ <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+ and o.batch regexp #{orderDetail.order.batch}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+ and od.quantity regexp #{orderDetail.quantity}
+ </if>
+ <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
+ and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
+ </if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and od.building_number regexp #{orderDetail.buildingNumber}
+ </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.price != null and orderDetail.price != ''">
+ and od.price regexp #{orderDetail.price}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
+ and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
+ </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.shape != null and orderDetail.shape != ''">
+ and od.shape regexp #{orderDetail.shape}
+ </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.grossArea != null and orderDetail.grossArea != ''">
+ and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+ and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+ and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+ and od.processing_note regexp #{orderDetail.processingNote}
+ </if>
+ <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+ and od.edging_type regexp #{orderDetail.edgingType}
+ </if>
+ <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+ and od.perimeter regexp #{orderDetail.perimeter}
+ </if>
+ <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+ and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+ </if>
</where>
limit #{offset},#{pageSize};
@@ -107,6 +173,72 @@
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
+ <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+ and od.order_id regexp #{orderDetail.orderId}
+ </if>
+ <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+ and o.batch regexp #{orderDetail.order.batch}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+ and od.quantity regexp #{orderDetail.quantity}
+ </if>
+ <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
+ and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
+ </if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and od.building_number regexp #{orderDetail.buildingNumber}
+ </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.price != null and orderDetail.price != ''">
+ and od.price regexp #{orderDetail.price}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
+ and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
+ </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.shape != null and orderDetail.shape != ''">
+ and od.shape regexp #{orderDetail.shape}
+ </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.grossArea != null and orderDetail.grossArea != ''">
+ and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+ and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+ and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+ and od.processing_note regexp #{orderDetail.processingNote}
+ </if>
+ <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+ and od.edging_type regexp #{orderDetail.edgingType}
+ </if>
+ <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+ and od.perimeter regexp #{orderDetail.perimeter}
+ </if>
+ <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+ and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
@@ -118,7 +250,7 @@
fgi.quantity_available,
od.quantity- od.delivery_num as t_quantity,
od.quantity as o_quantity,
- od.delivery_num as d_quantity,
+ fgi.quantity_available as d_quantity,
od.building_number,
od.product_id,
od.product_name,
@@ -143,6 +275,63 @@
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
and od.order_id regexp #{orderDetail.orderId}
</if>
+ <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+ and o.batch regexp #{orderDetail.order.batch}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+ and od.quantity regexp #{orderDetail.quantity}
+ </if>
+ <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
+ and od.delivery_num regexp #{orderDetail.deliveryNum}
+ </if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and od.building_number regexp #{orderDetail.buildingNumber}
+ </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.price != null and orderDetail.price != ''">
+ and od.price regexp REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </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.shape != null and orderDetail.shape != ''">
+ and od.shape regexp #{orderDetail.shape}
+ </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.grossArea != null and orderDetail.grossArea != ''">
+ and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+ and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+ and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+ and od.processing_note regexp #{orderDetail.processingNote}
+ </if>
+ <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+ and od.edging_type regexp #{orderDetail.edgingType}
+ </if>
+ <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+ and od.perimeter regexp #{orderDetail.perimeter}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
@@ -159,6 +348,63 @@
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
and od.order_id regexp #{orderDetail.orderId}
</if>
+ <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+ and o.batch regexp #{orderDetail.order.batch}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+ and od.quantity regexp #{orderDetail.quantity}
+ </if>
+ <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
+ and od.delivery_num regexp #{orderDetail.deliveryNum}
+ </if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and od.building_number regexp #{orderDetail.buildingNumber}
+ </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.price != null and orderDetail.price != ''">
+ and od.price regexp REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+ </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.shape != null and orderDetail.shape != ''">
+ and od.shape regexp #{orderDetail.shape}
+ </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.grossArea != null and orderDetail.grossArea != ''">
+ and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+ and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+ and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+ </if>
+ <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+ and od.processing_note regexp #{orderDetail.processingNote}
+ </if>
+ <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+ and od.edging_type regexp #{orderDetail.edgingType}
+ </if>
+ <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+ and od.perimeter regexp #{orderDetail.perimeter}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0