成检报表

DK.Basics/WFControls/11_Standard/08_TextBox/01_Code/TxtCode.cs

@@ -16,7 +16,8 @@ namespace Dongke.WinForm.Controls
         /// </summary>
         public TxtCode()
         {
-            this.Rejected = "[^0-9a-zA-Z]";
+            //this.Rejected = "[^0-9a-zA-Z]";
+            this.Rejected = @"\s";
         }
         #endregion
     }

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -9494,13 +9494,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"            ON pmd.ProductionDataID = pd.ProductionDataID\n" +
 				"        -- 交接工序\n" +
 				"         INNER JOIN tp_pm_productiondata hopd\n" +
-				//"            ON hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
-                "            ON hopd.valueflag = '1'\n" +
-				"           AND hopd.barcode = pd.barcode\n" +
-                "           AND ((:HandOverProcedureID = 1 AND hopd.procedureid in (11,104) AND hopd.isrefire = '0') \n" +
-                "               OR (:HandOverProcedureID = 5 AND hopd.procedureid in (58,104) AND hopd.isrefire = '0') \n" +
-                "               OR (:HandOverProcedureID not in (1,5) AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
+                //"            ON hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
+                "            ON hopd.barcode = pd.barcode\n" +
                 "           AND hopd.kilncarbatchno = pd.kilncarbatchno\n" +
+                // 恒洁三车间特殊处理
+                //"           AND hopd.valueflag = '1'\n" +
+                "           AND ((:HandOverProcedureID = 1 AND ((hopd.procedureid = 11 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '0' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID = 5 AND ((hopd.procedureid = 58 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '6' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID not in (1,5) AND hopd.valueflag = '1' AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
+
 				"         WHERE pmd.valueflag = '1'\n" +
 				"           AND pd.ModelType = -1\n" +
 				"           AND pmd.AccountID = :AccountID\n";
@@ -9805,11 +9807,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				" INNER JOIN tp_pm_productiondata hopd\n" +
 				"    ON hopd.kilncarbatchno = pd.kilncarbatchno\n " +
 				"   AND hopd.barcode = pd.barcode\n" +
-				"   AND hopd.valueflag = '1'\n" +
+                //"   AND hopd.valueflag = '1'\n" +
                 //"   AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
-                "           AND ((:HandOverProcedureID = 1 AND hopd.procedureid in (11,104) AND hopd.isrefire = '0') \n" +
-                "               OR (:HandOverProcedureID = 5 AND hopd.procedureid in (58,104) AND hopd.isrefire = '6') \n" +
-                "               OR (:HandOverProcedureID not in (1,5) AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
+                // 恒洁三车间特殊处理
+                //"           AND hopd.valueflag = '1'\n" +
+                "           AND ((:HandOverProcedureID = 1 AND ((hopd.procedureid = 11 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '0' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID = 5 AND ((hopd.procedureid = 58 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '6' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID not in (1,5) AND hopd.valueflag = '1' AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
                 "  LEFT JOIN TP_MST_DefectFine mstdf\n" +
 				"    ON pmd.DefectFine = mstdf.DefectFineID\n" +
 				"  LEFT JOIN tp_mst_logo logo\n" +
@@ -10130,11 +10134,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				" INNER JOIN tp_pm_productiondata hopd\n" +
 				"    ON hopd.kilncarbatchno = pd.kilncarbatchno\n " +
 				"   AND hopd.barcode = pd.barcode\n" +
-				"   AND hopd.valueflag = '1'\n" +
+				//"   AND hopd.valueflag = '1'\n" +
                 //"   AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
-                "           AND ((:HandOverProcedureID = 1 AND hopd.procedureid in (11,104) AND hopd.isrefire = '0') \n" +
-                "               OR (:HandOverProcedureID = 5 AND hopd.procedureid in (58,104) AND hopd.isrefire = '6') \n" +
-                "               OR (:HandOverProcedureID not in (1,5) AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
+                // 恒洁三车间特殊处理
+                //"           AND hopd.valueflag = '1'\n" +
+                "           AND ((:HandOverProcedureID = 1 AND ((hopd.procedureid = 11 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '0' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID = 5 AND ((hopd.procedureid = 58 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '6' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID not in (1,5) AND hopd.valueflag = '1' AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
                 "  LEFT JOIN TP_MST_DefectFine mstdf\n" +
 				"    ON pmd.DefectFine = mstdf.DefectFineID\n" +
 				"  LEFT JOIN tp_mst_logo logo\n" +
@@ -10456,11 +10462,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				" INNER JOIN tp_pm_productiondata hopd\n" +
 				"    ON hopd.kilncarbatchno = pd.kilncarbatchno\n " +
 				"   AND hopd.barcode = pd.barcode\n" +
-				"   AND hopd.valueflag = '1'\n" +
+                //"   AND hopd.valueflag = '1'\n" +
                 //"   AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID) \n" +
-                "           AND ((:HandOverProcedureID = 1 AND hopd.procedureid in (11,104) AND hopd.isrefire = '0') \n" +
-                "               OR (:HandOverProcedureID = 5 AND hopd.procedureid in (58,104) AND hopd.isrefire = '6') \n" +
-                "               OR (:HandOverProcedureID not in (1,5) AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
+                // 恒洁三车间特殊处理
+                //"           AND hopd.valueflag = '1'\n" +
+                "           AND ((:HandOverProcedureID = 1 AND ((hopd.procedureid = 11 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '0' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID = 5 AND ((hopd.procedureid = 58 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '6' AND hopd.checkflag = '1'))) \n" +
+                "               OR (:HandOverProcedureID not in (1,5) AND hopd.valueflag = '1' AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
                 "  LEFT JOIN TP_MST_DefectFine mstdf\n" +
 				"    ON pmd.DefectFine = mstdf.DefectFineID\n" +
 				"  LEFT JOIN tp_mst_logo logo\n" +

IBOSS.PRD.Public/F_P_00002.resx

@@ -161,6 +161,9 @@
   <metadata name="g1DefectDeductionNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g1procedurename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g1usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

IBOSS.PRD.Public/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.6")]
-[assembly: AssemblyFileVersion("1.0.0.6")]
+[assembly: AssemblyVersion("1.0.0.7")]
+[assembly: AssemblyFileVersion("1.0.0.7")]