返工数据采集增加判断SN是否下地

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -118,7 +118,7 @@ namespace UAS_MES.Make
                                 sql.Clear();
                                 sql.Append("select ms_beforesn,ms_status,ms_makecode,ms_firstsn,ms_outboxcode,ms_nextmacode,ms_prodcode,ms_salecode,");
                                 sql.Append("MS_IMEI1,MS_MAC,MS_NETCODE,MS_MEID,ms_imei2,ms_imei3,ms_othid1,ms_othid2,ms_othid3");
-                                sql.Append(",MS_OTHCODE3,MS_OTHCODE2,MS_OTHCODE1,ms_bt from makeserial where ms_id='" + Msid + "'");
+                                sql.Append(",MS_OTHCODE3,MS_OTHCODE2,MS_OTHCODE1,ms_bt,nvl(MS_DOWNSTATUS,0) MS_DOWNSTATUS from makeserial where ms_id='" + Msid + "'");
                                 DataTable SnInf = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 string ms_prodcode = SnInf.Rows[0]["ms_prodcode"].ToString();
                                 string ms_salecode = SnInf.Rows[0]["ms_salecode"].ToString();
@@ -132,6 +132,12 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>序列号已经被工单号:" + SnInf.Rows[0]["ms_nextmacode"].ToString() + "使用\n", Color.Red, sn_code);
                                     return;
                                 }
+                                //判断序列号是否已经被下地
+                                if (SnInf.Rows[0]["MS_DOWNSTATUS"].ToString() != "0")
+                                {
+                                    OperateResult.AppendText(">>序列号"+ sn_code.Text + "已被下地,不允许操作\n", Color.Red, sn_code);
+                                    return;
+                                }
                                 //工单信息
                                 sql.Clear();
                                 sql.Append("select ma_salecode,nvl(ma_checksacode,0)ma_checksacode,ma_prodcode,ma_craftname,ma_inqty,ma_craftcode,ma_qty,nvl(ma_inqty,0) ma_inqty,");