添加存储过程调整

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

@@ -1100,7 +1100,7 @@ namespace UAS_LabelMachine
         /// </summary>
         /// <param name="ProcedureName"></param>
         /// <param name="param"></param>
-        public void CallProcedure(string ProcedureName, params string[] param)
+        public void CallProcedure(string ProcedureName, ref string[] param)
         {
             command = new OracleCommand(ProcedureName);
             command.Connection = connection;

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

@@ -0,0 +1,23 @@
+using UAS_LabelMachine.Entity;
+
+namespace UAS_LabelMachine.PublicMethod
+{
+    class LogicHandler
+    {
+        public static DataHelper dh = SystemInf.dh;
+
+        public static void FilterData(string iCustCode, string iBrand, string iSpec, string iQty, string iDateCode, string iLotno, out string oSpec, out string oQty, out string oDatecode, out string oLotno)
+        {
+            oSpec = "";
+            oQty = "";
+            oDatecode = "";
+            oLotno = "";
+            string[] param = new string[] { iCustCode, iBrand, iSpec, iQty, iDateCode, iLotno, oSpec, oQty, oDatecode, oLotno };
+            dh.CallProcedure("sp_datafilter", ref param);
+            oSpec = param[6];
+            oQty = param[7];
+            oDatecode = param[8];
+            oLotno = param[9];
+        }
+    }
+}

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

@@ -254,6 +254,7 @@
     <Compile Include="PublicMethod\ftpOperater.cs" />
     <Compile Include="PublicMethod\GlobalEventsHandler.cs" />
     <Compile Include="PublicMethod\HttpHandler.cs" />
+    <Compile Include="PublicMethod\LogicHandler.cs" />
     <Compile Include="PublicMethod\LogManager.cs" />
     <Compile Include="PublicMethod\Print.cs" />
     <Compile Include="PublicMethod\SqliteDBHelper.cs" />

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

@@ -1096,7 +1096,7 @@ namespace UAS_LabelMachine
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
                     {
                         string[] param = new string[] { PI_ID, "" };
-                        dh.CallProcedure("GetCustBarcode", param);
+                        dh.CallProcedure("GetCustBarcode", ref param);
                     }
                     LoadGridData(sender, e);
                     //重新输入单号后清除缓存
@@ -2232,6 +2232,15 @@ namespace UAS_LabelMachine
                             }
                             string pib_outboxcode2 = dt.Rows[i]["箱号"].ToString();
                             DataRow[] dr = dt1.Select("pr_orispeccode='" + pr_orispeccode + "'");
+                            if (dr.Length == 0)
+                            {
+                                LogicHandler.FilterData(cu_code.Text, "FUDAN", pr_orispeccode, qty, DateCode, LotNo, out pr_orispeccode, out qty, out DateCode, out LotNo);
+                                dr = dt1.Select("pr_orispeccode='" + pr_orispeccode + "'");
+                            }
+                            else
+                            {
+                                LogicHandler.FilterData(cu_code.Text, dr[0]["pr_brand"].ToString(), pr_orispeccode, qty, DateCode, LotNo, out pr_orispeccode, out qty, out DateCode, out LotNo);
+                            }
                             if (dr.Length > 0)
                             {
                                 string pd_orderdetno = dr[0]["pd_orderdetno"].ToString();
@@ -2249,7 +2258,7 @@ namespace UAS_LabelMachine
                                 string pib_barcode = dh.getFieldDataByCondition("prodiobarcode", "max(pib_barcode)", "PIB_INOUTNO='" + pi_inoutno.Text + "'").ToString();
                                 if (outqty % zxbzs != 0)
                                 {
-                                    barcodenum = outqty / zxbzs + 1;
+                                    barcodenum = Math.Floor(outqty / zxbzs) + 1;
                                     //如果有余数先加上所有最小包最后加尾数
                                     for (int j = 0; j < barcodenum - 1; j++)
                                     {