From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 159 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index b57fba7..2e3409b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -11,10 +11,27 @@
<result property="thisProcess" column="this_process"/>
<result property="reviewedState" column="reviewed_state"/>
<result property="previousProcessQuantity" column="previous_process_quantity"/>
+ <result property="reportingWorkTime" column="reporting_work_time"/>
+ <result property="thisCompletedQuantity" column="this_completed_quantity"/>
+ <result property="thisWornQuantity" column="this_worn_quantity"/>
+ <result property="deviceName" column="device_name"/>
+ <result property="teamsGroupsName" column="teams_groups_name"/>
+ <result property="reviewedState" column="reviewed_state"/>
+ <result property="reportingWorkId" column="reporting_work_id"/>
+ <result property="processId" column="process_id"/>
+ <result property="completedArea" column="completedArea"/>
+ <result property="wornArea" column="wornArea"/>
+ <result property="qualityInspector" column="quality_inspector"/>
+ <result property="qualityInsTime" column="quality_ins_time"/>
+
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
<result property="customerName" column="customer_name"/>
<result property="project" column="project"/>
+ <result property="batch" column="batch"/>
+ </association>
+ <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
+ <result property="shape" column="shape"/>
</association>
<association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
<result property="orderId" column="order_id"/>
@@ -22,10 +39,32 @@
</association>
<association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
<result property="completedQuantity" column="completed_quantity"/>
+ <result property="orderNumber" column="order_number"/>
+ <result property="technologyNumber" column="technology_number"/>
+ </association>
+ <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
+ <result property="area" column="area"/>
+ <result property="glassChild" column="glass_child"/>
+ <result property="glassAddress" column="glass_address"/>
+ <result property="childWidth" column="child_width"/>
+ <result property="childHeight" column="child_height"/>
+ </association>
+ <association property="damageDetails" javaType="com.example.erp.entity.pp.DamageDetails">
+ <result property="qualityInsStatus" column="quality_ins_status"/>
+ <result property="breakageQuantity" column="breakage_quantity"/>
+ <result property="available" column="available"/>
+ <result property="returnProcess" column="return_process"/>
+ <result property="breakageType" column="breakage_type"/>
+ <result property="breakageReason" column="breakage_reason"/>
+ <result property="responsibleEquipment" column="responsible_equipment"/>
+ <result property="responsibleProcess" column="responsible_process"/>
+ <result property="responsibleTeam" column="responsible_team"/>
+ <result property="responsiblePersonnel" column="responsible_personnel"/>
</association>
</resultMap>
+<!-- 鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�-->
<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
select o.order_id,
fc.production_id,
@@ -89,8 +128,9 @@
od.shape,
fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as quantity,
fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as completedQuantity,
- odpd.reporting_work_num_count as completed,
- odpd.broken_num as onceBroken
+ odpd.reporting_work_num as completed,
+ odpd.broken_num as onceBroken,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -133,9 +173,10 @@
od.shape,
odpds.reporting_work_num -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as quantity,
odpds.reporting_work_num -odpd.reporting_work_num -odpd.broken_num + ifnull(c.patchNumSum,0) as completedQuantity,
- odpd.reporting_work_num_count as completed,
+ odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
- ogd.`group`
+ ogd.`group`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
FROM
@@ -281,7 +322,7 @@
and c.technology_number = a.technology_number
where
- a.process_id=SUBSTR(#{processId} from 1 for 13)
+ a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
and a.technology_number = #{technologyNumber}
</select>
@@ -305,7 +346,7 @@
and c.technology_number = a.technology_number
where
- a.process_id=SUBSTR(#{processId} from 1 for 13)
+ a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
and a.technology_number = #{technologyNumber}
</select>
@@ -326,6 +367,7 @@
a.completed_quantity as 'completedQuantity', -- 瀹屽伐鏁�
a.breakage_quantity as 'breakageQuantity', -- 鐮存崯鏁�
f.completed_quantity as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
+ if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
if((f.completed_quantity
@@ -338,8 +380,8 @@
) as minQuantity -- 淇敼鏈�灏忔暟
</if>
<if test="nextProcess == null or nextProcess == ''"> -- 鏈�鍚庝竴閬撳伐搴�
- c.received_quantity, -- 宸插叆搴撴暟閲�
- c.inventory_quantity, -- 搴撳瓨鏁伴噺
+# c.received_quantity, -- 宸插叆搴撴暟閲�
+# c.inventory_quantity, -- 搴撳瓨鏁伴噺
if(ifnull(inventory_quantity,0)
-ifnull(c.received_quantity,0)
>= a.completed_quantity,0,
@@ -410,9 +452,9 @@
o.batch,
rw.this_process,
rw.this_completed_quantity,
- (ogd.area * rw.this_completed_quantity) as completedArea,
+ round(ogd.area * rw.this_completed_quantity,2) as completedArea,
rw.this_worn_quantity,
- (ogd.area * rw.this_worn_quantity) as wornArea,
+ round(ogd.area * rw.this_worn_quantity,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
rw.reviewed_state
@@ -424,7 +466,8 @@
on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
rwd.technology_number = ogd.technology_number
where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
+ and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
<if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
@@ -538,4 +581,109 @@
and order_number = #{orderNumber}
and technology_number = #{technologyNumber}
</update>
+<!-- 璐ㄦ瀹℃牳鏌ヨ-->
+ <select id="selectQualityTestingMp" resultMap="reportingWorkMap">
+ select rw.reporting_work_id,
+ rw.reporting_work_time,
+ rw.process_id,
+ o.project,
+ o.customer_name,
+ rw.this_process,
+ ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
+ rw.this_worn_quantity,
+ rw.teams_groups_name,
+ rw.device_name,
+ rw.previous_process,
+ rw.next_process,
+ rw.quality_inspector,
+ rw.quality_ins_time,
+ dd.quality_ins_status
+ from sd.order as o
+ left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
+ left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
+
+ left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
+ where rw.reviewed_state != 2
+ and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and position(#{processId} in rw.process_id)
+ and position(#{state} in dd.quality_ins_status)
+ and rw.reviewed_state!=-1
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.customerName != null and reportingWork.order.customerName != ''">
+ and o.customer_name regexp #{reportingWork.order.customerName}
+ </if>
+ GROUP BY rw.reporting_work_id
+ ORDER BY rw.reporting_work_id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getQualityPageTotal" >
+ select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
+ count(distinct rw.reporting_work_id) as 'total'
+ from sd.order as o
+ left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
+ left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
+
+ left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
+ where rw.reviewed_state != 2
+ and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ and position(#{processId} in rw.process_id)
+ and position(#{state} in dd.quality_ins_status)
+ and rw.reviewed_state!=-1
+ ORDER BY rw.reporting_work_id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+<!-- 淇敼璐ㄦ鐘舵��-->
+ <update id="updateQualityStatusMp">
+ update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
+ set dd.quality_ins_status = 2,
+ rw.quality_inspector=#{username},
+ rw.examine_time=NOW()
+ where rw.reporting_work_id = #{reportingWorkId}
+ </update>
+
+<!-- 璐ㄦ鏄庣粏鏌ヨ-->
+ <select id="detailsQualityMp">
+ select rwd.order_number,
+ ogd.glass_child,
+ rwd.technology_number,
+ ogd.glass_address,
+ ogd.child_width,
+ ogd.child_height,
+ ifnull(od.shape,'') as shape,
+ rwd.completed_quantity,
+ dd.breakage_quantity,
+ dd.available,
+ ifnull(dd.return_process,'') as return_process,
+ dd.breakage_type,
+ dd.breakage_reason,
+ dd.responsible_equipment,
+ dd.responsible_process,
+ dd.responsible_team,
+ ifnull(dd.responsible_personnel,'') as responsible_personnel
+ from sd.order_detail as od
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = od.order_id and ogd.order_number = od.order_number
+ left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
+ left join reporting_work_detail as rwd
+ on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
+ rwd.technology_number = ogd.technology_number
+ left join damage_details as dd
+ on dd.reporting_work_id = rw.reporting_work_id and dd.order_number = rwd.order_number and
+ dd.technology_number = rwd.technology_number
+ where rw.reviewed_state != 2
+ and rw.reporting_work_id = #{reportingWorkId}
+ and rw.reviewed_state != -1
+ GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
+ ORDER BY rwd.order_number
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0