半成品库存表：型号变更后，期初期末对不上

wwwroot/mes/rpt/rpt309/rpt.ashx

@@ -28,15 +28,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			{
 				//读取报表数据
 				sqlStr = @"WITH 期初 AS (
-							SELECT  TP_PM_INPRODUCTION_BAKBYMONTH.GOODSCODE ,TP_MST_GOODS.GOODSNAME,
+							SELECT  TP_MST_GOODS.GOODSCODE ,TP_MST_GOODS.GOODSNAME,
 							TP_MST_GOODS.GOODSSPECIFICATION,
 							COUNT(DISTINCT BARCODE) AS 期初
 							FROM TP_PM_INPRODUCTION_BAKBYMONTH
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_INPRODUCTION_BAKBYMONTH.GOODSCODE
+							inner join TP_PM_GROUTINGDAILYDETAIL ON TP_PM_GROUTINGDAILYDETAIL.GROUTINGDAILYDETAILID = TP_PM_INPRODUCTION_BAKBYMONTH.GROUTINGDAILYDETAILID
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_INPRODUCTION_BAKBYMONTH.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID=TP_PM_GROUTINGDAILYDETAIL.GOODSID
 							WHERE PROCEDUREID=7
 							AND BACKUPMONTH =@DATEBEGIN@
-							AND TP_MST_GOODS.VALUEFLAG=1
-							GROUP BY TP_PM_INPRODUCTION_BAKBYMONTH.GOODSCODE,TP_MST_GOODS.GOODSNAME,
+							--AND TP_MST_GOODS.VALUEFLAG=1
+							GROUP BY TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,
 							TP_MST_GOODS.GOODSSPECIFICATION
 							),
 							转入 AS (
@@ -50,7 +52,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							COUNT( CASE WHEN TP_PC_GROUTINGLINE.GROUTINGLINECODE='01' THEN BARCODE ELSE NULL END ) AS 补码入,
 							COUNT( BARCODE ) AS 转入
 							FROM TP_PM_PRODUCTIONDATA
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID =TP_PM_PRODUCTIONDATA.GOODSID
 							LEFT JOIN TP_PC_GROUTINGLINE ON TP_PC_GROUTINGLINE.GROUTINGLINECODE=TP_PM_PRODUCTIONDATA.GROUTINGLINECODE
 							WHERE TP_PM_PRODUCTIONDATA.CREATETIME>=@DATEBEGIN@ AND TP_PM_PRODUCTIONDATA.CREATETIME<=@DATEEND@  
 							AND TP_PM_PRODUCTIONDATA.PROCEDUREID=7
@@ -61,7 +64,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION, 
 							COUNT( BARCODE ) AS 转入取消 
 							FROM TP_PM_PRODUCTIONDATA
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID =TP_PM_PRODUCTIONDATA.GOODSID
 							LEFT JOIN TP_PC_GROUTINGLINE ON TP_PC_GROUTINGLINE.GROUTINGLINECODE=TP_PM_PRODUCTIONDATA.GROUTINGLINECODE
 							WHERE TP_PM_PRODUCTIONDATA.backouttime>=@DATEBEGIN@ AND TP_PM_PRODUCTIONDATA.backouttime<=@DATEEND@  
 							AND TP_PM_PRODUCTIONDATA.PROCEDUREID = 7
@@ -72,7 +76,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION, 
 							COUNT( BARCODE ) AS 实时转入
 							FROM TP_PM_PRODUCTIONDATA
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE =TP_PM_PRODUCTIONDATA.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID =TP_PM_PRODUCTIONDATA.GOODSID
 							LEFT JOIN TP_PC_GROUTINGLINE ON TP_PC_GROUTINGLINE.GROUTINGLINECODE=TP_PM_PRODUCTIONDATA.GROUTINGLINECODE
 							WHERE TP_PM_PRODUCTIONDATA.CREATETIME>=@DATEBEGIN@ AND TP_PM_PRODUCTIONDATA.CREATETIME<=@DATEEND@  
 							AND TP_PM_PRODUCTIONDATA.PROCEDUREID=7  AND tp_pm_productiondata.valueflag = 1
@@ -98,7 +103,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								SUM( CASE WHEN PROCEDUREID IN ( 7) THEN 1 ELSE 0 END ) 库内损坯
 							FROM
 								TP_PM_SCRAPPRODUCT 
-								LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_SCRAPPRODUCT.GOODSCODE
+								--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_SCRAPPRODUCT.GOODSCODE
+								LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID=TP_PM_SCRAPPRODUCT.GOODSID
 							  WHERE TP_PM_SCRAPPRODUCT.CREATETIME>=@DATEBEGIN@ AND TP_PM_SCRAPPRODUCT.CREATETIME<=@DATEEND@
 								AND TP_PM_SCRAPPRODUCT.GOODSLEVELTYPEID = 8 
 							GROUP BY TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION
@@ -109,7 +115,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								SUM( CASE WHEN PROCEDUREID IN ( 7) THEN 1 ELSE 0 END ) 库内损坯取消
 							FROM
 								TP_PM_SCRAPPRODUCT 
-								LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_SCRAPPRODUCT.GOODSCODE
+								--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_SCRAPPRODUCT.GOODSCODE
+								LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID=TP_PM_SCRAPPRODUCT.GOODSID
 							  WHERE TP_PM_SCRAPPRODUCT.BACKOUTTIME>=@DATEBEGIN@ AND TP_PM_SCRAPPRODUCT.BACKOUTTIME<=@DATEEND@
 								AND TP_PM_SCRAPPRODUCT.GOODSLEVELTYPEID = 8 
 							GROUP BY TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION
@@ -128,7 +135,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION,
 							COUNT(1) AS 转出
 							FROM TP_PM_PRODUCTIONDATA
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_PRODUCTIONDATA.GOODSCODE
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_PRODUCTIONDATA.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID=TP_PM_PRODUCTIONDATA.GOODSID
 							LEFT JOIN TP_PC_GROUTINGLINE ON TP_PC_GROUTINGLINE.GROUTINGLINECODE=TP_PM_PRODUCTIONDATA.GROUTINGLINECODE
 							WHERE TP_PM_PRODUCTIONDATA.CREATETIME>=@DATEBEGIN@ AND TP_PM_PRODUCTIONDATA.CREATETIME<=@DATEEND@
 								 AND TP_PM_PRODUCTIONDATA.PROCEDUREID=8
@@ -139,7 +147,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							TP_MST_GOODS.GOODSCODE,TP_MST_GOODS.GOODSNAME,TP_MST_GOODS.GOODSSPECIFICATION,
 							COUNT(1) AS 实时转出
 							FROM TP_PM_PRODUCTIONDATA
-							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_PRODUCTIONDATA.GOODSCODE
+							--LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSCODE=TP_PM_PRODUCTIONDATA.GOODSCODE
+							LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID=TP_PM_PRODUCTIONDATA.GOODSID
 							LEFT JOIN TP_PC_GROUTINGLINE ON TP_PC_GROUTINGLINE.GROUTINGLINECODE=TP_PM_PRODUCTIONDATA.GROUTINGLINECODE
 							WHERE TP_PM_PRODUCTIONDATA.CREATETIME>=@DATEBEGIN@ AND TP_PM_PRODUCTIONDATA.CREATETIME<=@DATEEND@
 								 AND TP_PM_PRODUCTIONDATA.PROCEDUREID=8 AND tp_pm_productiondata.valueflag = 1