From ff756f0d4f7eaac1fdb112dcd00d4d07528b83bc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 11 七月 2024 13:29:38 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml | 136 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 136 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
new file mode 100644
index 0000000..3d45806
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--杩斿伐鏁版嵁-->
+
+<mapper namespace="com.example.erp.mapper.pp.ReworkMapper">
+
+
+
+ <!--鑾峰彇杩斿伐鏁版嵁-->
+ <select id="SelectRework" >
+ select
+ r.id,
+ r.review_status,
+ r.rework_team,
+ r.rework_id,
+ r.process_id,
+ r.order_id,
+ r.order_sort,
+ o.project,
+ o.batch,
+ od.product_name,
+ r.technology_number,
+ ogd.glass_address,
+ r.rework_num,
+ od.width,
+ od.height,
+ od.shape,
+ r.rework_type,
+ r.rework_reason,
+ r.responsible_team,
+ r.responsible_personnel,
+ r.responsible_equipment,
+ r.rework_area,
+ r.quality_inspector,
+ r.rework_processes,
+ r.reviewer,
+ date(r.create_time) as create_time,
+ date(r.update_time) as update_time
+ from pp.rework r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
+ left join sd.`order` o on r.order_id = o.order_id
+ left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
+ on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
+ <where>
+ date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
+ </where>
+ order by r.review_status,r.id desc limit #{offset},#{pageSize};
+ </select>
+
+ <select id="SelectReworkPageTotal" >
+ select CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
+ count(zu.id) as 'total'
+ from (select r.id as id
+ from pp.rework r
+ left join sd.order_detail od on r.order_id = od.order_id and r.order_sort = od.order_number
+ left join sd.`order` o on r.order_id = o.order_id
+ left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
+ on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
+ <where>
+ date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
+ </where>
+ ) as zu
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectRework">
+ select o.order_id as orderId,
+ dd.reporting_work_id as reportingWorkId,
+ rw.process_id as processId,
+ o.project,
+ o.batch,
+ dd.id as reviewer,
+ dd.order_number as orderSort,
+ od.product_name as productName,
+ dd.technology_number as technologyNumber,
+ ogd.glass_address as glassAddress,
+ dd.breakage_quantity-dd.quantity as reworkNum,
+ od.width,
+ od.height,
+ od.shape,
+ dd.breakage_quantity-dd.quantity as breakageQuantity,
+ dd.return_process as reworkProcesses,
+ dd.breakage_reason as reworkReason,
+ dd.breakage_type as reworkType,
+ dd.responsible_personnel as responsiblePersonnel,
+ dd.responsible_equipment as responsibleEquipment,
+ dd.responsible_team as responsibleTeam,
+ ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
+ rw.quality_inspector as qualityInspector
+ from pp.damage_details dd
+ left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number
+ and dd.technology_number=rwd.technology_number and rwd.review_status>0
+ left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
+
+ left join sd.`order` o on rw.order_id = o.order_id
+ left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
+ left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
+ on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
+
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
+ </select>
+
+
+ <select id="getMaximum" >
+ select count(*) from pp.rework where date(create_time)=CURDATE()
+ </select>
+
+ <select id="getMaxFlowCard" >
+ select count(*) from pp.flow_card where project_no=#{processId}
+ </select>
+
+ <insert id="insertRework" useGeneratedKeys="true" >
+ insert into pp.rework(rework_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
+ responsible_personnel, rework_type, rework_reason, rework_processes, rework_num,
+ rework_area, rework_team,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
+ values (
+ #{oddNumber}, #{rework.reportingWorkId},#{rework.processId},#{rework.orderId},#{rework.orderSort},#{rework.technologyNumber},#{rework.responsibleTeam},
+ #{rework.responsiblePersonnel},#{rework.reworkType},#{rework.reworkReason},#{rework.reworkProcesses},#{rework.reworkNum},
+ #{rework.reworkArea},#{rework.reworkTeam},#{rework.responsibleEquipment},#{rework.qualityInspector},'',0,now()
+ )
+ </insert>
+
+ <update id="updateRework" >
+ update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
+ </update>
+
+ <update id="updateDamageDetails" >
+ update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
+ </update>
+
+
+
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0