From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 253 ++++++++++++++++++++++++++++++--------------------
1 files changed, 152 insertions(+), 101 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 f825973..86239e9 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -61,6 +61,8 @@
<result column="batch" property="order.batch"/>
<result column="order_quantity" property="order.quantity"/>
<result column="calculate_type" property="order.calculateType"/>
+ <result column="customer_name" property="order.customerName"/>
+
<result column="building_number" property="orderDetail.buildingNumber"/>
<result column="width" property="orderDetail.width"/>
@@ -91,6 +93,7 @@
<result column="delivery_id" property="deliveryDetail.deliveryId"/>
<result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
+ <result column="delivery_detail_state" property="deliveryDetail.deliveryDetailState"/>
<result column="order_id" property="deliveryDetail.orderId"/>
<result column="create_time" property="deliveryDetail.createTime"/>
<result column="dd_quantity" property="deliveryDetail.quantity"/>
@@ -346,13 +349,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 != ''">
@@ -361,7 +364,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 != ''">
@@ -370,7 +373,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 != ''">
@@ -379,19 +382,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>
@@ -426,13 +429,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 != ''">
@@ -441,7 +444,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 != ''">
@@ -450,7 +453,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 != ''">
@@ -459,19 +462,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>
@@ -542,7 +545,7 @@
<update id="updateOrderNumberConut">
update sd.order_detail
- set warehouse_num=${quantity},update_time=now()
+ set warehouse_num=warehouse_num+${quantity},update_time=now()
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
@@ -554,7 +557,7 @@
<update id="updateflowcardOut">
update pp.flow_card
- set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()
+ set received_quantity=received_quantity-${finishedOperateLog.cancelAvailable},storage_time=now()
where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}
</update>
@@ -583,7 +586,7 @@
<update id="updateInventoryOut">
update mm.finished_goods_inventory
- set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
+ set inventory=inventory-${finishedOperateLog.cancelAvailable},quantity_available=quantity_available-${finishedOperateLog.cancelAvailable},
update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
@@ -713,6 +716,7 @@
od.height,
o.creator,
o.project,
+ o.customer_name,
fc.order_number,
od.quantity,
fc.quantity as fc_quantity,
@@ -732,43 +736,46 @@
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.order != null and flowCard.order.customerName != null and flowCard.order.customerName != ''">
+ and o.customer_name regexp #{flowCard.order.customerName}
</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 != ''">
@@ -784,49 +791,54 @@
</select>
<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
+ CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
+ count(zu.id) as 'total' from (
+ select fc.id as id
+ from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card group by order_id,order_number,process_id) as 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>
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.order != null and flowCard.order.customerName != null and flowCard.order.customerName != ''">
+ and o.customer_name regexp #{flowCard.order.customerName}
</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 != ''">
@@ -880,51 +892,49 @@
<where>
and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width regexp #{finishedGoodsInventory.orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.width},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
- and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
+ and od.order_number like concat('%', #{finishedGoodsInventory.orderDetail.orderNumber}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
+ and od.product_name like concat('%', #{finishedGoodsInventory.orderDetail.productName}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
+ and od.product_id like concat('%', #{finishedGoodsInventory.orderDetail.productId}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
- and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
+ and od.building_number like concat('%', #{finishedGoodsInventory.orderDetail.buildingNumber}, '%')
</if>
<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id regexp #{finishedGoodsInventory.order.orderId}
+ and o.order_id like concat('%', #{finishedGoodsInventory.order.orderId}, '%')
</if>
<if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
- and o.project regexp #{finishedGoodsInventory.order.project}
+ and o.project like concat('%', #{finishedGoodsInventory.order.project}, '%')
</if>
<if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
- and o.order_type regexp #{finishedGoodsInventory.order.orderType}
+ and o.order_type like concat('%', #{finishedGoodsInventory.order.orderType}, '%')
</if>
-
<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
- and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
+ and o.customer_id like concat('%', #{finishedGoodsInventory.order.customerId}, '%')
</if>
<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
- and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
+ and o.customer_name like concat('%', #{finishedGoodsInventory.order.customerName}, '%')
</if>
<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
- and o.batch regexp #{finishedGoodsInventory.order.batch}
+ and o.batch like concat('%', #{finishedGoodsInventory.order.batch}, '%')
</if>
<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
- and o.salesman regexp #{finishedGoodsInventory.order.salesman}
+ and o.salesman like concat('%', #{finishedGoodsInventory.order.salesman}, '%')
</if>
-
<if test="finishedGoodsInventory.orderDetail.height != null and 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}
+ and fgi.inventory like concat('%', #{finishedGoodsInventory.inventory}, '%')
</if>
<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
+ and fgi.quantity_available like concat('%', #{finishedGoodsInventory.quantityAvailable}, '%')
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
@@ -939,28 +949,28 @@
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}
+ and fgi.warehouse_number like concat('%', #{finishedGoodsInventory.warehouseNumber}, '%')
</if>
<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
+ and fgi.storage_region like concat('%', #{finishedGoodsInventory.storageRegion}, '%')
</if>
<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` regexp #{finishedGoodsInventory.status}
+ and fgi.`status` like concat('%', #{finishedGoodsInventory.status}, '%')
</if>
<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
+ and fgi.enter_storage_time like concat('%', #{finishedGoodsInventory.enterStorageTime}, '%')
</if>
<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
+ and fgi.update_time like concat('%', #{finishedGoodsInventory.updateTime}, '%')
</if>
<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time regexp #{finishedGoodsInventory.endTime}
+ and fgi.end_time like concat('%', #{finishedGoodsInventory.endTime}, '%')
</if>
<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark regexp #{finishedGoodsInventory.remark}
+ and fgi.remark like concat('%', #{finishedGoodsInventory.remark}, '%')
</if>
<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
- and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
+ and fgi.box_no like concat('%', #{finishedGoodsInventory.boxNo}, '%')
</if>
</where>
@@ -983,57 +993,52 @@
<where>
and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width regexp #{finishedGoodsInventory.orderDetail.width}
+ and od.width regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.width},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
- and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
+ and od.order_number like concat('%', #{finishedGoodsInventory.orderDetail.orderNumber}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
+ and od.product_name like concat('%', #{finishedGoodsInventory.orderDetail.productName}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
+ and od.product_id like concat('%', #{finishedGoodsInventory.orderDetail.productId}, '%')
</if>
<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
- and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
+ and od.building_number like concat('%', #{finishedGoodsInventory.orderDetail.buildingNumber}, '%')
</if>
<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id regexp #{finishedGoodsInventory.order.orderId}
+ and o.order_id like concat('%', #{finishedGoodsInventory.order.orderId}, '%')
</if>
<if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
- and o.project regexp #{finishedGoodsInventory.order.project}
+ and o.project like concat('%', #{finishedGoodsInventory.order.project}, '%')
</if>
<if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
- and o.order_type regexp #{finishedGoodsInventory.order.orderType}
+ and o.order_type like concat('%', #{finishedGoodsInventory.order.orderType}, '%')
</if>
-
<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
- and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
+ and o.customer_id like concat('%', #{finishedGoodsInventory.order.customerId}, '%')
</if>
<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
- and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
+ and o.customer_name like concat('%', #{finishedGoodsInventory.order.customerName}, '%')
</if>
<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
- and o.batch regexp #{finishedGoodsInventory.order.batch}
+ and o.batch like concat('%', #{finishedGoodsInventory.order.batch}, '%')
</if>
<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
- and o.salesman regexp #{finishedGoodsInventory.order.salesman}
+ and o.salesman like concat('%', #{finishedGoodsInventory.order.salesman}, '%')
</if>
-
<if test="finishedGoodsInventory.orderDetail.height != null and 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}
+ and fgi.inventory like concat('%', #{finishedGoodsInventory.inventory}, '%')
</if>
<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
+ and fgi.quantity_available like concat('%', #{finishedGoodsInventory.quantityAvailable}, '%')
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and 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 REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
@@ -1041,29 +1046,32 @@
<if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
</if>
+ <if test="finishedGoodsInventory.area != null and 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}
+ and fgi.warehouse_number like concat('%', #{finishedGoodsInventory.warehouseNumber}, '%')
</if>
<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
+ and fgi.storage_region like concat('%', #{finishedGoodsInventory.storageRegion}, '%')
</if>
<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` regexp #{finishedGoodsInventory.status}
+ and fgi.`status` like concat('%', #{finishedGoodsInventory.status}, '%')
</if>
<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
+ and fgi.enter_storage_time like concat('%', #{finishedGoodsInventory.enterStorageTime}, '%')
</if>
<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
+ and fgi.update_time like concat('%', #{finishedGoodsInventory.updateTime}, '%')
</if>
<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time regexp #{finishedGoodsInventory.endTime}
+ and fgi.end_time like concat('%', #{finishedGoodsInventory.endTime}, '%')
</if>
<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark regexp #{finishedGoodsInventory.remark}
+ and fgi.remark like concat('%', #{finishedGoodsInventory.remark}, '%')
</if>
<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
- and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
+ and fgi.box_no like concat('%', #{finishedGoodsInventory.boxNo}, '%')
</if>
</where>
@@ -1107,7 +1115,7 @@
<update id="updateOrderInventory">
update mm.finished_goods_inventory
- set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
+ set inventory=inventory+${orderDetail.quantity},quantity_available=quantity_available+${orderDetail.quantity},
update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderDetail.orderNumber} and order_id=#{orderDetail.orderId}
</update>
@@ -1148,6 +1156,7 @@
od.building_number,
d.creator,
dd.delivery_detail_remakes,
+ dd.delivery_detail_state,
dd.create_time,
dd.box_no
from sd.delivery_detail dd
@@ -1248,4 +1257,46 @@
where o.create_time < DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
and o.delivery=2 and fgi.inventory=0
</delete>
+
+
+
+ <select id="getFinishedGoodsInventoryList" resultMap="selectFinishedGoodsInventory">
+ select
+ fgi.id,
+ fgi.process_id,
+ od.order_number,
+ o.order_id,
+ o.project,
+ o.order_type,
+ o.customer_id,
+ o.customer_name,
+ o.batch,
+ o.salesman,
+ od.product_name,
+ od.product_id,
+ od.width,
+ od.height,
+ od.building_number,
+ fgi.inventory,
+ fgi.quantity_available,
+ fgi.actual_signal_area,
+ fgi.area,
+ fgi.warehouse_number,
+ fgi.storage_region,
+ fgi.`status`,
+ fgi.update_time,
+ fgi.enter_storage_time,
+ fgi.end_time,
+ fgi.remark,
+ fgi.box_no,
+ fgi.compute_area,
+ fgi.compute_gross_area,
+ round(fgi.area*p.total_thickness*2.5/1000,5) as weight
+ 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
+ left join sd.product p on p.id=od.product_id
+ where fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
+ order by fgi.update_time desc;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0