Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -297,7 +297,7 @@ namespace UAS_MES.Make
         {
             DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
         }
 

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -97,6 +97,11 @@ namespace UAS_MES.Make
                     LoadGridData();
                     pa_id = dt.Rows[0]["pa_id"].ToString();
                 }
+                else
+                {
+                    OperateResult.AppendText(">>输入的栈板号" + pa_outboxcode.Text + "不存在\n", Color.Red, pa_outboxcode);
+                    BaseUtil.CleanForm(this);
+                }
                 if (CheckOutBoxLength())
                 {
                     if (pa_standardqty.Text == "")

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -253,7 +253,7 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<箱号:" + inputValue.Text + "错误,不存在\n", Color.Red);
                     return;
                 }
-                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                doc = lbl.Documents.Open(PrintLabel.Text);
                 if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text),ms_makecode.Text,pr_code.Text,"卡通箱标","-1",out errorMessage))
                 {
                     //判断通过,打印