From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 636 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 589 insertions(+), 47 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 17ef576..8d19a0f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -9,36 +9,82 @@
<result property="previousProcess" column="previous_process"/>
<result property="nextProcess" column="next_process"/>
<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"/>
<result property="productionId" column="production_id"/>
- <result property="quantity" column="quantity"/>
</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,
o.customer_id,
o.customer_name,
o.project,
- SUM(fc.quantity) as quantity,
+ SUM(fc.quantity) as previous_process_quantity,
#{previousProcess} as previous_process,
#{nextProcess} as next_process,
- #{process} as this_process
+ #{process} as this_process,
+ ifnull((rw.reviewed_state),1) as reviewed_state -- 涓嬪伐搴忓鏍哥姸鎬�
from sd.order as o
- left join flow_card as fc on fc.order_id = o.order_id
+ left join flow_card as fc on fc.order_id = o.order_id
+ left join (select if(count(reviewed_state)>0 and process_id=null,1,0) as reviewed_state ,
+ process_id
+ from reporting_work
+ where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}) as rw
+ on rw.process_id = fc.process_id
where fc.process_id = #{processIdStr}
- and position(fc.technology_number in #{technologyStr})
+ and fc.technology_number = #{technologyStr}
GROUP BY fc.process_id
</select>
@@ -80,63 +126,116 @@
ogd.child_width,
ogd.child_height,
od.shape,
- fc.quantity - IFNULL(fc.number_patches,0)-IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0)
- as quantity
+ 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 ON od.order_id = ogd.order_id
- AND od.order_number = ogd.order_number
- LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id and fc.production_id=ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join reporting_work as rw on rw.order_id=fc.order_id and rw.production_id=fc.production_id and rw.process_id=fc.process_id
- left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id and rwd.order_number=fc.order_number and rwd.technology_number=fc.technology_number
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
WHERE
fc.process_id = #{processIdStr}
- AND position(
- fc.technology_number IN #{technologyStr})
-
+ AND fc.technology_number = #{technologyStr}
+ AND odpd.process = #{process}
order by fc.order_number
</select>
<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
<select id="SelectReworlDetailMp">
- SELECT fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity as quantity_card,
- ogd.child_width,
- ogd.child_height,
- od.shape,
- reportingwork_num -IFNULL(rwd.completed_quantity,0)-IFNULL(rwd.breakage_quantity,0)-IFNULL((rwd.wait_rework_quantity),0) as quantity
- 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
- left join sd.order_process_detail as opd
- on opd.order_id = ogd.order_id and opd.order_number = ogd.order_number and
- opd.technology_number = ogd.technology_number
+ SELECT
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
+ od.shape,
+ 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`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- left join flow_card as fc on opd.order_id = fc.order_id and opd.order_number = fc.order_number and
- opd.technology_number = fc.technology_number
- left join reporting_work as rw on rw.order_id=fc.order_id and
- rw.production_id=fc.production_id and rw.process_id=fc.process_id and rw.this_process = #{previousProcess}
- left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id and
- rwd.order_number=fc.order_number and rwd.technology_number=fc.technology_number
- where fc.process_id = #{processIdStr}
- and opd.process = #{previousProcess}
- and position(ogd.technology_number in #{technologyStr})
+ 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
+ <if test="process == '澶硅兌'">
+ AND ogd.`group` = (select `group`
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and technology_number =#{technologyStr}
+ limit 1)
+ </if>
+
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id-1
+ left join
+ (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 != '鍖呰'">
+ AND fc.technology_number = #{technologyStr}
+ </if>
+ AND odpd.process = #{process}
order by fc.order_number
</select>
<select id="SelectProcessMp">
- select * from sd.basic_data where basic_type="product" and basic_category="process"
+ select * from sd.basic_data where basic_type='product' and basic_category='process'
</select>
<select id="historyProcessMp">
- select ifnull(GROUP_CONCAT(distinct rw.this_process),"") from reporting_work as rw where rw.process_id=#{processIdStr}
+ select ifnull(GROUP_CONCAT(distinct rw.this_process),'') from reporting_work as rw where rw.process_id=#{processIdStr}
</select>
<select id="historyDeviceMp">
@@ -149,8 +248,8 @@
sd.basic_data AS bd
LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
WHERE
- bd.basic_category = "process"
- AND bdp.basic_type = "device"
+ bd.basic_category = 'process'
+ AND bdp.basic_type = 'device'
AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
</select>
@@ -159,14 +258,457 @@
bdp.id,
bdp.basic_type,
bdp.basic_name,
+ bd.basic_name,bd.id AS basic_category,
+ rw.process
+ FROM
+ sd.basic_data AS bd
+ LEFT JOIN `basic_data_produce` AS bdp
+ ON bd.id = bdp.basic_category
+ right join (
+ select distinct process from
+ ( select distinct rw.this_process as process
+ from reporting_work as rw where rw.process_id=#{processIdStr}
+ UNION
+ select #{process}
+ ) as t
+ ) as rw
+ on rw.process=bd.basic_name
+ WHERE
+ bdp.basic_type = 'teamsgroups'
+ </select>
+
+ <select id="SelectHistoryProcessMp">
+ SELECT
+ distinct
bd.basic_name AS basic_category
FROM
sd.basic_data AS bd
LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
WHERE
- bd.basic_category = "process"
- AND bdp.basic_type = "teamsgroups"
+ bd.basic_category = 'process'
+ AND bdp.basic_type = 'teamsgroups'
AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
</select>
+ <select id="selectBasicNameByType">
+ select * from `basic_data_produce` as a where a.basic_type = #{type}
+ </select>
+
+ <select id="selectMaxReportingWorkId">
+ select
+ ifnull(SUBSTR(max(reporting_work_id) from 9),0)
+ from
+ reporting_work as a
+ where
+ date(a.create_time) = curdate()
+ order by id desc,reporting_work_id desc limit 1
+ </select>
+
+ <!-- 鏌ヨ娴佺▼鍗″伐搴忔姤宸ュ彲鎶ユ暟閲�-->
+ <select id="selectReportingWorkNum">
+
+ </select>
+ <select id="selectGlassProcessNum" resultType="java.lang.Integer">
+ select
+ 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
+ b.order_number = a.order_number
+ and b.technology_number = a.technology_number
+ and b.order_id = SUBSTR(#{processId} from 1 for 10)
+ and b.process = #{thisProcess}
+ 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(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 14)
+ and a.order_number = #{orderNumber}
+ and a.technology_number = #{technologyNumber}
+ </select>
+ <select id="selectFlowCardNum" resultType="java.lang.Integer">
+ select
+ a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
+ from flow_card as a
+ left join sd.order_process_detail as b
+ on
+ b.order_number = a.order_number
+ and b.technology_number = a.technology_number
+ and b.order_id = SUBSTR(#{processId} from 1 for 10)
+ and b.process = #{thisProcess}
+ 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
+ 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 14)
+ and a.order_number = #{orderNumber}
+ and a.technology_number = #{technologyNumber}
+ </select>
+
+<!--鏌ヨ淇敼鎶ュ伐鏄庣粏鏁版嵁-->
+ <select id="selectByReportingWorkId" >
+ select
+ a.reporting_work_id,
+ d.order_number,
+ d.glass_child,
+ d.technology_number,
+ d.glass_address,
+ c.quantity as quantity_card,
+ d.child_width,
+ d.child_height,
+ e.shape,
+ 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
+ -ifnull(g.completed_quantity,0))
+ >=
+ a.completed_quantity,
+ 0,
+ (a.completed_quantity-f.completed_quantity
+ +ifnull(g.completed_quantity,0))
+ ) as minQuantity -- 淇敼鏈�灏忔暟
+ </if>
+ <if test="nextProcess == null or nextProcess == ''"> -- 鏈�鍚庝竴閬撳伐搴�
+# c.received_quantity, -- 宸插叆搴撴暟閲�
+# c.inventory_quantity, -- 搴撳瓨鏁伴噺
+ if(ifnull(inventory_quantity,0)
+ -ifnull(c.received_quantity,0)
+ >= a.completed_quantity,0,
+ (a.completed_quantity-(ifnull(c.inventory_quantity,0)
+ -ifnull(c.received_quantity,0)))
+ )
+ as minQuantity -- 淇敼鏈�灏忔暟
+ </if>
+ -- e.thisQuantitySum
+ 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
+ and d.technology_number = c.technology_number
+ left join sd.order_detail as e
+ on e.order_id = d.order_id and e.order_number = d.order_number
+
+ left join (select sum(completed_quantity) as completed_quantity ,
+ rw.process_id,
+ rwd.order_number,
+ rwd.technology_number,
+ rw.this_process
+ from reporting_work as rw
+ left join reporting_work_detail as rwd
+ on rw.reporting_work_id = rwd.reporting_work_id
+ group by rw.process_id,
+ rw.this_process,
+ rwd.order_number,
+ rwd.technology_number
+ ) as f
+ on f.process_id = b.process_id
+ and f.this_process = b.this_process
+ and f.order_number = a.order_number
+ and f.technology_number = a.technology_number
+ <if test="nextProcess != null and nextProcess != ''">
+ left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
+ rw.process_id,
+ rwd.order_number,
+ rwd.technology_number,
+ rw.this_process
+ from reporting_work as rw
+ left join reporting_work_detail as rwd
+ on rw.reporting_work_id = rwd.reporting_work_id
+ group by rw.process_id,
+ rw.this_process,
+ rwd.order_number,
+ rwd.technology_number
+ ) as g
+ on g.process_id = b.process_id
+ and g.this_process = b.next_process
+ and g.order_number = a.order_number
+ and g.technology_number = a.technology_number
+ </if>
+ where b.reporting_work_id = #{reportingWorkId}
+ GROUP BY c.order_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