上料问题修改，查询进度处理

UAS_MES_JC/FunctionCode/Make/Make_FeedingCollection.cs

@@ -262,8 +262,9 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("mcd_stepname,sp_fsoncode,ms_craftcode,ms_craftname,:barcode,1,sysdate,'" + User.UserCode + "','" + User.UserLineCode + "',ma_wccode,");
                                     sql.Append("'" + User.UserSourceCode + "',:sp_id,0,1,ms_firstsn from make left join makecraftdetail on mcd_maid=ma_id  left join stepproduct on sp_stepcode=mcd_stepcode ");
                                     sql.Append(" and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code and sp_craftcode=ms_craftcode ");
-                                    sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + sn_code.Text + "'");
-                                    dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray());
+                                    sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + sn_code.Text + "'" +
+                                        "and :sp_id2 not in (select cm_spid from craftmaterial where cm_status=0 and cm_sncode='"+sn_code.Text+"') ");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1","sp_id2" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray(), SPID.ToArray());
                                     sn_code.Clear();
                                     SPID.Clear();
                                     TSN.Clear();

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -65,12 +65,13 @@ namespace UAS_MES_NEW.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
                 string sncode = sn_code.Text;
-                if (dt.Rows.Count > 0)
-                {
-                    sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
-                }
+                //dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
+              
+                //if (dt.Rows.Count > 0)
+                //{
+                //    sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
+                //}
                 ms_id = (DataTable)dh.ExecuteSql("select beforesn,sn from makesnrelation where beforesn='" + sn_code.Text + "' or sn='" + sn_code.Text + "'", "select");
                 if (ms_id.Rows.Count > 0)
                 {