修改标签获取的BUG

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -253,6 +253,11 @@ namespace UAS_MES.Make
                                         //满箱更新状态为1
                                         LoadData();
                                         LoadGridData();
+                                        //采集完后如果是第一个装的序列号，把序列号的NextStepCode赋值给箱号
+                                        if (pa_currentqty.Text == "1")
+                                        {
+
+                                        }
                                         if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == pr_outboxinnerqty.Value)
                                         {
                                             dh.UpdateByCondition("package", "pa_status=1,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
@@ -298,14 +303,14 @@ namespace UAS_MES.Make
             pa_outboxcode.MakeCode = pa_makecode.Text;
             pa_outboxcode.ProdCode = pr_code.Text;
             pa_outboxcode.Caller = "PACKAGE";
-            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,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.ValueMember = "la_id";
             ftpOperater ftp = new ftpOperater();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_id"].ToString());
+                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
             }
         }
 

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -382,7 +382,7 @@ namespace UAS_MES.Make
             ftpOperater ftp = new ftpOperater();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString(), dt.Rows[i]["pl_indate"].ToString());
+                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
             }
         }