产品产量汇总表 釉料关联更改 与产品跟踪表一致

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -5544,14 +5544,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 											  ,g.GoodsCode
 											  ,g.GOODSSPECIFICATION
 											  ,d.Dictionaryvalue
-											  ,count(BarCode) as pfcount         
+											  ,count(PD.BarCode) as pfcount         
 															 from TP_PM_ProductionData pd
-												LEFT JOIN TP_PC_GROUTINGLINE gl on 	gl.GROUTINGLINEID=pd.GROUTINGLINEID
+										 LEFT JOIN Tp_Pm_Groutingdailydetail GP on GP.BARCODE=pd.BARCODE
+										 LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=pd.GROUTINGLINEID
 										 inner join tp_pc_Procedure p  on p.Procedureid = pd.Procedureid
 										 inner join TP_MST_Goods g  on g.GoodsID = pd.GoodsID
 										 inner join TP_MST_GoodsType gt  on gt.GoodsTypeID = g.GoodsTypeID
 										 inner join TP_MST_Organization org  on org.OrganizationID = pd.OrganizationID
-										 inner join TP_MST_DATADICTIONARY d  on d.DICTIONARYID = g.GLAZETYPEID
+										 inner join TP_MST_DATADICTIONARY d  on d.DICTIONARYID = GP.Glazetypeid
 										 where pd.ValueFlag = '1'
 										   and pd.AccountID = :AccountID ";
 
@@ -5790,10 +5791,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 									decode( tp_mst_logo.logoid, NULL, '', TP_MST_Logo.Logoname || '[' || TP_MST_Logo.Logocode || ']' ) AS LogoCodeName 
 								FROM
 									TP_PM_ProductionData
+									LEFT JOIN Tp_Pm_Groutingdailydetail GP ON GP.BarCode =TP_PM_ProductionData.BarCode
 									LEFT JOIN TP_MST_Goods ON TP_MST_Goods.GoodsID = TP_PM_ProductionData.GoodsID
 									LEFT JOIN TP_MST_GoodsType ON TP_MST_GoodsType.GoodsTypeID = TP_MST_Goods.GoodsTypeID
 									LEFT JOIN TP_MST_Organization ON TP_MST_Organization.OrganizationID = TP_PM_ProductionData.OrganizationID
-									LEFT JOIN TP_MST_DATADICTIONARY ON TP_MST_DATADICTIONARY.DICTIONARYID = TP_MST_Goods.GLAZETYPEID
+									LEFT JOIN TP_MST_DATADICTIONARY ON TP_MST_DATADICTIONARY.DICTIONARYID = GP.Glazetypeid
 									LEFT JOIN tp_mst_user cu ON TP_PM_ProductionData.createuserid = cu.userid
 									LEFT JOIN TP_PM_GroutingDailyDetail gdd ON gdd.Groutingdailydetailid = TP_PM_ProductionData.Groutingdailydetailid
 									LEFT JOIN tp_mst_logo ON gdd.logoid = tp_mst_logo.logoid