From decd9f8bf3e6119efce34e6bbc0c320a2a2446c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:41:50 +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 | 382 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 357 insertions(+), 25 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
index eb359fa..099008c 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"/>
@@ -42,9 +42,10 @@
<result column="order_id" property="order.orderId"/>
<result column="project" property="order.project"/>
- <result column="creater" property="order.creater"/>
+ <result column="creator" property="order.creator"/>
<result column="area" property="order.area"/>
<result column="batch" property="order.batch"/>
+ <result column="order_quantity" property="order.quantity"/>
<result column="building_number" property="orderDetail.buildingNumber"/>
<result column="width" property="orderDetail.width"/>
@@ -54,17 +55,345 @@
<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"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="product_name" property="productName"/>
+ <result column="product_id" property="productId"/>
+ <result column="warehouse_num" property="warehouseNum"/>
+
+ <result column="order_number" property="deliveryDetail.orderNumber"/>
+ <result column="delivery_id" property="deliveryDetail.deliveryId"/>
+ <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
+ <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
+ <result column="order_id" property="deliveryDetail.orderId"/>
+ <result column="create_time" property="deliveryDetail.createTime"/>
+
+ <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="area" property="delivery.area"/>
+
+
+ </resultMap>
+
+ <!--映射订单调拨-->
+ <resultMap id="selectDeliveryFinishedGoodsInventory" type="com.example.erp.entity.sd.OrderDetail">
+
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="product_name" property="productName"/>
+ <result column="product_id" property="productId"/>
+
+ <result column="order_id" property="finishedGoodsInventory.orderId"/>
+ <result column="order_number" property="finishedGoodsInventory.orderNumber"/>
+ <result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
+ <result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
+ <result column="area" property="finishedGoodsInventory.area"/>
+ <result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
+
+ <result column="project" property="order.project"/>
+ <result column="customer_id" property="order.customerId"/>
+ <result column="customer_name" property="order.customerName"/>
+
+
+ </resultMap>
+ <update id="updateInventoryquantityAllocateInt">
+ 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="updateInventoryquantityAllocateOut">
+ 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>
+
+ <select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
+ select fgi.order_id,
+ o.project,
+ fgi.order_number,
+ fgi.quantity_available,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ o.customer_id,
+ o.customer_name,
+ fgi.actual_signal_area,
+ fgi.area,
+ fgi.storage_region
+ 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
+
+ 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};
+ </select>
+
+ <update id="updateDeliveryDetailState">
+ update sd.delivery_detail
+ set delivery_detail_state=#{state}
+ where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
+ </update>
+
+ <update id="updateInventoryquantityavailable">
+ update mm.finished_goods_inventory
+ set inventory=0,quantity_available=0,
+ update_time=now(),area=0,status=1
+ where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
+ </update>
+
+
+ <select id="getseletdeliveryDetailPageTotal" >
+ select CEILING(count(dd.id)/#{pageSize})
+ 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>
+ <if test="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 != ''">
+ and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
+ </if>
+ <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
+ and o.project regexp #{orderDetail.order.project}
+ </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.delivery.customerName != null and orderDetail.delivery.customerName != ''">
+ and d.customer_name regexp #{orderDetail.delivery.customerName}
+ </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.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}
+ </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}
+ </if>
+ <if test="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 != ''">
+ and d.creator regexp #{orderDetail.delivery.creator}
+ </if>
+ <if test="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 != ''">
+ and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+ </if>
+ </where>
+ order by dd.id
+
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getseletdeliveryDetail" resultMap="selectDelivery">
+ select dd.delivery_id,
+ dd.order_number,
+ dd.order_id,
+ o.project,
+ od.product_id,
+ od.product_name,
+ d.customer_name,
+ od.width,
+ od.height,
+ d.quantity,
+ od.warehouse_num,
+ d.area,
+ od.building_number,
+ d.creator,
+ dd.delivery_detail_remakes,
+ dd.create_time
+ 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
+
+ <where>
+ <if test="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 != ''">
+ and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
+ </if>
+ <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
+ and o.project regexp #{orderDetail.order.project}
+ </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.delivery.customerName != null and orderDetail.delivery.customerName != ''">
+ and d.customer_name regexp #{orderDetail.delivery.customerName}
+ </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.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}
+ </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}
+ </if>
+ <if test="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 != ''">
+ and d.creator regexp #{orderDetail.delivery.creator}
+ </if>
+ <if test="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 != ''">
+ and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+ </if>
+ </where>
+
+ order by dd.id
+
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="findOrderQuantity" >
+ select quantity from sd.`order` where order_id=#{orderId}
+ </select>
+
+ <select id="findOrderNumberdsum" >
+ select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
+ </select>
+
+ <update id="updateOrderWarehousingState">
+ update sd.`order`
+ set warehousing=#{state}
+ where order_id=#{orderId}
+ </update>
+
+ <update id="updateOrderDeliveryState">
+ update sd.`order`
+ set delivery=#{state}
+ where order_id=#{orderId}
+ </update>
+
+ <update id="updateIntOrderNumberConut">
+ update sd.order_detail
+ set warehouse_num=warehouse_num+${quantity}
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
+ <update id="updateOutOrderNumberConut">
+ update sd.order_detail
+ set warehouse_num=warehouse_num-${quantity}
+ where order_number=#{orderNumber} and order_id=#{orderId}
+ </update>
+
<update id="updateflowcard">
update pp.flow_card
set received_quantity=received_quantity+${inventoryQuantity}
- where order_number=#{orderNumber} and process_id=#{processId}
+ where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
</update>
<update id="updateInventory">
update mm.finished_goods_inventory
- set inventory=inventory+${inventoryQuantity},quantity_available=quantity_available+${inventoryQuantity},
- update_time=now(),area=area+actual_signal_area*${inventoryQuantity}
- where order_number=#{orderNumber}
+ set inventory=inventory+${flowCard.inventoryQuantity},quantity_available=quantity_available+${flowCard.inventoryQuantity},
+ update_time=now(),area=actual_signal_area*quantity_available
+ <if test="storageRegion != null and storageRegion != ''">
+ , storage_region= #{storageRegion}
+ </if>
+ <if test="remark != null and remark != ''">
+ , remark= #{remark}
+ </if>
+ where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
</update>
<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
@@ -93,16 +422,17 @@
<select id="findOrderNumberdcount" >
select count(*)
from mm.`finished_goods_inventory`
- where order_number = #{orderNumber}
+ where order_number = #{orderNumber} and order_id=#{orderId};
</select>
- <select id="findOrderNumberd" >
- select *
- from sd.finished_goods_inventory
- where order_number = #{orderNumber}
+ <select id="finishedGoodsInventorybycount" >
+ select quantity_available
+ from mm.`finished_goods_inventory`
+ where order_number = #{orderNumber} and order_id=#{orderId};
</select>
+
<select id="getseletwarehousing" resultMap="selectFlowCard">
select
@@ -113,7 +443,7 @@
od.product_name,
od.width,
od.height,
- o.creater,
+ o.creator,
o.project,
fc.order_number,
od.quantity,
@@ -122,7 +452,7 @@
fc.process_id,
fc.received_quantity,
o.batch
- from pp.flow_card fc left join sd.order_detail od on fc.order_number=od.order_number inner join sd.`order` o on
+ 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>
and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
@@ -144,8 +474,8 @@
<if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
and od.height regexp #{flowCard.orderDetail.height}
</if>
- <if test="flowCard.order.creater != null and flowCard.order.creater != ''">
- and o.creater regexp #{flowCard.order.creater}
+ <if test="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 != ''">
and o.project regexp #{flowCard.order.project}
@@ -173,13 +503,13 @@
</if>
</where>
- group by 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
limit #{offset},#{pageSize};
</select>
<select id="getseletwarehousingPageTotal" >
select CEILING(count(zu.order_number)/#{pageSize}) 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_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
+ 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
<if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
@@ -200,8 +530,8 @@
<if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
and od.height regexp #{flowCard.orderDetail.height}
</if>
- <if test="flowCard.order.creater != null and flowCard.order.creater != ''">
- and o.creater regexp #{flowCard.order.creater}
+ <if test="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 != ''">
and o.project regexp #{flowCard.order.project}
@@ -229,7 +559,7 @@
</if>
</where>
- group by fc.order_number,fc.process_id order by fc.create_time) as zu
+ group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time) as zu
</select>
@@ -254,9 +584,10 @@
fgi.end_time,
fgi.remark
from finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_number = od.order_number
- inner join sd.`order` o on fgi.order_id = o.order_id
+ 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="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
and od.width regexp #{finishedGoodsInventory.orderDetail.width}
</if>
@@ -327,9 +658,10 @@
select
CEILING(count(fgi.id)/#{pageSize})
from finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_number = od.order_number
- inner join sd.`order` o on fgi.order_id = o.order_id
+ 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="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
and od.width regexp #{finishedGoodsInventory.orderDetail.width}
</if>
--
Gitblit v1.8.0