维修回流判断是否存在未上料物料判断排除归属至返工工单物料

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -508,7 +508,7 @@ namespace UAS_MES.Make
             //查询拆解的物料
             sql.Clear();
             sql.Append("select distinct cm_soncode from craftmaterial where cm_sncode in (select '" + firstsn + "' from dual union ");
-            sql.Append("select sn from makesnrelation where firstsn='" + firstsn + "') and cm_craftcode<>'" + cr_code.Text + "' and cm_makecode<>'" + ms_makecode.Text + "' and cm_status=-1 ");
+            sql.Append("select sn from makesnrelation where firstsn='" + firstsn + "') and cm_craftcode<>'" + cr_code.Text + "' and cm_makecode<>'" + ms_makecode.Text + "' and cm_status=-1 and cm_dropcode is null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //如果含有序列号物料有被拆解过
             if (dt.Rows.Count > 0)