添加TSN

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -116,7 +116,7 @@ namespace UAS_MES.Make
                         if (sn_code.Text != "")
                         {
                             //判断序列号是否有效
-                            string Msid = dh.getFieldDataByCondition("makeserial ", "max(ms_id)", "ms_sncode='" + sn_code.Text + "'").ToString();
+                            string Msid = dh.getFieldDataByCondition("makeserial ", "max(ms_id)", "ms_sncode='" + sn_code.Text + "' and ms_makecode<>'" + ma_code.Text + "'").ToString();
                             if (Msid != "")
                             {
                                 //序列号信息
@@ -168,10 +168,18 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>工单不允许超数投产\n", Color.Red, sn_code);
                                     return;
                                 }
-                                if (ReWorkAsRelateTSN.Checked && ms_beforesn == "")
+                                string Sn = sn_code.Text;
+                                if (ReWorkAsRelateTSN.Checked)
                                 {
-                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在TSN\n", Color.Red, sn_code);
-                                    return;
+                                    if (ms_beforesn != "")
+                                    {
+                                        Sn = ms_beforesn;
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在TSN\n", Color.Red, sn_code);
+                                        return;
+                                    }
                                 }
                                 string netcode = "";
                                 string imeid = "";
@@ -224,7 +232,7 @@ namespace UAS_MES.Make
                                 sql.Append(",ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode,ms_linecode");
                                 sql.Append(",ms_sourcecode,ms_maid,ms_firstsn,ms_salecode,ms_mac,ms_bt,ms_othcode1,ms_othcode2,");
                                 sql.Append("ms_othcode3,ms_netcode,ms_imei1,ms_imei2,ms_imei3,ms_meid,ms_othid1,ms_othid2,ms_othid3)");
-                                sql.Append("values(MakeSerial_seq.nextval,'" + sn_code.Text + "','" + sn_code.Text + "','" + pr_code.Text + "',");
+                                sql.Append("values(MakeSerial_seq.nextval,'" + Sn + "','" + Sn + "','" + pr_code.Text + "',");
                                 sql.Append("sysdate,'" + workcenter + "','" + craftcode + "','" + craftname + "','" + User.CurrentStepCode + "',");
                                 sql.Append("1,'" + ma_code.Text + "','" + User.UserLineCode + "','" + User.UserSourceCode + "','" + ma_id.Text + "',");
                                 sql.Append("'" + firstsn + "','" + salecode + "','" + mac + "','" + bt + "','" + othcode1 + "','" + othcode2 + "','" + othcode3 + "',");
@@ -245,7 +253,7 @@ namespace UAS_MES.Make
                                 }
                                 sn_code.Clear();
                             }
-                            else OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
+                            else OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在或者已绑定工单\n", Color.Red, sn_code);
                         }
                         else OperateResult.AppendText(">>序列号不允许为空\n", Color.Red, sn_code);
                     }