From 149d60a12ef635c2b08e4ebedfc9afa7363a6562 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 20 二月 2024 16:16:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml | 76 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
index 099008c..a2ee717 100644
--- a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.mm.FinishedGoodsInventoryMapper">
- <!--映射成品库存-->
+ <!--鏄犲皠鎴愬搧搴撳瓨-->
<resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">
<id column="fid" property="id"/>
<result column="inventory" property="inventory"/>
@@ -31,7 +31,7 @@
<result column="product_id" property="orderDetail.productId"/>
</resultMap>
- <!--映射成品入库-->
+ <!--鏄犲皠鎴愬搧鍏ュ簱-->
<resultMap id="selectFlowCard" type="com.example.erp.entity.pp.FlowCard">
<id column="id" property="id"/>
<result column="order_number" property="orderNumber"/>
@@ -55,7 +55,7 @@
<result column="quantity" property="orderDetail.quantity"/>
</resultMap>
- <!--映射成品出库-->
+ <!--鏄犲皠鎴愬搧鍑哄簱-->
<resultMap id="selectDelivery" type="com.example.erp.entity.sd.OrderDetail">
<id column="id" property="id"/>
<result column="building_number" property="buildingNumber"/>
@@ -82,7 +82,7 @@
</resultMap>
- <!--映射订单调拨-->
+ <!--鏄犲皠璁㈠崟璋冩嫧-->
<resultMap id="selectDeliveryFinishedGoodsInventory" type="com.example.erp.entity.sd.OrderDetail">
<result column="width" property="width"/>
@@ -114,6 +114,32 @@
update mm.finished_goods_inventory
set inventory=inventory-#{quantity},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="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>
@@ -187,6 +213,48 @@
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 != ''">
+ 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 #{orderDetail.width}
+ </if>
+ <if test="orderDetail.height != null and orderDetail.height != ''">
+ and od.height regexp #{orderDetail.height}
+ </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 #{orderDetail.finishedGoodsInventory.actualSignalArea}
+ </if>
+ <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">
+ and fgi.area regexp #{orderDetail.finishedGoodsInventory.area}
+ </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) as zu
limit #{offset},#{pageSize};
--
Gitblit v1.8.0