修改先输入箱号再采集的BUG

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -68,6 +68,7 @@ namespace UAS_MES.Make
         private void 包装采集_Load(object sender, EventArgs e)
         {
             pa_outboxcode.ShowClickIcon = false;
+            pa_outboxcode.Caller = "PACKAGE";
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             Baurate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
             //设置DbFind的必须的数据
@@ -223,18 +224,24 @@ namespace UAS_MES.Make
                     {
                         if (pa_outboxcode.Text == "")
                         {
-                            sql.Clear();
-                            sql.Append("select ms_prodcode from makeserial where ms_id='" + oMsID + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            pa_outboxcode.MakeCode = oMakeCode;
-                            pa_outboxcode.ProdCode = dt.Rows[0]["ms_prodcode"].ToString();
-                            pa_outboxcode.Caller = "PACKAGE";
                             LoadData();
                             if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
                                 LoadGridData();
                             else
                                 pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
                         }
+                        sql.Clear();
+                        sql.Append("select pr_code,ms_prodcode,ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,");
+                        sql.Append("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                        sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            pa_outboxcode.MakeCode = oMakeCode;
+                            pa_outboxcode.ProdCode = dt.Rows[0]["ms_prodcode"].ToString();
+                            StandardQTY = int.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                        }
                         //判断箱内总数必须大于0
                         if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
                         {
@@ -278,6 +285,7 @@ namespace UAS_MES.Make
                                         LoadGridData();
                                         sn_code.Clear();
                                     }
+                                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                 }
                                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                             }
@@ -473,6 +481,7 @@ namespace UAS_MES.Make
             if (PackageDetail.RowCount == 1)
             {
                 LoadCheckQTY();
+                pr_code.Text = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_sncode='" + PackageDetail.Rows[0].Cells["pd_barcode"].Value.ToString() + "' order by ms_id desc").ToString();
                 dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pr_code.Text + "' order by pl_isdefault desc ", "select");
                 PrintLabel.DataSource = dt;
                 PrintLabel.DisplayMember = "pl_laname";