出窑数量汇总表、成检缺陷汇总表的明细添加窑号、财年

DK.Client/ReportModule/R03/M01/F_RPT_030103_1.resx

@@ -165,6 +165,12 @@
   <metadata name="Cusercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Kcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Fyear.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

DK.Client/ReportModule/R03/M01/F_RPT_030106.resx

@@ -326,6 +326,12 @@
   <metadata name="glazingroom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Kcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Fyear.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -428,6 +434,12 @@
   <metadata name="bsqx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Kcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Fyear1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="protime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -3878,6 +3878,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
                 string sqlString =
                     "SELECT substr(gt.goodstypecode, 1, 6) goodstypecode2, COUNT(*) barcodecount\n" +
+
                     "  FROM tp_pm_groutingdailydetail gdd\n" +
                     " INNER JOIN tp_mst_goods g\n" +
                     "    ON g.goodsid = gdd.goodsid\n" +
@@ -6699,7 +6700,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     "temp.Createtime, " +
                     "temp.DELIVERTIME DDate, " +
                     "temp.GROUTINGDATE GDate, " +
-                    "replace((TP_MST_Logo.Logoname||'['||TP_MST_Logo.Logocode||']'),'[]','')  as LogoCodeName " +
+                    "replace((TP_MST_Logo.Logoname||'['||TP_MST_Logo.Logocode||']'),'[]','')  as LogoCodeName, " +
+                    "SUBSTR( TP_PM_ProductionData.KILNCARBATCHNO, INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode, " +
+                    "SUBSTR( TP_PM_ProductionData.KILNCARBATCHNO, INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( TP_PM_ProductionData.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear " +
                     "from TP_PM_ProductionData " +
                     "inner join tp_mst_goods on tp_mst_goods.goodsid=TP_PM_ProductionData.Goodsid " +
                     "inner join tp_mst_goodstype on tp_mst_goodstype.goodstypeid=tp_mst_goods.goodstypeid " +
@@ -6721,6 +6724,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     "  ,gdd.DELIVERTIME " +
                     "  ,pd.GROUTINGDATE " +
                     "  ,pd.KilnCarID " +
+                    "  ,pd.KILNCARBATCHNO" +
                     "  from TP_PM_ProductionData pd" +
             //"  inner join TP_MST_RptSProcedure on TP_MST_RptSProcedure.Procedureid=TP_PM_ProductionData.Procedureid " +
             //if (se.DTimeStart.HasValue || se.DTimeEnd.HasValue)
@@ -9879,6 +9883,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           0\n" +
                 "        END reworkflag" +
                 "     ,gdd.glazingroom" +
+                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode" +
+                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear" +
                 "  FROM tp_pm_defect pmd\n" +
                 "  LEFT JOIN TP_MST_Goods g\n" +
                 "    ON pmd.Goodsid = g.Goodsid\n" +
@@ -10205,6 +10211,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 //"           0\n" +
                 //"        END AS undoflag\n" +
                 "      , case when pd.checkflag = '1' then 0 else 1 end AS undoflag\n" +
+                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode1" +
+                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear1" +
                 "  FROM tp_pm_defect pmd\n" +
                 "  LEFT JOIN TP_PC_Procedure p\n" +
                 "    ON p.procedureid = pmd.procedureid\n" +