From 684399b665ef8c25c43faff0fdc821a0b72b39ba Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 四月 2024 14:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 396 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 353 insertions(+), 43 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 4e1c76b..3fbea0f 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,
@@ -87,10 +126,11 @@
ogd.child_width,
ogd.child_height,
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
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num as quantity,
+ fc.quantity -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
+ 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
@@ -106,13 +146,6 @@
AND odpd.order_number = fc.order_number
AND odpd.technology_number = fc.technology_number
and odpd.process_id = fc.process_id
- left join
- (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
WHERE
fc.process_id = #{processIdStr}
AND fc.technology_number = #{technologyStr}
@@ -131,11 +164,16 @@
ogd.child_width,
ogd.child_height,
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,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
+ 0,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
+ 0,
+ odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
+ 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
@@ -165,12 +203,23 @@
left join sd.order_process_detail as odpds
ON odpds.id = odpd.id-1
left join
- (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
+ (SELECT
+ sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,rw.order_sort,rw.technology_number,
+ rwk.this_process
+ from
+ rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id =rwk.reporting_work_id
+ where rwk.this_process=#{process}
+ and rw.review_status=1
+ and rw.process_id = #{processIdStr}
+ GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
and c.technology_number = fc.technology_number
+
WHERE
fc.process_id = #{processIdStr}
<if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰'">
@@ -261,7 +310,10 @@
</select>
<select id="selectGlassProcessNum" resultType="java.lang.Integer">
select
- d.reporting_work_num-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)< 0,
+ 0,
+ (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
+ )
from flow_card as a
left join sd.order_process_detail as b
on
@@ -272,16 +324,25 @@
and b.process_id = a.process_id
left join sd.order_process_detail as d
on d.id=b.id-1
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
- on
- c.process_id = a.process_id
- and c.order_sort = a.order_number
- and c.technology_number = a.technology_number
+ left join (SELECT
+ sum(rw.rework_num) as 'reworkNumSum',
+ rw.process_id,rw.order_sort,rw.technology_number,
+ rwk.this_process
+ from
+ rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id =rwk.reporting_work_id
+ where rwk.this_process=#{thisProcess}
+ and rw.review_status=1
+ and rw.process_id = SUBSTR(#{processId} from 1 for 14)
+ GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
+ on c.process_id = a.process_id
+ and c.order_sort = a.order_number
+ 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>
@@ -298,14 +359,14 @@
and b.process_id = a.process_id
left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
from patch_log
- group by reporting_work_id,order_sort,technology_number) as c
+ group by order_sort,technology_number) as c
on
c.process_id = a.process_id
and c.order_sort = a.order_number
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>
@@ -322,10 +383,13 @@
d.child_width,
d.child_height,
e.shape,
- a.completed_quantity+a.breakage_quantity as 'quantity', -- 鍙姤宸ユ暟
- a.completed_quantity as 'completedQuantity', -- 瀹屽伐鏁�
- a.breakage_quantity as 'breakageQuantity', -- 鐮存崯鏁�
- f.completed_quantity as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
+ if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
+ c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
+ ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
+ ifnull(a.completed_quantity,0) as 'completedQuantity', -- 瀹屽伐鏁�
+ ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
+ ifnull(f.completed_quantity,0) 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 +402,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,
@@ -349,13 +413,16 @@
as minQuantity -- 淇敼鏈�灏忔暟
</if>
-- e.thisQuantitySum
- from
- reporting_work_detail as a
- left join reporting_work as b
- on a.reporting_work_id = b.reporting_work_id
- left join flow_card as c
- on c.process_id = b.process_id
- and c.technology_number = a.technology_number
+ from reporting_work as b
+
+ right join flow_card as c
+ on c.process_id = b.process_id
+
+ left join reporting_work_detail as a
+ on a.reporting_work_id = b.reporting_work_id
+ and c.order_number=a.order_number
+ and c.technology_number = a.technology_number
+
left join sd.order_glass_detail as d
on d.order_id = c.order_id
and c.order_number = d.order_number
@@ -399,6 +466,249 @@
and g.order_number = a.order_number
and g.technology_number = a.technology_number
</if>
- where a.reporting_work_id = #{reportingWorkId}
+ where b.reporting_work_id = #{reportingWorkId}
+ GROUP BY c.order_number,c.technology_number
+ </select>
+<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
+ select rw.reporting_work_id,
+ (rw.reporting_work_time) as reporting_work_time,
+ o.order_id,
+ rw.process_id,
+ o.project,
+ o.batch,
+ rw.this_process,
+ rw.this_completed_quantity,
+ round(ogd.area * rw.this_completed_quantity,2) as completedArea,
+ rw.this_worn_quantity,
+ round(ogd.area * rw.this_worn_quantity,2) as wornArea,
+ rw.device_name,
+ rw.teams_groups_name,
+ rw.reviewed_state
+ # (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
+ 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 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
+ where rw.reviewed_state != 2
+ 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}
+ </if>
+ <if test="reportingWork.orderId != null and reportingWork.orderId != ''">
+ and o.order_id regexp #{reportingWork.orderId}
+ </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.batch != null and reportingWork.order.batch != ''">
+ and o.batch regexp #{reportingWork.order.batch}
+ </if>
+ <if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
+ and rw.this_process regexp #{reportingWork.thisProcess}
+ </if>
+ GROUP BY rw.reporting_work_id
+ ORDER BY rw.reporting_work_id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getPageTotal">
+ 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 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
+ where rw.reviewed_state != 2
+ and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
+ and rw.reviewed_state!=-1
+ ORDER BY rw.reporting_work_id desc
+ limit #{offset},#{pageSize};
+ </select>
+<!-- 鏍规嵁鎶ュ伐缂栧彿鏌ヨ涓嬪伐搴�-->
+ <select id="selectNextProcess">
+ select next_process from reporting_work where reporting_work_id=#{reportingWorkId}
+ </select>
+<!-- 鏌ヨ涓嬪伐搴忔槸鍚︽姤宸�-->
+ <select id="selectCountByProcessId">
+ select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
+ </select>
+
+<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
+ <select id="reportingWorkDate">
+ select rw.process_id,
+ rwd.order_number,
+ rwd.technology_number,
+ rwd.completed_quantity,
+ IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
+ from reporting_work as rw
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
+ left join damage_details as dd
+ on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
+ dd.technology_number = rwd.technology_number
+ where rw.reporting_work_id = #{reportingWorkId}
+ GROUP BY rwd.order_number, rwd.technology_number
+ </select>
+
+<!-- 淇敼鎶ュ伐娴佺▼鍗¤〃鏁版嵁-->
+ <update id="updateWorkProcess">
+ update sd.order_process_detail
+ set reporting_work_num_count=reporting_work_num_count - #{completedQuantity},
+ reporting_work_num=reporting_work_num - #{completedQuantity},
+ broken_num=broken_num - #{breakageQuantity}
+ where process_id = #{processId}
+ and order_number = #{orderNumber}
+ and technology_number = #{technologyNumber}
+ and process = #{thisProcess}
+ </update>
+
+<!-- 鍒犻櫎鎶ュ伐-->
+ <update id="deleteWork">
+ update reporting_work set reviewed_state=-1
+ where reporting_work_id = #{reportingWorkId}
+ </update>
+<!-- 鑾峰彇鏈�鍚庝竴閬撳伐搴�-->
+ <select id="selectLastProcess">
+ select process
+ from sd.order_process_detail
+ where process_id = #{processId}
+ and technology_number = 1
+ order by id desc
+ LIMIT 1
+ </select>
+<!-- 鏌ヨ鍙叆搴撱�佸凡鍏ュ簱鏁伴噺-->
+ <select id="selectReceiptQuantity">
+ select ifnull(SUM(quantity),0) as quantity,
+ ifnull(SUM(inventory_quantity), 0) as inventoryQuantity,
+ ifnull(SUM(received_quantity), 0) as receivedQuantity
+ from flow_card
+ where process_id = #{processId}
+ and technology_number = 1
+ GROUP BY process_id
+ </select>
+<!-- 鏌ヨ鎶ュ伐缂栧彿瀹屽伐鏁伴噺-->
+ <select id="selectCompletedQuantity">
+ select ifnull(this_completed_quantity,0) from reporting_work where reporting_work_id=#{reportingWorkId}
+ </select>
+<!-- 鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺-->
+ <update id="updateInventoryQuantity">
+ update flow_card
+ set inventory_quantity = inventory_quantity - #{completedQuantity}
+ where process_id = #{processId}
+ 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