Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.cs

@@ -98,9 +98,8 @@ namespace UAS_MES.OQC
                             sql.Append("ob_batchqty,ob_status,ob_prodcode,ob_sourcecode,ob_reworkcode,ob_orgcheckno,");
                             sql.Append("OB_CRAFTCODE,OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,OB_PROJECTCODE,OB_DESCRIPTION,");
                             sql.Append("OB_AQLCODE,OB_REMARK,OB_INMAN) select '" + ob_id + "','" + new_checkno.Text + "',sysdate,");
-                            sql.Append("'" + ob_checkno.Text + "',ob_source,ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,ob_salecode,");
-                            sql.Append("ob_reworkcode,ob_orgcheckno,OB_CRAFTCODE, OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,");
-                            sql.Append("OB_PROJECTCODE,OB_DESCRIPTION,OB_AQLCODE,OB_REMARK,'" + User.UserCode + "' from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
+                            sql.Append("'" + ob_checkno.Text + "',ob_source,ob_salecode,ob_batchqty,ob_status,ob_prodcode,ob_sourcecode,ob_reworkcode, ob_orgcheckno, OB_CRAFTCODE, OB_STEPCODE, OB_MAKECODE, oB_WCCODE, OB_FACTORY, OB_PROJECTCODE, OB_DESCRIPTION, OB_AQLCODE, OB_REMARK, ");
+                            sql.Append("'" + User.UserCode + "' from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
                             sqls.Add(sql.GetString());
                         }
                         //插入新明细