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

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -109,6 +109,7 @@ namespace UAS_LabelMachine
             Type dgvType = this.LabelInf.GetType();
             PropertyInfo pi = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic);
             pi.SetValue(this.LabelInf, true, null);
+            pi.SetValue(this.GridPrcode, true, null);
             (new EnvironmentSettings()).ReportSettings.ShowProgress = false;
             Text = Text + "-" + Master;
         }
@@ -2025,11 +2026,18 @@ namespace UAS_LabelMachine
 
         private void ButtonWeigh_Click(object sender, EventArgs e)
         {
-            sql.Clear();
-            sql.Append("update prodiobarcode set pib_boxweight='" + Weight.Text + "' where pib_inoutno='" + pi_inoutno.Text + "' ");
-            sql.Append(" and pib_outboxcode2='" + OutBoxNum.Text + "'");
-            dh.ExecuteSql(sql.ToString(), "update");
-            LoadGridData(sender, e);
+            if (Weight.Text != "")
+            {
+                sql.Clear();
+                sql.Append("update prodiobarcode set pib_boxweight='" + Weight.Text + "' where pib_inoutno='" + pi_inoutno.Text + "' ");
+                sql.Append(" and pib_outboxcode2='" + OutBoxNum.Text + "'");
+                dh.ExecuteSql(sql.ToString(), "update");
+                LoadGridData(sender, e);
+            }
+            else
+            {
+                MessageBox.Show("请先连接电子秤!");
+            }
         }
         Regex reg = new Regex(@"\d+.\d+");
         ComInfoSet cis;

UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -2480,8 +2480,6 @@ namespace UAS_LabelMachine
                     }
                 }
                 //上一个的最小外箱号，如果箱号没有发生变化则外箱条码也不变化
-                string Lastoutbox = "";
-                string Lastoutboxcode = "";
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
                     string pr_spec = dt.Rows[i]["规格型号"].ToString();
@@ -2559,16 +2557,7 @@ namespace UAS_LabelMachine
                             {
                                 barcode.Add(BaseUtil.BarcodeMethod1(pd_id, pr_id, pib_barcode));
                                 custbarcode.Add(BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix));
-                                if (Lastoutbox != pib_outboxcode2)
-                                {
-                                    Lastoutboxcode = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
-                                    pib_custoutboxcode.Add(Lastoutboxcode);
-                                    Lastoutbox = pib_outboxcode2;
-                                }
-                                else
-                                {
-                                    pib_custoutboxcode.Add(Lastoutboxcode);
-                                }
+                                pib_custoutboxcode.Add(pib_outboxcode2);
                                 piboutboxcode2.Add(pib_outboxcode2);
                                 pib_inqty.Add(zxbzs);
                                 datecode.Add(DateCode);
@@ -2581,16 +2570,7 @@ namespace UAS_LabelMachine
                                 pdprodcode.Add(pd_prodcode);
                             }
                             custbarcode.Add(BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix));
-                            if (Lastoutbox != pib_outboxcode2)
-                            {
-                                Lastoutboxcode = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
-                                pib_custoutboxcode.Add(Lastoutboxcode);
-                                Lastoutbox = pib_outboxcode2;
-                            }
-                            else
-                            {
-                                pib_custoutboxcode.Add(Lastoutboxcode);
-                            }
+                            pib_custoutboxcode.Add(pib_outboxcode2);
                             barcode.Add(BaseUtil.BarcodeMethod1(pd_id, pr_id, pib_barcode));
                             pib_inqty.Add(pd_outqty % zxbzs);
                             piboutboxcode2.Add(pib_outboxcode2);
@@ -2610,16 +2590,7 @@ namespace UAS_LabelMachine
                             {
                                 barcode.Add(BaseUtil.BarcodeMethod1(pd_id, pr_id, pib_barcode));
                                 custbarcode.Add(BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix));
-                                if (Lastoutbox != pib_outboxcode2)
-                                {
-                                    Lastoutboxcode = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
-                                    pib_custoutboxcode.Add(Lastoutboxcode);
-                                    Lastoutbox = pib_outboxcode2;
-                                }
-                                else
-                                {
-                                    pib_custoutboxcode.Add(Lastoutboxcode);
-                                }
+                                pib_custoutboxcode.Add(pib_outboxcode2);
                                 pib_inqty.Add(zxbzs);
                                 piboutboxcode2.Add(pib_outboxcode2);
                                 datecode.Add(DateCode);
@@ -2636,6 +2607,22 @@ namespace UAS_LabelMachine
                         outsumqty[pr_spec][pd_pdno] -= pd_outqty;
                     }
                 }
+                string Lastoutbox = "";
+                string Lastoutboxcode = "";
+                List<string> custoutboxcode = new List<string>();
+                for (int i = 0; i < pib_custoutboxcode.Count; i++)
+                {
+                    if (Lastoutbox != pib_custoutboxcode[i].ToString())
+                    {
+                        Lastoutboxcode = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
+                        custoutboxcode.Add(Lastoutboxcode);
+                        Lastoutbox = pib_custoutboxcode[i].ToString();
+                    }
+                    else
+                    {
+                        custoutboxcode.Add(Lastoutboxcode);
+                    }
+                }
                 //插叙所有的统计数量
                 string ErrMsg = "";
                 foreach (var item in sumqty)
@@ -2670,7 +2657,7 @@ namespace UAS_LabelMachine
                         sql.Append("pib_outboxcode2,pib_custbarcode,pib_custoutboxcode)values(prodiobarcode_seq.nextval,:pd_prodcode,'" + User.UserName + "',sysdate,");
                         sql.Append("'" + pi_inoutno.Text + "'," + PI_ID + ",:pr_brand,:barcode,:pd_pdno,:pd_id,'" + pi_class.Text + "',:pib_inqty,");
                         sql.Append(":pib_datecode,:pib_lotno,0,-1,:pd_ordercode,:pd_orderdetno,:outboxcode,:custbarcode,:pib_custoutboxcode)");
-                        dh.BatchInsert(sql.ToString(), new string[] { "pd_prodcode", "pr_brand", "barcode", "pd_pdno", "pd_id", "pib_inqty", "pib_datecode", "pib_lotno", "pd_ordercode", "pd_orderdetno", "outboxcode", "custbarcode", "pib_custoutboxcode" }, pdprodcode.ToArray(), prbrand.ToArray(), barcode.ToArray(), pdpdno.ToArray(), pdid.ToArray(), pib_inqty.ToArray(), datecode.ToArray(), lotno.ToArray(), pdordercode.ToArray(), pdorderdetno.ToArray(), piboutboxcode2.ToArray(), custbarcode.ToArray(), pib_custoutboxcode.ToArray());
+                        dh.BatchInsert(sql.ToString(), new string[] { "pd_prodcode", "pr_brand", "barcode", "pd_pdno", "pd_id", "pib_inqty", "pib_datecode", "pib_lotno", "pd_ordercode", "pd_orderdetno", "outboxcode", "custbarcode", "pib_custoutboxcode" }, pdprodcode.ToArray(), prbrand.ToArray(), barcode.ToArray(), pdpdno.ToArray(), pdid.ToArray(), pib_inqty.ToArray(), datecode.ToArray(), lotno.ToArray(), pdordercode.ToArray(), pdorderdetno.ToArray(), piboutboxcode2.ToArray(), custbarcode.ToArray(), custoutboxcode.ToArray());
                         //更新流水
                         dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
                         LoadGridData();
@@ -2794,6 +2781,7 @@ namespace UAS_LabelMachine
             string SQL = "";
             LogicHandler.CustBarCode(pi_inoutno.Text, out SQL);
             sdh.ExecuteSql(SQL, "update");
+            LoadGridData();
         }
     }
 }