qinqi 1 anno fa
parent
commit
90e3fba26c

+ 2 - 1
wwwroot/mes/pm/fqcitems/fqcitems_add_frame.html

@@ -124,6 +124,7 @@
                     <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
                     <th data-options="field:'ITEMSDETAILID',title:'明细ID',align:'left',sortable:true,hidden:true"></th>
                     <th data-options="field:'ITEMSID',title:'检验ID',align:'left',sortable:true,hidden:true"></th>
+                    <th data-options="field:'XUHAO',title:'序号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'INSPECTITEM',title:'检验项目',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'INSPECTTOOL',title:'检验工具',align:'left',sortable:true,editor:{
                             type:'combobox',
@@ -162,7 +163,7 @@
                     <th data-options="field:'CREATETIME',title:'创建时间',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'UPDATEUSERID',title:'更新工号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'UPDATETIME',title:'更新时间',align:'left',sortable:true,editor:{type:'textbox'}"></th>
-                    <th data-options="field:'XUHAO',title:'序号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
+
                 </tr>
             </thead>
         </table>

+ 2 - 1
wwwroot/mes/pm/fqcitems/fqcitems_frame.html

@@ -166,6 +166,7 @@
                     <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
                     <th data-options="field:'ITEMSDETAILID',title:'明细ID',align:'left',sortable:true,hidden:true"></th>
                     <th data-options="field:'ITEMSID',title:'检验ID',align:'left',sortable:true,hidden:true"></th>
+                    <th data-options="field:'XUHAO',title:'序号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'INSPECTITEM',title:'检验项目',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'INSPECTTOOL',title:'检验工具',align:'left',sortable:true,editor:{
                             type:'combobox',
@@ -204,7 +205,7 @@
                     <th data-options="field:'CREATETIME',title:'创建时间',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'UPDATEUSERID',title:'更新工号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
                     <th data-options="field:'UPDATETIME',title:'更新时间',align:'left',sortable:true,editor:{type:'textbox'}"></th>
-                    <th data-options="field:'XUHAO',title:'序号',align:'left',sortable:true,editor:{type:'textbox'}"></th>
+
                 </tr>
             </thead>
         </table>

+ 36 - 36
wwwroot/mes/pm/fqcitems/fqcitemsdetail.ashx

@@ -745,42 +745,42 @@ public class fqcitemsdetail : IHttpHandler, IReadOnlySessionState
                        new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"])
                     );
                 }
-                if (detailTable.Rows.Count == 92 &&itemsID > 0)
-                {
-                    //更新序号 
-                    int result2 = conn.ExecuteNonQuery(@"
-                        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
-                        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
-                        WHERE A.INSPECTITEM = C.INSPECTITEM 
-                         AND A.ITEMSID = 164 ) WHERE C.ITEMSID = @ITEMSID@
-                    ",
-                        new CDAParameter("ITEMSID", itemsID)
-                    );
-                }
-                else if (itemsID > 0 && (detailTable.Rows.Count == 84 || detailTable.Rows.Count == 85))
-                {
-                    //更新序号 
-                    int result2 = conn.ExecuteNonQuery(@"
-                        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
-                        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
-                        WHERE A.INSPECTITEM = C.INSPECTITEM 
-                         AND A.ITEMSID = 247 ) WHERE C.ITEMSID = @ITEMSID@
-                    ",
-                        new CDAParameter("ITEMSID", itemsID)
-                    ); 
-                }
-                else if (detailTable.Rows.Count == 80 &&itemsID > 0)
-                {
-                    //更新序号 
-                    int result2 = conn.ExecuteNonQuery(@"
-                        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
-                        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
-                        WHERE A.INSPECTITEM = C.INSPECTITEM 
-                         AND A.ITEMSID = 303 ) WHERE C.ITEMSID = @ITEMSID@
-                    ",
-                        new CDAParameter("ITEMSID", itemsID)
-                    );
-                }
+                //if (detailTable.Rows.Count == 92 &&itemsID > 0)
+                //{
+                //    //更新序号 
+                //    int result2 = conn.ExecuteNonQuery(@"
+                //        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
+                //        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
+                //        WHERE A.INSPECTITEM = C.INSPECTITEM 
+                //         AND A.ITEMSID = 164 ) WHERE C.ITEMSID = @ITEMSID@
+                //    ",
+                //        new CDAParameter("ITEMSID", itemsID)
+                //    );
+                //}
+                //else if (itemsID > 0 && (detailTable.Rows.Count == 84 || detailTable.Rows.Count == 85))
+                //{
+                //    //更新序号 
+                //    int result2 = conn.ExecuteNonQuery(@"
+                //        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
+                //        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
+                //        WHERE A.INSPECTITEM = C.INSPECTITEM 
+                //         AND A.ITEMSID = 247 ) WHERE C.ITEMSID = @ITEMSID@
+                //    ",
+                //        new CDAParameter("ITEMSID", itemsID)
+                //    ); 
+                //}
+                //else if (detailTable.Rows.Count == 80 &&itemsID > 0)
+                //{
+                //    //更新序号 
+                //    int result2 = conn.ExecuteNonQuery(@"
+                //        UPDATE TP_PM_FQCITEMSDETAIL C SET C.XUHAO = (
+                //        SELECT DISTINCT A.XUHAO FROM TP_PM_FQCITEMSDETAIL A
+                //        WHERE A.INSPECTITEM = C.INSPECTITEM 
+                //         AND A.ITEMSID = 303 ) WHERE C.ITEMSID = @ITEMSID@
+                //    ",
+                //        new CDAParameter("ITEMSID", itemsID)
+                //    );
+                //}
 
             }
             else