机身标打印调整

UAS_MES_ODLF/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -116,6 +116,35 @@ namespace UAS_MES_NEW.Make
                 }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                 {
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "'  or ms_imeiremark='" + sncode.Text + "'  order by ms_id desc", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
+                    }
+                    else
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "'order by ms_id desc", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
+                        }
+                        else
+                        {
+                            dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + sncode.Text + "' order by mil_id desc", "select");
+                            if (dt.Rows.Count > 0)
+                            {
+                                sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
+                            }
+                            else
+                            {
+                                dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + sncode.Text + "' order by mil_id desc", "select");
+                                if (dt.Rows.Count > 0)
+                                {
+                                    sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
+                                }
+                            }
+                        }
+                    }
                     //定义临时变量
                     string oStatus = "";
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确

UAS_MES_ODLF/FunctionCode/Special/Special_BoxSplit.Designer.cs

@@ -61,9 +61,9 @@
             this.Pallet_label.Location = new System.Drawing.Point(73, 264);
             this.Pallet_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Pallet_label.Name = "Pallet_label";
-            this.Pallet_label.Size = new System.Drawing.Size(93, 41);
+            this.Pallet_label.Size = new System.Drawing.Size(62, 41);
             this.Pallet_label.TabIndex = 1;
-            this.Pallet_label.Text = "MAC";
+            this.Pallet_label.Text = "SN";
             // 
             // Pallate
             // 

UAS_MES_ODLF/FunctionCode/Special/Special_BoxSplit.cs

@@ -30,27 +30,16 @@ namespace UAS_MES_NEW.Special
 
         private void Split_Click(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select si_mac,si_bt,si_sn from sninfo where si_mac='" + Pallate.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_sncode='" + Pallate.Text + "'", "select");
             if (dt.Rows.Count > 0)
             {
-                string sn = dt.Rows[0]["si_sn"].ToString();
-                string si_mac = dt.Rows[0]["si_mac"].ToString();
-                dt = (DataTable)dh.ExecuteSql("select mal_mac,mal_bt,mal_sncode from makeaddresslist where mal_mac='" + Pallate.Text + "'", "select");
+                string sn = dt.Rows[0]["ms_sncode"].ToString();
+                dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_sncode,mil_psn from makeimeilist where mil_sncode='" + sn + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    string mal_sncode = dt.Rows[0]["mal_sncode"].ToString();
-                    if (sn != mal_sncode)
-                    {
-                        dh.ExecuteSql("update makeaddresslist set mal_sncode='" + sn + "' where mal_mac='" + si_mac + "'", "update");
-                        dh.ExecuteSql("update makeserial set ms_mac='',ms_bt='' where ms_firstsn='" + mal_sncode + "'", "update");
-                        OperatResult.AppendText("MAC" + Pallate.Text + "分配序列号" + sn, Color.Green);
-                    }
-                    else
-                    {
-                        dh.ExecuteSql("update makeserial set ms_mac='',ms_bt='' where ms_mac='" + Pallate.Text + "' and ms_firstsn<>'" + sn + "'", "update");
-                        OperatResult.AppendText("MAC" + Pallate.Text + "分配序列号" + sn, Color.Green);
-                    }
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "重新分配MAC", "分配成功", Pallate.Text, "");
+                    dh.ExecuteSql("update makeimeilist set mil_sncode='' where mil_sncode='" + sn + "'", "update");
+                    OperatResult.AppendText("SN" + Pallate.Text + "重置IMEI清单成功" + sn, Color.Green);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "重新分配IMEI", "重置成功", Pallate.Text, "");
                 }
             }
             else