From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 232 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 163 insertions(+), 69 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index c5a9831..39f6e48 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -6,7 +6,7 @@
<resultMap id="flowCardMap" type="com.example.erp.entity.pp.FlowCard">
<result column="order_id" property="orderId"/>
<result column="process_Id" property="processId"/>
- <result column="binning_quantity" property="binningQuantity"/>
+ <result column="quantity" property="quantity"/>
<result column="founder" property="founder"/>
<result column="create_time" property="createTime"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
@@ -48,6 +48,7 @@
<result column="g_type" property="glassTypes.type"/>-->
</resultMap>
+ <!-- 娴佺▼鍗＄鐞嗘煡璇�-->
<select id="selectFlowCard" resultMap="flowCardMap">
select
a.order_Id,
@@ -55,41 +56,35 @@
c.product_id,
c.product_name,
b.project,
- a.binning_quantity,
+ a.quantity,
c.compute_gross_area,
a.founder,
c.processing_note
from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
where a.create_time between #{selectTime1} and #{selectTime2}
- <!-- <where>-->
- <!-- <if test="flowCard.orderId != null and flowCard.orderId != ''">-->
- <!-- and a.order_id regexp #{flowCard.orderId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.productionId != null and flowCard.productionId != ''">-->
- <!-- and a.process_Id regexp #{flowCard.productionId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">-->
- <!-- and c.product_id regexp #{flowCard.orderDetail.productId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">-->
- <!-- and c.product_name regexp #{flowCard.orderDetail.productName}-->
- <!-- </if>-->
+ <if test="flowCard.orderId != null and flowCard.orderId != ''">
+ and a.order_id regexp #{flowCard.orderId}
+ </if>
+ <if test="flowCard.productionId != null and flowCard.productionId != ''">
+ and a.process_Id regexp #{flowCard.productionId}
+ </if>
+ <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
+ and c.product_id regexp #{flowCard.orderDetail.productId}
+ </if>
+ <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
+ and c.product_name regexp #{flowCard.orderDetail.productName}
+ </if>
- <!-- <if test="flowCard.order.project != null and flowCard.order.project!= ''">-->
- <!-- and b.project regexp #{flowCard.order.project}-->
- <!-- </if>-->
+ <if test="flowCard.order.project != null and flowCard.order.project!= ''">
+ and b.project regexp #{flowCard.order.project}
+ </if>
- <!-- <if test="flowCard.createTime != null and flowCard.createTime != ''">-->
- <!-- and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }-->
- <!-- </if>-->
-
- <!-- </where>-->
group by a.process_Id;
</select>
-
+ <!--鍒嗘灦鏌ヨ-->
<select id="selectFlowCardMp" resultMap="flowCardMap">
select o.order_id,
o.customer_name,
@@ -102,46 +97,77 @@
o.processing_note,
o.delivery_address
from sd.`order` as o
- where o.production_order=2 and o.create_time between #{selectTime1} and #{selectTime2}
- <!-- <where>-->
- <!-- <if test="flowCard.orderId != null and flowCard.orderId != ''">-->
- <!-- and a.order_id regexp #{flowCard.orderId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.productionId != null and flowCard.productionId != ''">-->
- <!-- and a.process_Id regexp #{flowCard.productionId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">-->
- <!-- and c.product_id regexp #{flowCard.orderDetail.productId}-->
- <!-- </if>-->
- <!-- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">-->
- <!-- and c.product_name regexp #{flowCard.orderDetail.productName}-->
- <!-- </if>-->
+ left join sd.order_glass_detail ogd on o.order_id = ogd.order_id
+ where o.production_order=2 and ogd.splitting_status=0 and o.create_time between #{selectTime1} and #{selectTime2}
- <!-- <if test="flowCard.order.project != null and flowCard.order.project!= ''">-->
- <!-- and b.project regexp #{flowCard.order.project}-->
- <!-- </if>-->
+ <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
+ and o.order_id, regexp #{flowCard.order.orderId}
+ </if>
+ <if test="flowCard.order.customerName != null and flowCard.order.customerName != ''">
+ and o.customer_name regexp #{flowCard.order.customerName}
+ </if>
+ <if test="flowCard.order.project != null and flowCard.order.project != ''">
+ and o.project regexp #{flowCard.order.project}
+ </if>
+ <if test="flowCard.order.batch != null and flowCard.order.batch!= ''">
+ and o.batch regexp #{flowCard.order.batch}
+ </if>
+ <if test="flowCard.order.otherRemarks != null and flowCard.order.otherRemarks!= ''">
+ and o.other_remarks regexp #{flowCard.order.otherRemarks}
+ </if>
- <!-- </where>-->
+ <if test="flowCard.order.icon != null and flowCard.order.icon!= ''">
+ and o.icon regexp #{flowCard.order.icon}
+ </if>
+ <if test="flowCard.order.orderType != null and flowCard.order.orderType!= ''">
+ and o.order_type regexp #{flowCard.order.orderType}
+ </if>
+ <if test="flowCard.order.salesman != null and flowCard.order.salesman!= ''">
+ and o.salesman regexp #{flowCard.order.salesman}
+ </if>
+ group by o.order_id
+
;
</select>
+<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
<select id="DetailsSelectMp" resultMap="flowCardMap">
select od.order_id,
- ogd.production_id,
- od.product_id,
- od.product_name,
- od.quantity,
- od.compute_gross_area,
- od.perimeter
- from sd.order_detail as od
- left join sd.order_glass_detail as ogd
- on od.order_id = ogd.order_id
- where od.order_id = #{orderId}
+ ogd.production_id,
+ od.product_id,
+ od.product_name,
+ SUM( od.quantity) as quantity,
+ SUM(od.compute_gross_area) as compute_gross_area,
+ od.perimeter
+ from sd.order_detail as od left join sd.order_glass_detail as ogd
+ on od.order_id=ogd.order_id and od.order_number=ogd.order_number
+ where od.order_id = #{orderId} and ogd.splitting_status=0
+ <if test="flowCard.orderDetail.orderId != null and flowCard.orderDetail.orderId != ''">
+ and od.order_id regexp #{flowCard.orderDetail.orderId}
+ </if>
+ <if test="flowCard.orderGlassDetail.productionId != null and flowCard.orderGlassDetail.productionId != ''">
+ and ogd.production_id regexp #{flowCard.orderGlassDetail.productionId}
+ </if>
+ <if test="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 != ''">
+ and od.product_name regexp #{flowCard.orderDetail.productName}
+ </if>
group by od.order_id, ogd.production_id
</select>
+ <update id="UpdateDeleteState">
+ update sd.order_glass_detail as ogd
+ set ogd.production_id=null,
+ ogd.production_time=null,
+ ogd.founder=null
+ where ogd.production_id = #{processId}
+ </update>
+
+ <!-- 鍒犻櫎娴佺▼鍗�-->
<update id="DeleteFlowCardMp">
update sd.order_detail as od left join sd.order_glass_detail as ogd
on od.order_id = ogd.order_id and od.order_number = ogd.order_number
@@ -149,16 +175,23 @@
ogd.production_time=null,
ogd.founder=null
where od.order_id = #{orderId}
- and od.product_name = #{productName}
+ and ogd.production_id = #{processId}
</update>
-<!--resultMap="flowCardMap"-->
+
+ <!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
+
+ <!--resultMap="flowCardMap"-->
<select id="SelectNoCardMp" >
+
select
+ od.order_number,
od.order_number AS 'orderNumber',
od.width,
od.height,
od.shape,
od.quantity,
+ od.compute_gross_area,
+ p.total_thickness,
od.quantity as baiscQuantity,
od.compute_gross_area as 'computeGrossArea',
p.total_thickness AS 'totalThickness',
@@ -167,25 +200,86 @@
from
sd.order_detail as od
- left join sd.order_glass_detail as ogd on od.order_id=ogd.order_id
+ left join sd.order_glass_detail as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
left join sd.product as p on od.product_name=p.product_name
- where od.order_id=#{orderId}and ogd.production_id=#{productionId}
- <if test="flowCard.orderDetail.orderNumber != null and flowCard.orderDetail.orderNumber != ''">
- and od.order_number regexp #{flowCard.orderDetail.orderNumber}
- </if>
- <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
- and od.width regexp #{flowCard.orderDetail.width}
- </if>
- <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
- and od.height regexp #{flowCard.orderDetail.height}
- </if>
- <if test="flowCard.orderDetail.shape != null and flowCard.orderDetail.shape != ''">
- and od.shape regexp #{flowCard.orderDetail.shape}
-
- </if>
+ where od.order_id=#{orderId} and ogd.production_id=#{productionId} and ogd.splitting_status=0
GROUP BY od.order_number;
</select>
+ <!--淇敼鎺掔増鐘舵��-->
+ <update id="UpdateLayoutStatusMp">
+ update flow_card as fc
+ set fc.layout_status=2
+ where fc.process_id = #{processId}
+ </update>
+
+<!-- 鏌ヨ瀵瑰簲娴佺▼鍗″彿鎺掔増鐘舵��-->
+ <select id="SelectLayoutStatus">
+ select fc.layout_status
+ from flow_card as fc
+ where fc.process_id = #{processId}
+ LIMIT 1
+ </select>
+
+<!-- 鏌ヨ鎶ュ伐琛ㄥ唴鏄惁鏈夊搴旀祦绋嬪崱-->
+ <select id="ReportingWorkCount">
+ select COUNT(rw.process_id)
+ from reporting_work as rw
+ where rw.process_id = #{processId}
+ </select>
+<!-- 鎻掑叆Flow_card琛�-->
+ <insert id="AddFlowCardMp">
+ insert into
+ flow_card (
+ order_id,
+ production_id,
+ process_id,
+ landing_sequence,
+ order_number,
+ technology_number,
+ quantity,
+ founder,
+ splitFrame_time,
+ create_time
+ )
+ select
+ ogd.order_id,
+ ogd.production_id,
+ #{processId},
+ #{landingSequence},
+ ogd.order_number,
+ ogd.technology_number,
+ #{quantity},
+ #{userName},
+ NOW(),
+ NOW()
+
+
+
+ from sd.order_glass_detail as ogd
+ where ogd.production_id=#{productionId} and ogd.order_number=#{orderNumber}
+ GROUP BY ogd.technology_number
+ </insert>
+
+<!-- 鏇存柊鍒嗘灦鐘舵��-->
+ <update id="UpdateFlowState">
+ update sd.order_glass_detail as ogd
+ set ogd.splitting_status=1
+ where ogd.production_id=#{productionId} and ogd.order_number=#{orderNumber}
+ </update>
+<!-- 鏌ヨ鏈垎鏋剁殑鏉℃暟-->
+ <select id="SelectFlowCount">
+ select COUNT(*)
+ from sd.order_glass_detail as ogd
+ where ogd.order_id = left(#{productionId},10)
+ and ogd.splitting_status = 0
+ </select>
+<!-- 淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬�-->
+ <update id="UpdateProcessingCard">
+ update sd.`order` as o
+ set o.processing_card=#{state}
+ where o.order_id=left(#{productionId},10)
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0