From 9300dcfd41580d3599743b07b75bc4118ce7eaa0 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 22 Jul 2024 17:47:47 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/production/entity/SfdcCancel.java | 4 ++++ .../entity/ShopOrderRoutingData.java | 19 ++++++++++++++++++- .../mapper/production/AbnormalMapper.xml | 6 ++++++ .../mapper/production/DailyPlanMapper.xml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java index 5ccc84e..9109876 100644 --- a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java +++ b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java @@ -58,4 +58,8 @@ public class SfdcCancel { private String scrapRemark; private String userName; private String repairSOFlag; + + private Double csysScrapRate; + + private Double scrapRate; } diff --git a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java index f86a7bb..aaf16e8 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java +++ b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java @@ -68,7 +68,8 @@ public class ShopOrderRoutingData extends ShopOrderData{ private String userId; private String equipment; private String materialSplitFlag; - + private String liuHuaShiJian; + private String yangHuaJiType; public String getMaterialSplitFlag() { return materialSplitFlag; } @@ -369,4 +370,20 @@ public class ShopOrderRoutingData extends ShopOrderData{ public void setEquipment(String equipment) { this.equipment = equipment; } + + public String getLiuHuaShiJian() { + return liuHuaShiJian; + } + + public void setLiuHuaShiJian(String liuHuaShiJian) { + this.liuHuaShiJian = liuHuaShiJian; + } + + public String getYangHuaJiType() { + return yangHuaJiType; + } + + public void setYangHuaJiType(String yangHuaJiType) { + this.yangHuaJiType = yangHuaJiType; + } } diff --git a/src/main/resources/mapper/production/AbnormalMapper.xml b/src/main/resources/mapper/production/AbnormalMapper.xml index da9d275..07351da 100644 --- a/src/main/resources/mapper/production/AbnormalMapper.xml +++ b/src/main/resources/mapper/production/AbnormalMapper.xml @@ -39,6 +39,12 @@ AND a.Status = #{status} + + + AND dbo.Get_Part_SpecDesc(sos.site,sos.PartNo) like #{partDesc} + + + AND dbo.Get_OperatorDesc(a.Site,sos.operatorId) like #{operatorDesc} AND a.FeedbackDate >= #{startDate} diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 16dcd59..6774926 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -301,7 +301,7 @@ P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime, S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight, dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate - ,a.comBineTime lastStartDate + ,a.comBineTime lastStartDate,dbo.Get_PartValue( a.site,a.PartNo,'TIME') liuHuaShiJian,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') yangHuaJiType FROM SOTaskOrderHeader a LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1 @@ -1043,6 +1043,7 @@ a.AssJobSeqNo,a.Scheduled_ResourceId ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag ,a.reportWeight,a.approveWeight,a.moldQty,a.stopTime,dbo.Get_Part_SpecDesc(a.site,b.partNo) partSpec,dbo.Get_Part_SpecDesc(a.site,b.partNo) PartDesc,wasteWeight,b.jobType, f.Remark as scrapRemark,f.DefectQty as scrapQty,g.Remark as acceptRemark,g.DefectQty as acceptQty,b.RepairSOFlag + ,a.c_sys_scrap_rate as csysScrapRate,case when a.ReportQty!=0 then Round((a.ReportQty-a.ApproveQty)*100/a.ReportQty,2) else 0 end as scrapRate from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID left join WorkCenterResource e on a.Site=e.Site and a.Scheduled_ResourceId =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo