From d9f22642ce23c231ee46cce26f92fdc970b5891a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 十一月 2025 16:01:27 +0800
Subject: [PATCH] app接口新增以及订单图形修改
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 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 1e5064d..d160a09 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -347,13 +347,13 @@
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 != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
- <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
</if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
+ <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">
and o.project regexp #{orderDetail.order.project}
</if>
<if test="orderDetail.productId != null and orderDetail.productId != ''">
@@ -362,7 +362,7 @@
<if test="orderDetail.productName != null and orderDetail.productName != ''">
and od.product_name regexp #{orderDetail.productName}
</if>
- <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
and d.customer_name regexp #{orderDetail.delivery.customerName}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
@@ -371,7 +371,7 @@
<if test="orderDetail.height != null and orderDetail.height != ''">
and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
- <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
and d.quantity regexp #{orderDetail.delivery.quantity}
</if>
<if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
@@ -380,19 +380,19 @@
<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 != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
</if>
- <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
</if>
- <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
and d.creator regexp #{orderDetail.delivery.creator}
</if>
- <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
</if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
@@ -427,13 +427,13 @@
<where>
and dd.delivery_detail_state=1 and d.delivery_state=2
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
- <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
</if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
+ <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">
and o.project regexp #{orderDetail.order.project}
</if>
<if test="orderDetail.productId != null and orderDetail.productId != ''">
@@ -442,7 +442,7 @@
<if test="orderDetail.productName != null and orderDetail.productName != ''">
and od.product_name regexp #{orderDetail.productName}
</if>
- <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
and d.customer_name regexp #{orderDetail.delivery.customerName}
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
@@ -451,7 +451,7 @@
<if test="orderDetail.height != null and orderDetail.height != ''">
and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
- <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
and d.quantity regexp #{orderDetail.delivery.quantity}
</if>
<if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
@@ -460,19 +460,19 @@
<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 != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
</if>
- <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
</if>
- <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
+ <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
and d.creator regexp #{orderDetail.delivery.creator}
</if>
- <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
</if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+ <if test="orderDetail.deliveryDetail != null and orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
</if>
</where>
@@ -733,43 +733,43 @@
o.order_id=fc.order_id
<where>
and fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0
- <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
+ <if test="flowCard.order != null and flowCard.order.orderId != null and flowCard.order.orderId != ''">
and o.order_id regexp #{flowCard.order.orderId}
</if>
- <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
</if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and od.product_id regexp #{flowCard.orderDetail.productId}
</if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
and od.product_name regexp #{flowCard.orderDetail.productName}
</if>
- <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
</if>
- <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
</if>
- <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
+ <if test="flowCard.order != null and flowCard.order.creator != null and flowCard.order.creator != ''">
and o.creator regexp #{flowCard.order.creator}
</if>
- <if test="flowCard.order.project != null and flowCard.order.project != ''">
+ <if test="flowCard.order != null and flowCard.order.project != null and flowCard.order.project != ''">
and o.project regexp #{flowCard.order.project}
</if>
<if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
and fc.order_number regexp #{flowCard.orderNumber}
</if>
- <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
and od.quantity regexp #{flowCard.orderDetail.quantity}
</if>
<if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
</if>
- <if test="flowCard.order.area != null and flowCard.order.area != ''">
+ <if test="flowCard.order != null and flowCard.order.area != null and flowCard.order.area != ''">
and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
</if>
- <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
+ <if test="flowCard.order != null and flowCard.order.batch != null and flowCard.order.batch != ''">
and o.batch regexp #{flowCard.order.batch}
</if>
<if test="flowCard.processId != null and flowCard.processId != ''">
@@ -791,43 +791,43 @@
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>
and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity and o.create_order>0
- <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
+ <if test="flowCard.order != null and flowCard.order.orderId != null and flowCard.order.orderId != ''">
and o.order_id regexp #{flowCard.order.orderId}
</if>
- <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
</if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and od.product_id regexp #{flowCard.orderDetail.productId}
</if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
and od.product_name regexp #{flowCard.orderDetail.productName}
</if>
- <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
</if>
- <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
</if>
- <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
+ <if test="flowCard.order != null and flowCard.order.creator != null and flowCard.order.creator != ''">
and o.creator regexp #{flowCard.order.creator}
</if>
- <if test="flowCard.order.project != null and flowCard.order.project != ''">
+ <if test="flowCard.order != null and flowCard.order.project != null and flowCard.order.project != ''">
and o.project regexp #{flowCard.order.project}
</if>
<if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
and fc.order_number regexp #{flowCard.orderNumber}
</if>
- <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
+ <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
and od.quantity regexp #{flowCard.orderDetail.quantity}
</if>
<if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
</if>
- <if test="flowCard.order.area != null and flowCard.order.area != ''">
+ <if test="flowCard.order != null and flowCard.order.area != null and flowCard.order.area != ''">
and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
</if>
- <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
+ <if test="flowCard.order != null and flowCard.order.batch != null and flowCard.order.batch != ''">
and o.batch regexp #{flowCard.order.batch}
</if>
<if test="flowCard.processId != null and flowCard.processId != ''">
--
Gitblit v1.8.0