From 5ab2c5b40c4e9851372716e77efbecc3d22237e8 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 20 Aug 2024 09:19:41 +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/ShopOrderRoutingData.java | 9 +++++++++ src/main/resources/mapper/production/DailyPlanMapper.xml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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 aaf16e8..370706e 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java +++ b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java @@ -16,6 +16,7 @@ public class ShopOrderRoutingData extends ShopOrderData{ private float machRunFactor; private String factorUnitDB; private String factorUnit; + private String cuiHuaJi; private float qtyRequired; private float qtyReported; private float qtyApprove; @@ -386,4 +387,12 @@ public class ShopOrderRoutingData extends ShopOrderData{ public void setYangHuaJiType(String yangHuaJiType) { this.yangHuaJiType = yangHuaJiType; } + + public String getCuiHuaJi() { + return cuiHuaJi; + } + + public void setCuiHuaJi(String cuiHuaJi) { + this.cuiHuaJi = cuiHuaJi; + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index ff0cb21..e4e844a 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -231,7 +231,7 @@ P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime, S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor, Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate, - dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty + dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi FROM ShopOrder 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.orderNo @@ -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,dbo.Get_PartValue( a.site,a.PartNo,'TIME') liuHuaShiJian,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') yangHuaJiType + ,a.comBineTime lastStartDate,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,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