序列号下地时出货判定是否出货

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -273,7 +273,7 @@ namespace UAS_MES.Make
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                            string si_id = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", " si_sn='"+ sn_code + "' or si_sn in(select sn from makesnrelation where sn='"+ sn_code + "')").ToString();
+                            string si_id = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", " si_sn='"+ sn_code + "' or si_sn in(select sn from makesnrelation where sn='"+ sn_code + "'  or beforesn = '" + sn_code + "')").ToString();
                             if (si_id != "")
                             {
                                 dh.BatchInsert("update  sninfo set si_mac = :mac,si_bt =:bt,si_indate = sysdate where si_id = :osiId", new String[] { "mac", "bt", "osiId" }, new string[] { sncode.Text }, new string[] { ms_bt }, new string[] { si_id });

UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -78,14 +78,15 @@ namespace UAS_MES.Make
                         dtbar = (DataTable)dh.ExecuteSql("select ms_makecode,pr_code,pr_detail from makeserial left join product on MS_PRODCODE=pr_code where ms_id='" + ms_id + "'", "select");
                         BaseUtil.SetFormValue(this.Controls, dtbar);
                         sql.Clear();
-                        sql.Append("select ms_outboxcode, ms_downstatus,nvl(ms_iostatus,0) ms_iostatus,ms_prodcode from makeserial where ms_id ='" + ms_id + "' ");
+                        sql.Append("select ms_outboxcode, ms_downstatus,ms_outno,nvl(ms_iostatus,0) ms_iostatus,ms_prodcode from makeserial where ms_id ='" + ms_id + "' ");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         string ms_downstatus = dt.Rows[0]["ms_downstatus"].ToString();
                         string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
                         string ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
+                        string ms_outno = dt.Rows[0]["ms_outno"].ToString();
                         if (ms_downstatus == "0")
                         {
-                            if (ms_iostatus == "0")
+                            if (ms_outno == "")
                             {
                                 if (ms_outboxcode == null || ms_outboxcode == "")
                                 {