Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -204,9 +204,9 @@ namespace UAS_MES.Make
 
         private void ReleasePallet_Click(object sender, EventArgs e)
         {
-            dh.ExecuteSql("delete from packagedetail where pd_paid=(select pa_id from package where pa_outboxcode='"+ palletcode.Text+"' and pa_type=2)","delete");
-            dh.ExecuteSql("update package set pa_totalqty=0 where pa_outboxcode='"+palletcode.Text+"' and pa_type=2", "update");
-            OperateResult.AppendText(">>箱号"+outboxcode.Text+"解除成功\n",Color.Green);
+            dh.ExecuteSql("delete from packagedetail where pd_paid=(select pa_id from package where pa_outboxcode='" + palletcode.Text + "' and pa_type=2)", "delete");
+            dh.ExecuteSql("update package set pa_totalqty=0 where pa_outboxcode='" + palletcode.Text + "' and pa_type=2", "update");
+            OperateResult.AppendText(">>箱号" + outboxcode.Text + "解除成功\n", Color.Green);
             palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
         }
     }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -68,11 +68,12 @@ namespace UAS_MES.Make
                 //输入的是SN
                 if (!isImei1)
                 {
+                    OperateResult.AppendText("<<"+sncode.Text+"\n", Color.Black);
                     //查询是否存在该ms_id
                     sql.Clear();
                     sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='"+sncode.Text+"' or exists (select 1 from  makesnrelation where beforesn='"+sncode.Text+"'  and ms_makecode=makecode)");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "0")
+                    if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
                         //SN错误,不存在
                         //请输入SN
@@ -115,7 +116,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
+                            OperateResult.AppendText("<<SN:" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
                             sncode.Text = "";
                             OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
@@ -124,6 +125,7 @@ namespace UAS_MES.Make
                 //输入的是imei1
                 else
                 {
+                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     if (imei1 == sncode.Text)
                     {
                         //说明输入的imei1对比一致

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -261,7 +261,14 @@ namespace UAS_MES.Make
                 if (pr_outboxinnerqty.Text == pa_packageqty.Text)
                 {
                     OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Green);
-                    Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    if (PrintLabel.Items.Count != 0)
+                    {
+                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
+                    }
                 }
             }
         }