Bladeren bron

添加外箱条码

章政 7 jaren geleden
bovenliggende
commit
ed242a071e

+ 16 - 8
UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -1058,16 +1058,24 @@ namespace UAS_LabelMachine
         /// <param name="param"></param>
         public void CallProcedure(string ProcedureName, params string[] param)
         {
-            command.CommandText = "Execute " + ProcedureName;
-            if (param[0].Length > 0)
+            command = new OracleCommand(ProcedureName);
+            command.Connection = connection;
+            command.CommandText = ProcedureName;
+            command.CommandType = CommandType.StoredProcedure;
+            for (int i = 0; i < param.Length; i++)
+                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
+            try
             {
-                command.ArrayBindCount = param[1].Length;
-                for (int i = 1; i <= param[0].Length; i++)
-                {
-                    command.Parameters.Add(new OracleParameter(param[0][i - 1].ToString(), OracleDbType.Varchar2, param[i], ParameterDirection.Input));
-                }
+                command.ExecuteNonQuery();
             }
-            command.ExecuteNonQuery();
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
+            for (int i = 0; i < command.Parameters.Count; i++)
+                param[i] = command.Parameters[i].Value.ToString();
             command.Dispose();
         }
 

File diff suppressed because it is too large
+ 176 - 399
UAS-出货标签管理/UAS_出货标签管理.Designer.cs


+ 6 - 1
UAS-出货标签管理/UAS_出货标签管理.cs

@@ -1124,6 +1124,11 @@ namespace UAS_LabelMachine
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
+                    if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
+                    {
+                        string[] param = new string[] { PI_ID, "", "" };
+                        dh.CallProcedure("GetCustBarcode", param);
+                    }
                     LoadGridData(sender, e);
                     //重新输入单号后清除缓存
                     MidBoxArgument.Clear();
@@ -2025,7 +2030,7 @@ namespace UAS_LabelMachine
             else
             {
                 sql.Clear();
-                sql.Append("select pd_custprodcode,pd_custprodspec,pd_pocode,pib_madein,pib_custbarcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
+                sql.Append("select pd_custprodcode,pd_custprodspec,pd_pocode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
                 sql.Append("pib_lotno,pib_datecode,pib_qty,pr_spec,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint");
                 sql.Append(" from prodiobarcode left join prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and ");
                 sql.Append(" pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode left join sale on sa_code=pib_ordercode ");

+ 3 - 0
UAS-出货标签管理/UAS_出货标签管理.resx

@@ -171,6 +171,9 @@
   <metadata name="pib_custbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pib_custoutboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Some files were not shown because too many files changed in this diff