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

UAS-出货标签管理(标签复核)/Login.cs

@@ -34,20 +34,9 @@ namespace UAS_LabelMachine
             SystemInf.dh = dh;
             //获取账套信息
             dt = (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master ", "select");
-            DataTable MasterDB = dt.Clone();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                if (DataHelper.Masters.Contains(dt.Rows[i]["ma_user"].ToString()))
-                {
-                    DataRow dr = MasterDB.NewRow();
-                    dr["ma_user"] = dt.Rows[i]["ma_user"];
-                    dr["ma_function"] = dt.Rows[i]["ma_function"];
-                    MasterDB.Rows.Add(dr);
-                }
-            }
             MasterCombox.DisplayMember = "ma_function";
             MasterCombox.ValueMember = "ma_user";
-            MasterCombox.DataSource = MasterDB;
+            MasterCombox.DataSource = dt;
             //读取上次登陆时的用户名和选择的账套
             UserName.Text = Properties.Settings.Default.LastLoginUser;
             MasterCombox.Text = Properties.Settings.Default.LastLoginMaster;

UAS-出货标签管理(标签复核)/PublicMethod/DataHelper.cs

@@ -12,8 +12,8 @@ namespace UAS_LabelMachine
     {
 
         //富为外网地址
-        private readonly string ConnectionStrings = "Data Source=jinhaode.f3322.org/orcl;User ID=HD;PassWord=select!#%*(";
-        private readonly string InnerConnectionStrings = "Data Source=jinhaode.f3322.org/orcl;User ID=HD;PassWord=select!#%*(";
+        private readonly string ConnectionStrings = "Data Source=183.62.139.106/orcl;User ID=HD;PassWord=select!#%*(";
+        private readonly string InnerConnectionStrings = "Data Source=j183.62.139.106/orcl;User ID=HD;PassWord=select!#%*(";
         //富为ERP地址
         public static readonly string ERPAddesss = "http://jinhaode.f3322.org:8099/ERP/";
         //富为FTP
@@ -1104,6 +1104,46 @@ namespace UAS_LabelMachine
             command.Dispose();
         }
 
+        /// <summary>
+        /// 调用存储过程
+        /// </summary>
+        /// <param name="ProcedureName"></param>
+        /// <param name="param"></param>
+        public void CallProcedure(string ProcedureName, DataTable upload)
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("declare barcode BarCodeUpload_arr;begin barcode:=BarCodeUpload_arr(");
+            for (int i = 0; i < upload.Rows.Count; i++)
+            {
+                //特殊语句，传递回拼接的ID给到跟新本地数据
+                sql.Append("BarCodeUpload(");
+                for (int j = 0; j < upload.Columns.Count; j++)
+                {
+                    if(upload.Columns[j].ColumnName=="PIB_ID"|| upload.Columns[j].ColumnName == "PIB_DATECODE"|| upload.Columns[j].ColumnName == "PIB_LOTNO"|| upload.Columns[j].ColumnName == "PIB_IFPICK" || upload.Columns[j].ColumnName == "PIB_IFUPLOAD")
+                    sql.Append("'" + upload.Rows[i][j].ToString() + "',");
+                }
+                sql.Remove(sql.Length - 1, 1);
+                sql.Append("),");
+            }
+            sql.Remove(sql.Length - 1, 1);
+            sql.Append(");sp_uploadbarcode(barcode);END;");
+            command = new OracleCommand();
+            command.Connection = connection;
+            command.CommandText = sql.ToString();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command.Connection = connection;
+                command.ExecuteNonQuery();
+            }
+            command.Dispose();
+        }
+
         /// <summary>
         /// 出现异常进行回滚的执行方法
         /// </summary>

UAS-出货标签管理(标签复核)/UAS_出货标签管理.cs

@@ -38,6 +38,8 @@ namespace UAS_LabelMachine
         /// 当前扫描的所在行
         /// </summary>
         int CurrentRowIndex = 0;
+
+        bool Checking = false;
         /// <summary>
         /// 正则表达式用于项目匹配
         /// </summary>
@@ -63,6 +65,8 @@ namespace UAS_LabelMachine
         //使用二维数组进行排序
         ArrayList<ArrayList<string>> ScanData;
         ArrayList<string> GetData;
+        //用于记录上一个扫描的型号，和当前的不一致则进行弹窗提示
+        string LastSpec = "";
 
         public UAS_出货标签打印(string Master)
         {
@@ -178,10 +182,10 @@ namespace UAS_LabelMachine
         private void SaveGrid_Click(object sender, EventArgs e)
         {
             DataTable savedt = (LabelInf.DataSource as DataTable);
+            savedt.EndInit();
             if (savedt != null && savedt.GetChanges() != null)
             {
-                MidSource.EndEdit();
-                dh.SaveDataTable(savedt.GetChanges(), "ProdioBarCode", "pib_id");
+                dh.CallProcedure("sp_uploadbarcode", savedt.GetChanges());
                 CheckRecheckStatus();
                 MessageBox.Show("保存成功！");
             }
@@ -258,12 +262,6 @@ namespace UAS_LabelMachine
                     return;
                 }
                 CollectInputData();
-                DataTable savedt = (LabelInf.DataSource as DataTable);
-                if (savedt != null && savedt.GetChanges() != null)
-                {
-                    MidSource.EndEdit();
-                    dh.SaveDataTable(savedt.GetChanges(), "ProdioBarCode", "pib_id");
-                }
             }
         }
 
@@ -292,11 +290,13 @@ namespace UAS_LabelMachine
                 for (int j = 0; j < arr.Length; j++)
                 {
                     string orispeccode = LabelInf.Rows[i].Cells["pr_orispeccode"].Value.ToString();
-                    Console.WriteLine((MatchStr(arr[j].ToString(), "MPN")));
-                    Console.WriteLine(MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", ""));
                     if ((MatchStr(arr[j].ToString(), "MPN").Contains(orispeccode) || MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", "").Contains(orispeccode) || orispeccode == MatchStr(arr[j].ToString(), "MPN") || LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString() == MatchStr(arr[j].ToString(), "CPN")) && LabelInf.Rows[i].Cells["pib_ifpick"].FormattedValue.ToString() != "True")
                     {
-                        CurrentRowIndex = i;
+                        if (!Checking)
+                        {
+                            CurrentRowIndex = i;
+                            Checking = true;
+                        }
                         if (CurrentRowIndex - 5 > 0)
                             LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 5;
                         else
@@ -305,6 +305,18 @@ namespace UAS_LabelMachine
                         if (Brand != "")
                             sg_brand.Text = Brand;
                         FindAutoMatch = true;
+                        if ((MatchStr(arr[j].ToString(), "MPN").Contains(orispeccode) || MatchStr(arr[j].ToString(), "MPN").Trim().Replace(" ", "").Contains(orispeccode) || orispeccode == MatchStr(arr[j].ToString(), "MPN")))
+                        {
+                            if (LastSpec == "")
+                            {
+                                LastSpec = orispeccode;
+                            }
+                            if (LastSpec != orispeccode)
+                            {
+                                LastSpec = orispeccode;
+                                MessageBox.Show("切换扫描型号" + orispeccode);
+                            }
+                        }
                         break;
                     }
                 }
@@ -419,6 +431,8 @@ namespace UAS_LabelMachine
                     dh.ExecuteSql("update prodiobarcode set pib_datecode='" + datecode + "',pib_lotno='" + lotno + "',pib_ifpick=-1 where pib_id='" + pib_id + "'", "update");
                     CheckRecheckStatus();
                     LabelInf.Invalidate();
+                    Checking = false;
+                    ProcessRemind();
                 }
                 //采集未通过的时候
                 else
@@ -481,6 +495,12 @@ namespace UAS_LabelMachine
             }
         }
 
+        private void ProcessRemind()
+        {
+            int Count = dh.getRowCount("prodiobarcode", "pib_piid=" + PI_ID + " and pib_ifpick<>0");
+            CollectedCount.Text = Count.ToString();
+        }
+
         List<string> ErrorType = new List<string>();
         /// <summary>
         /// 自定义函数 将匹配之后的值设置到Cell中,传递引用，每次赋值之后从List中移除已使用过的
@@ -519,7 +539,6 @@ namespace UAS_LabelMachine
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_orispeccode"];
                             Matchstr = MatchStr(data[j], "MPN");
                             //采集的供应商号不匹配的话
-                            Console.WriteLine(Matchstr.Trim().Replace(" ", ""));
                             if (cell.Value.ToString() == Matchstr || Matchstr.Trim().Replace(" ", "").Contains(cell.Value.ToString()) || Matchstr.Contains(cell.Value.ToString()))
                             {
                                 ErrorType.Add("OK_MPN");
@@ -713,7 +732,7 @@ namespace UAS_LabelMachine
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date,nvl(cu_needrecheck,0)cu_needrecheck from prodinout left join customer on cu_code=pi_cardcode where pi_inoutno='" + pi_inoutno.Text + "' ");
+                sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date,nvl(cu_needrecheck,0)cu_needrecheck from prodinout left join customer on cu_code=pi_cardcode where pi_invoicecode='" + pi_invoicecode.Text + "' ");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 ErrorType.Clear();
                 if (dt.Rows.Count > 0)
@@ -775,16 +794,13 @@ namespace UAS_LabelMachine
         private void LoadGridData(object sender, EventArgs e)
         {
             sql.Clear();
-            sql.Append("select 0 choose,pd_custprodcode,pd_custprodspec,pr_orispeccode,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_detail,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 ");
-            sql.Append("where pib_piid='" + PI_ID + "' order by pd_pdno");
+            sql.Append("select * from prodiobarcode_view1 where pib_piid='" + PI_ID + "'");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             MidSource.DataSource = dt;
             BaseUtil.FillDgvWithDataTable(LabelInf, (DataTable)MidSource.DataSource);
             //有数据的话默认取第一条的品牌去取采集策略
             TotalCount.Text = LabelInf.RowCount.ToString();
+            ProcessRemind();
             if (LabelInf.RowCount > 0)
             {
                 Brand = LabelInf.Rows[0].Cells["pib_brand"].FormattedValue.ToString();

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

@@ -80,8 +80,8 @@ namespace UAS_LabelMachine
                 }
                 //分页信息的DataTable
                 sql.Clear();
-                sql.Append("select " + es_field1.Substring(0, es_field1.Length - 1) + " from  prodinout left join prodiodetail on pi_id=pd_piid left join ");
-                sql.Append("chip_in_out on pd_id=io_pdid left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
+                sql.Append("select " + es_field1.Substring(0, es_field1.Length - 1) + " from chip_in_out left join prodinout on io_piid=pi_id left join prodiodetail on pi_id=pd_piid  and  pd_id=io_pdid  ");
+                sql.Append(" left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
                 sql.Append("left join CHIP_EDCDATA_VIEW on che_chipcode=ch_code left join product on pr_code=pd_prodcode left join prodiobarcode on ");
                 sql.Append("pib_piid=pi_id and pib_custbarcode=ch_code where pi_inoutno='" + inoutno + "' order by ch_code");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");

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

@@ -39,17 +39,6 @@ namespace UAS_LabelMachine
             }
             //获取账套信息
             Masterdt = (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master ", "select");
-            DataTable MasterDB = Masterdt.Clone();
-            for (int i = 0; i < Masterdt.Rows.Count; i++)
-            {
-                if (DataHelper.Masters.Contains(Masterdt.Rows[i]["ma_user"].ToString()))
-                {
-                    DataRow dr = MasterDB.NewRow();
-                    dr["ma_user"] = Masterdt.Rows[i]["ma_user"];
-                    dr["ma_function"] = Masterdt.Rows[i]["ma_function"];
-                    MasterDB.Rows.Add(dr);
-                }
-            }
             MasterCombox.DisplayMember = "ma_function";
             MasterCombox.ValueMember = "ma_user";
             MasterCombox.DataSource = Masterdt;

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

@@ -9,6 +9,9 @@ using UAS_LabelMachine.CustomControl.GroupBoxWithBorder;
 using static System.Windows.Forms.Control;
 using System.Text.RegularExpressions;
 using Seagull.BarTender.Print;
+using Microsoft.CSharp;
+using System.CodeDom.Compiler;
+using System.Reflection;
 
 namespace UAS_LabelMachine
 {
@@ -879,13 +882,52 @@ namespace UAS_LabelMachine
             {
                 GroupByCondition += "pd_ordercode,";
             }
-            if (iCustProdCode || iCustPo || iDC || iLotNo|| iOrderCode)
+            if (iCustProdCode || iCustPo || iDC || iLotNo || iOrderCode)
             {
                 GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
             }
             sql.Append("max(pib_id),");
-            Console.WriteLine("select " + sql.ToString().Substring(0, sql.Length - 1) + " from prodiobarcode where pib_inoutno = '" + pi_inoutno + "' and pib_outboxcode2 = " + (pib_outboxcode2 == "" ? "0" : pib_outboxcode2) + GroupByCondition);
             return "select " + sql.ToString().Substring(0, sql.Length - 1) + " from prodiobarcode where pib_inoutno = '" + pi_inoutno + "' and pib_outboxcode2 = " + (pib_outboxcode2 == "" ? "0" : pib_outboxcode2) + GroupByCondition;
         }
+
+        public static void CustomerInit(string oContent)
+        {
+            if (oContent == ""|| oContent=="null"|| oContent==" ")
+                return;
+            //创建编译环境实例
+            CSharpCodeProvider objCSharpCodePrivoder = new CSharpCodeProvider();
+            //UAS_LabelMachine
+            CompilerParameters objCompilerParameters = new CompilerParameters();
+            objCompilerParameters.ReferencedAssemblies.Add("System.dll");
+            objCompilerParameters.ReferencedAssemblies.Add("System.Windows.Forms.dll");
+            objCompilerParameters.GenerateExecutable = false;
+            objCompilerParameters.GenerateInMemory = true;
+
+            // 4.CompilerResults
+            CompilerResults cr = objCSharpCodePrivoder.CompileAssemblyFromSource(objCompilerParameters, oContent);
+            if (cr.Errors.HasErrors)
+            {
+                foreach (CompilerError err in cr.Errors)
+                {
+                    Console.WriteLine(err.ErrorText);
+                }
+            }
+            else
+            {
+                // 通过反射，调用HelloWorld的实例
+                Assembly objAssembly = cr.CompiledAssembly;
+                object objHelloWorld = objAssembly.CreateInstance("CustInitSpace.CustInitClass", true);
+                MethodInfo objMI = objHelloWorld.GetType().GetMethod("CustInit");
+                try
+                {
+                    objMI.Invoke(objHelloWorld, null);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(ex.StackTrace);
+                    Console.WriteLine(ex.Message);
+                }
+            }
+        }
     }
 }

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

@@ -11,30 +11,30 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        //深爱地址
-        private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
-        //深爱ERP地址
-        public static readonly string ERPAddesss = "http://172.16.0.20:8099/ERP/";
-        //深爱FTP
-        public static readonly string FTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
+        ////深爱地址
+        //private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
 
-        public static readonly string InnerFTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
-        //Oracle端口
-        public static readonly string OraclePort = "1521";
-        //需要显示的账套
-        public static readonly string Masters = "HC_TEST";   //海创外网地址
+        //private readonly string IPConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
+        ////深爱ERP地址
+        //public static readonly string ERPAddesss = "http://172.16.0.20:8099/ERP/";
+        ////深爱FTP
+        //public static readonly string FTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
 
-        //private readonly string ConnectionStrings = "Data Source=cmityj.gicp.net/orcl;User ID=HC_TEST;PassWord=select!#%*(";
-        ////海创ERP地址
-        //public static readonly string ERPAddesss = "http://cmityj.gicp.net:8099/ERP/";
-        ////海创FTP
-        //public static readonly string FTPAddress = "ftp://cmityj.gicp.net|HCFTP|Admin1@#";
-
-        //public static readonly string InnerFTPAddress = "ftp://192.168.1.8|HCFTP|Admin1@#";
+        //public static readonly string InnerFTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
         ////Oracle端口
         //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "HC_TEST";
+
+        private readonly string ConnectionStrings = "Data Source=cmityj.gicp.net/orcl;User ID=HC_TEST;PassWord=select!#%*(";
+
+        private readonly string IPConnectionStrings = "Data Source=183.237.197.78/orcl;User ID=HC_TEST;PassWord=select!#%*(";
+        //海创ERP地址
+        public static readonly string ERPAddesss = "http://cmityj.gicp.net:8099/ERP/";
+        //海创FTP
+        public static readonly string FTPAddress = "ftp://cmityj.gicp.net|HCFTP|Admin1@#";
+
+        public static readonly string InnerFTPAddress = "ftp://192.168.1.8|HCFTP|Admin1@#";
+        //Oracle端口
+        public static readonly string OraclePort = "1521";
 
         ////凯而高地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=KRG_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=112.25.154.186)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -45,20 +45,6 @@ namespace UAS_LabelMachine
         //public static readonly string InnerFTPAddress = "ftp://112.25.154.186:21|HCFTP|Admin1@#";
         ////Oracle端口
         //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "GOLDEN";
-
-        ////凯而高
-        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=KRG_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.100.12)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        ////凯而高ERP地址
-        //public static readonly string ERPAddesss = "http://192.168.100.11:8099/ERP/";
-        ////凯而高FTP
-        //public static readonly string InnerFTPAddress = "ftp://192.168.100.11:21|KEGFTP|Admin1@#";
-        //public static readonly string FTPAddress = "ftp://192.168.100.11:21|KEGFTP|Admin1@#";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "GOLDEN";
 
         ////高登地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=183.238.39.179)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -69,8 +55,6 @@ namespace UAS_LabelMachine
         //public static readonly string FTPAddress = "ftp://183.238.39.179:21|GOLDENMES|Admin1@#";
         ////Oracle端口
         //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "GOLDEN";
 
         ////怡海能达外网地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -80,8 +64,6 @@ namespace UAS_LabelMachine
         //public static readonly string FTPAddress = "ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8";
         ////Oracle端口
         //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "YHND_SZ,YHND_HK,DATACENTER";
 
         ////华商龙外网地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YITOA_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.18.115.198)(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -91,19 +73,7 @@ namespace UAS_LabelMachine
         //public static readonly string FTPAddress = "ftp://218.18.115.198:21|Print|Administrator1@#";
         ////Oracle端口
         //public static readonly string OraclePort = "1523";
-        ////需要显示的账套
-        //public static readonly string Masters = "XSQ,N_YITOA_YWC,ZXN,N_YITOA_LHCT,N_YITOA_CT,N_CHL,N_YITOA_HK,N_HUASL_SHTL,N_WILICHK,N_WILIC,N_E_SHINE_SH,N_SHBJ,N_BJKG,N_HUASL,N_HUASL_QD,N_HUASL_XM,N_HUASL_SZ";
 
-        ////UAS测试地址
-        //private readonly string ConnectionStrings = "Data Source=192.168.253.6/orcl;User ID=UAS_TEST;PassWord=select!#%*(";
-        ////UAS测试地址
-        //public static readonly string ERPAddesss = "http://192.168.253.6/uas_test/";
-        ////UAS测试FTP
-        //public static readonly string FTPAddress = "ftp://192.168.253.9/PrintFile|mesconfig|Administrator1@#";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "UAS_TEST";
         public static string DBConnectionString;
         static OracleConnection connection = null;
         static OracleCommand command = null;
@@ -130,7 +100,10 @@ namespace UAS_LabelMachine
                 }
                 connection.Open();
             }
-            catch (Exception e) { LogManager.DoLog(e.Message); }
+            catch (Exception e) {
+                connection = new OracleConnection(IPConnectionStrings);
+                connection.Open();
+                LogManager.DoLog(e.Message); }
         }
 
         /// <summary>
@@ -851,7 +824,7 @@ namespace UAS_LabelMachine
         {
             object result = null;
             command = new OracleCommand(SQL, connection);
-            Console.WriteLine(SQL);
+            //Console.WriteLine(SQL);
             //用来拼接参数的
             if (names.Length > 0)
             {

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

@@ -75,6 +75,26 @@ namespace UAS_LabelMachine.PublicMethod
             oSQL = param[1];
         }
 
+        /// <summary>
+        /// 自定义界面代码
+        /// </summary>
+        /// <param name="iPiId"></param>
+        public static void CustInit(string iPiId)
+        {
+            string oContent = "";
+            try
+            {
+                string[] param = new string[] { iPiId, oContent };
+                dh.CallProcedure("SP_CUSTINIT", ref param);
+                oContent = param[1];
+            }
+            catch (Exception)
+            {
+                
+            }
+            BaseUtil.CustomerInit(oContent);
+        }
+
         /// <summary>
         /// 获取生成条码的SQL，目前添加用户海创和凯而高，凯而高有特殊定制逻辑
         /// </summary>
@@ -196,8 +216,14 @@ namespace UAS_LabelMachine.PublicMethod
                 //累计Excel该型号的数量
                 sumqty[pr_spec] += decimal.Parse(qty);
             }
-            dt.DefaultView.Sort = "箱号,DC ";
-            dt = dt.DefaultView.ToTable();
+            DataTable temp = dt.Clone();
+            temp.Columns["箱号"].DataType = typeof(int);
+            foreach (DataRow s in dt.Rows)
+            {
+                temp.ImportRow(s);//导入旧数据
+            }
+            temp.DefaultView.Sort = "箱号,DC ";
+            dt = temp.DefaultView.ToTable();
             for (int i = 0; i < dt1.Rows.Count; i++)
             {
                 //不包含型号则进行添加

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

@@ -0,0 +1,319 @@
+/*上传数据的存储过程*/
+create or replace procedure sp_uploadbarcode(barcode in BarCodeUpload_arr)
+as
+begin 
+   for i in 1 .. barcode.count loop 
+      update prodiobarcode set pib_lotno=barcode(i).pib_lotno,
+      pib_datecode=barcode(i).pib_datecode,pib_outboxcode1=barcode(i).pib_outboxcode1,
+      pib_outboxcode2=barcode(i).pib_outboxcode2,pib_custmidboxcode=barcode(i).pib_custmidboxcode,
+      pib_custoutboxcode=barcode(i).pib_custoutboxcode,
+      pib_ifupload=barcode(i).pib_ifupload,pib_ifpick=barcode(i).pib_ifpick,
+      pib_ifprint=barcode(i).pib_ifprint
+      where pib_id=barcode(i).pib_id;
+   end loop;
+end;
+
+/*创建上传的类型*/
+create or replace type BarCodeUpload_arr as table of BarCodeUpload;
+
+/*上传的对象实体*/
+create or replace type BarCodeUpload as object(
+  pib_id varchar2(20),
+  pib_outboxcode1 varchar2(20),
+  pib_outboxcode2 varchar2(20),
+  pib_custmidboxcode varchar2(20),
+  pib_custoutboxcode varchar2(20),
+  pib_lotno varchar2(20),
+  pib_datecode varchar2(20),
+  pib_ifupload varchar2(20),
+  pib_ifpick varchar2(20),
+  pib_ifprint varchar2(20)
+);
+
+/*获取数据的视图*/
+CREATE OR REPLACE FORCE VIEW "PRODIOBARCODE_VIEW" as
+select 0 choose,pib_ordercode,pib_weight,pib_prdetail,pib_size,pd_ordercode,nvl(pr_midboxcapacity_user,0)pr_midboxcapacity_user,pi_cardcode,pr_madein,pr_vendcode,
+pib_year,pib_month,pib_day,pd_whcode,pd_batchcode,pr_barcode,pd_pdno,pr_brand,pr_detail,pd_orderdetno,pib_custoutboxcode,pib_datecode1,pd_remark,pib_custmidboxcode,
+pr_orispeccode,pi_maitou_user,pd_custprodcode,pib_indate,pi_date,pib_inoutno,pd_custprodspec,nvl(pib_ifrecheck,0)pib_ifrecheck,nvl(pib_ifupload,0)pib_ifupload,
+nvl(pib_ifmodify,0)pib_ifmodify,pd_pocode,pib_madein,pib_custbarcode,pib_id,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand,
+pr_vendprodcode,pib_lotno,pib_datecode,pib_qty,pr_spec,pi_title,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl
+(pib_ifprint,0)pib_ifprint,pd_outerboxgw,pd_outerboxnw from prodiobarcode left join prodinout on pib_piid=pi_id left join prodiodetail on pib_piid=pd_piid and  
+pd_id=pib_pdid left join product on pr_code=pib_prodcode left join sale on sa_code=pib_ordercode  order by to_number(pib_outboxcode2),pib_custoutboxcode;
+
+/*自动生成条码的存储过程*/
+create or replace PROCEDURE "GETCUSTBARCODE" 
+-- =============================================
+-- Author:    <zhangz>
+-- Create date: <2018-06-12>
+-- Description:  <出货单-过账-自动生成条码-自定义客户条码>
+-- =============================================
+(KEYVALUE in varchar2,ICID in varchar2,V_ERRORMSG OUT varchar2)
+AS
+   v_custcode varchar2(50);   --客户编号
+   v_nrcode varchar2(20);     --编码规则编号
+   v_nrddetno number;         --编码明细序号
+   v_nrdname varchar(20);     --编码明细名称
+   v_nrdtype varchar(20);     --编码明细类型
+   v_nrdsql varchar(500);     --编码明细SQL
+   v_serialindex number;      --流水所在索引
+   v_nrdlength number;        --编码明细流水长度
+   v_seriallen number;        --流水长度
+   v_sqltemp varchar(50);     --SQL查询出来的临时变量
+   v_prefix varchar(50);      --流水前面的前缀(临时)
+   v_v_prefix varchar(50);    --拼接时前缀
+   v_suffix varchar(50);      --流水的后缀
+   v_maxnum varchar(50);      --当前编号+前缀最大的流水
+   v_inoutno varchar(30);     --出货单号
+   v_getcustrule number:=0;      --是否维护了客户自定义规则
+   v_pi_id               ProdInout.pi_id%type;
+   v_p_piclass           ProdInout.pi_class%type;
+   v_p_piinoutno         ProdInout.pi_inoutno%type;
+   v_p_commitname        EMPLOYEE.EM_NAME%TYPE;
+   v_pi_inoutman         ProdInout.pi_inoutman%type;
+   v_pd_ordercode        prodiodetail.pd_ordercode%type;
+   v_pd_prodCode         prodiodetail.pd_prodcode%type;
+   v_pd_thisqty          prodiodetail.pd_outqty%type; 
+   v_pd_outqty           prodiodetail.pd_outqty%type; 
+   v_pd_id               ProdioDetail.pd_id%type;
+   v_pd_piclass          ProdioDetail.pd_piclass%type;
+   v_pd_pdno             ProdioDetail.pd_pdno%type;
+   v_max_barcode         prodiobarcode.pib_barcode%type;
+   v_max_outboxcode      prodiobarcode.pib_outboxcode1%type;
+   v_max_prodcode        prodiobarcode.pib_prodcode%type;
+   v_max_custpo          prodiobarcode.PIB_CUSTPO%type;
+   v_pib_barcode         prodiobarcode.pib_barcode%type;
+   v_pib_custbarcode     prodiobarcode.pib_custbarcode%type;
+   v_pr_zxbzs            product.pr_zxbzs%type;
+   v_pr_id               product.pr_id%type;
+   v_sa_pocode           sale.sa_pocode%type;
+   v_bar_num             NUMBER(8,0);
+   v_box_num             NUMBER(8,0); 
+   v_barcount            NUMBER:=0;  --条码数量
+   v_restqty             FLOAT:=0;  --尾盘数量
+   -- 默认箱内容量 ：3,7,10. 默认最优分配箱内容量
+   --最小包装数为1的暂时不自动生成条码
+   CURSOR c_PDIOBarCur IS
+     select pd_id,pd_pdno,pd_prodcode,pd_totalqty pd_outqty,pr_zxbzs,pd_qty pd_thisqty ,pr_id,pd_piclass, pd_ordercode,sa_pocode 
+     from PRODIOBARCODE_VIEW left join sale on sa_code=pd_ordercode 
+     where pd_piid=v_pi_id and pd_qty>0 and pr_zxbzs>1 order by pd_prodcode,pd_id;
+   --存在客户编号的时候
+   CURSOR NR IS 
+     select nrd_detno,nrd_name,nrd_type,nrd_sql,nrd_length,nr_code from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode=v_custcode order by nrd_detno;
+   --不存在客户编号取默认公用规则
+   CURSOR NR_Default IS 
+     select nrd_detno,nrd_name,nrd_type,nrd_sql,nrd_length,nr_code from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_isdefault <> 0 order by nrd_detno;
+   BEGIN 
+       BEGIN
+            select pi_id,pi_inoutno,pi_class,pi_inoutman,pi_cardcode 
+            into v_pi_id,v_p_piinoutno,v_p_piclass,v_pi_inoutman,v_custcode
+            from prodinout where  pi_id=KEYVALUE;
+       EXCEPTION
+           WHEN NO_DATA_FOUND THEN
+              V_ERRORMSG := '没有当前出入库记录!' ;
+            RETURN;
+        END; 
+        select pi_inoutno into v_inoutno from prodinout where pi_id=KEYVALUE;
+        IF(v_p_piclass='出货单') THEN  --目前只先针对出货单自动生成条码
+          --单据不存在判断
+              /*SELECT  count(1) into v_recordcount
+              FROM   prodiodetail
+              WHERE  pd_piid=v_pi_id and pd_status=0;
+              IF v_recordcount >0 THEN
+                 v_return_string := '数据错误，单据未过账成功!' ;
+                 RETURN;
+              END IF;
+              --有过一条记录就不给生成
+              select count(1)  into v_recordcount from PRODIOBARCODE where PIB_PIID=v_pi_id;
+               IF v_recordcount >0 THEN                     
+                  RETURN;
+               END IF;*/
+              --修改20170724 根据客户需求如果记录清空，重新生成，以免用户生成之后又修改数据，导致打印不了
+            delete from PRODIOBARCODE where PIB_PIID=v_pi_id;
+            OPEN NR; 
+            LOOP 
+            FETCH NR INTO v_nrddetno,v_nrdname,v_nrdtype,v_nrdsql,v_nrdlength,v_nrcode;
+            IF NR%ROWCOUNT =0 THEN
+               v_getcustrule:=1;
+            END IF;
+            --使用用户指定的规则
+            EXIT WHEN NR%NOTFOUND;
+            IF v_nrdtype='SQL' THEN  --如果是SQL则取出
+                 BEGIN
+                    v_nrdsql:=regexp_replace(v_nrdsql,'{\w+}',''''||v_inoutno||'''');
+                    execute IMMEDIATE  v_nrdsql into v_sqltemp;
+                    v_prefix:=v_prefix || v_sqltemp;
+                    v_suffix:=v_suffix || v_sqltemp;
+                 EXCEPTION
+                 WHEN OTHERS THEN
+                    BEGIN
+                      v_sqltemp:='';
+                      v_prefix:=v_prefix || v_sqltemp;
+                      v_suffix:=v_suffix || v_sqltemp;
+                    END;
+                 END;
+              END IF;
+              IF v_nrdtype='常量' THEN
+                v_prefix :=v_prefix || v_nrdsql;
+                v_suffix :=v_suffix || v_nrdsql;
+              END IF;
+              IF v_nrdtype='流水' THEN
+                --前缀和后缀正常拼接，如果中间含有流水则清除后缀的值，拼接后缀的值
+                v_nrdsql :='';
+                v_serialindex :=v_nrddetno;
+                v_suffix :='';
+                v_v_prefix :=v_prefix;
+                v_seriallen:=v_nrdlength;
+              END IF;
+            END LOOP;
+            CLOSE NR;
+            IF v_getcustrule<>0 THEN
+              OPEN NR_Default; 
+            LOOP 
+            FETCH NR_Default INTO v_nrddetno,v_nrdname,v_nrdtype,v_nrdsql,v_nrdlength,v_nrcode;
+            --使用用户指定的规则
+            EXIT WHEN NR_Default%NOTFOUND;
+            IF v_nrdtype='SQL' THEN  --如果是SQL则取出
+                 BEGIN
+                    v_nrdsql:=regexp_replace(v_nrdsql,'{\w+}',''''||v_inoutno||'''');
+                    execute IMMEDIATE  v_nrdsql into v_sqltemp;
+                    v_prefix:=v_prefix || v_sqltemp;
+                    v_suffix:=v_suffix || v_sqltemp;
+                 EXCEPTION
+                 WHEN OTHERS THEN
+                    BEGIN
+                      v_sqltemp:='';
+                      v_prefix:=v_prefix || v_sqltemp;
+                      v_suffix:=v_suffix || v_sqltemp;
+                    END;
+                 END;
+              END IF;
+              IF v_nrdtype='常量' THEN
+                v_prefix :=v_prefix || v_nrdsql;
+                v_suffix :=v_suffix || v_nrdsql;
+              END IF;
+              IF v_nrdtype='流水' THEN
+                --前缀和后缀正常拼接，如果中间含有流水则清除后缀的值，拼接后缀的值
+                v_nrdsql :='';
+                v_serialindex :=v_nrddetno;
+                v_suffix :='';
+                v_v_prefix :=v_prefix;
+                v_seriallen:=v_nrdlength;
+              END IF;
+            END LOOP;
+            CLOSE NR_Default;
+            END IF;
+            BEGIN 
+               select rmn_maxnumber into v_maxnum from RuleMaxNum  where rmn_nrcode=v_nrcode and rmn_prefix=v_prefix;
+            EXCEPTION 
+            WHEN OTHERS THEN
+              BEGIN
+                v_maxnum:=1;
+                insert into RuleMaxNum(rmn_id,rmn_maxnumber,rmn_nrcode,rmn_prefix)values(RuleMaxNum_seq.nextval,1,v_nrcode,v_prefix);
+              END;
+            END;
+            OPEN c_PDIOBarCur ;
+            LOOP  
+            FETCH c_PDIOBarCur into v_pd_id,v_pd_pdno,v_pd_prodcode,v_pd_outqty,v_pr_zxbzs,v_pd_thisqty,v_pr_id,v_pd_piclass,v_pd_ordercode,v_sa_pocode ;
+            exit when c_PDIOBarCur%NOTFOUND;               
+               -- 查询当前物料的最大的条码和箱号流水
+               select max(pib_barcode) into v_max_barcode from PRODIOBARCODE where pib_piid=v_pi_id and pib_prodcode=v_pd_prodcode;
+
+               --获取该单据的最大箱号（在同一个单据内中盒号是唯一的）
+               select max(to_number(pib_outboxcode1))into v_max_outboxcode  from prodiobarcode where pib_piid=v_pi_id;
+               IF(nvl(v_max_outboxcode,' ')<>' ')THEN 
+                      select max(PIB_PRODCODE),MAX(PIB_CUSTPO) INTO v_max_prodcode,v_max_custpo from prodiobarcode where pib_piid=v_pi_id and pib_outboxcode1=v_max_outboxcode;
+               END IF;
+
+               if(nvl(v_max_barcode,' ')<>' ') then  --计算条码流水                
+                  v_bar_num := to_number(LTRIM(substr(v_max_barcode,-4),'0'))+1;  --截取后四位，去掉前面的0,转成数字+1，可能会抛异常，无法转成数字
+               else 
+                  v_bar_num := 1;
+               end if;
+
+               --出货单最大箱号
+               if(nvl(v_max_outboxcode,' ')<>' ' and (v_max_prodcode=v_pd_prodcode and nvl(v_max_custpo,' ')=nvl(v_sa_pocode,' '))) then   --箱号
+                    v_box_num := to_number(v_max_outboxcode);                
+               else if (nvl(v_max_outboxcode,' ')<>' ') then
+                     v_box_num := to_number(v_max_outboxcode)+1; 
+                   else 
+                     v_box_num := 1;
+                   end if;
+               end if;
+
+               v_barcount := floor(v_pd_thisqty/v_pr_zxbzs);  ---获取最小包装数整数倍的条码个数
+               v_restqty  := v_pd_thisqty - v_barcount*v_pr_zxbzs; -- 取尾数箱条码数量
+               if(v_restqty >0) then 
+                  v_barcount := v_barcount+1;
+               end if ;  
+
+               for i in 1..v_barcount Loop    
+                     --判断一盒是否已经装满 ,循环查询速度很慢
+                      /*select count(1) into v_recordcount from prodiobarcode  where pib_piid=v_pi_id and PIB_OUTBOXCODE1=v_box_num ;--and pib_prodcode<>v_pd_prodcode;
+                      if(v_recordcount=10) then                           
+                            v_box_num := v_box_num+1;                     
+                      end if;*/                  
+                      v_pib_barcode := v_pd_id||'-'||v_pr_id||'-'||trim(to_char(v_bar_num,'0999')); --流水四位   pd_id-pr_id-四位流水（0001） 如  123-2345-0002格式   
+                      select replace(lpad(v_maxnum,v_seriallen),' ','0') into v_maxnum from dual ;                                                      
+                      v_pib_custbarcode := v_v_prefix || v_maxnum || v_suffix;
+                      if(i = v_barcount and v_restqty>0) then  --尾数盒
+                          insert into prodiobarcode(PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_PDNO, PIB_PDID,PIB_PICLASS,
+                          PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO)
+                          values(prodiobarcode_seq.nextval,v_pd_prodcode,sysdate,v_p_piinoutno,v_pi_id,v_pd_pdno,v_pd_id,v_pd_piclass,
+                          v_pib_barcode,v_pib_custbarcode,v_restqty,v_pr_id,v_box_num,0,0,v_pd_ordercode,v_sa_pocode); 
+                      else 
+                          insert into prodiobarcode(PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_PDNO, PIB_PDID,PIB_PICLASS,
+                          PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO)
+                          values(prodiobarcode_seq.nextval,v_pd_prodcode,sysdate,v_p_piinoutno,v_pi_id,v_pd_pdno,v_pd_id,v_pd_piclass,
+                          v_pib_barcode,v_pib_custbarcode,v_pr_zxbzs,v_pr_id,v_box_num,0,0,v_pd_ordercode,v_sa_pocode);
+                      end if;
+
+                      if(MOD(i,10) = 0 and i<>v_barcount)then  --箱号加1
+                         v_box_num := v_box_num+1;
+                      end if;                       
+                      v_bar_num := v_bar_num+1 ; --条码号加1
+                      v_maxnum := v_maxnum+1;
+                end loop;              
+            END LOOP;
+            <<Exitlabel>>
+            CLOSE c_PDIOBarCur;           
+            update RuleMaxNum set rmn_maxnumber=v_maxnum where rmn_nrcode=v_nrcode and rmn_prefix=v_prefix;
+            --记录操作日志
+            insert into messagelog (ml_id,ml_date,ml_man,ml_content,ml_result,ml_search)
+            values(messagelog_seq.nextval,sysdate,v_p_commitname,'过账自动生成条码','生成条码成功','ProdInOut!Sale|pi_id='||v_pi_id);       
+        END IF;      
+   EXCEPTION
+      WHEN OTHERS THEN
+      V_ERRORMSG :=SQLERRM || dbms_utility.format_error_backtrace();
+   END;
+
+/*自定义代码，根据不同客户进行页面设置*/
+create or replace PROCEDURE sp_custinit(
+  KeyValue in varchar2,
+  content out varchar2
+)as
+begin
+declare 
+  v_custcode varchar2(20);
+  begin
+    select pi_cardcode into v_custcode from prodinout where pi_id=KeyValue;
+      content:='
+using System; 
+ using System.Windows.Forms; 
+namespace CustInitSpace 
+{    public class CustInitClass
+    {
+        public void CustInit()  
+        {
+          Form f=Form.ActiveForm; 
+          if(f.Controls["cu_code"].Text=="C000027")
+          {
+             (f.Controls["OutBoxLabel"].Controls["DiffCustOutBoxCode"] as CheckBox).Checked = false;
+          }else
+          {
+            (f.Controls["OutBoxLabel"].Controls["DiffCustOutBoxCode"] as CheckBox).Checked = true;
+          }
+        }
+    }
+}';
+  end;
+end;

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

@@ -808,6 +808,7 @@
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
+    <Content Include="SQL\SQL.txt" />
     <Content Include="tool\Analysis.dll" />
     <Content Include="tool\DataHelper.dll" />
     <Content Include="tool\NPOI.dll" />

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

@@ -172,27 +172,6 @@ namespace UAS_LabelMachine
             PropertyInfo pi = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic);
             pi.SetValue(this.LabelInf, true, null);
             Text = Text + "-" + Master;
-            InitCustView();
-        }
-
-        public void InitCustView()
-        {
-            switch (SystemInf.Master)
-            {
-                case "N_HC":
-                    DiffCustOutBoxCode.Checked = true;
-                    break;
-                case "SZSI_TEST":
-                    BaseUtil.SetControlsVisible(pib_year, pib_month, pib_day, pib_custoutboxcode);
-                    pib_custbarcode.HeaderText = "芯片号";
-                    break;
-                case "SZSI":
-                    BaseUtil.SetControlsVisible(pib_year, pib_month, pib_day, pib_custoutboxcode);
-                    pib_custbarcode.HeaderText = "芯片号";
-                    break;
-                default:
-                    break;
-            }
         }
 
         protected override void WndProc(ref System.Windows.Forms.Message m)
@@ -1223,6 +1202,7 @@ namespace UAS_LabelMachine
                     stw = new SetLoadingWindow(thread, "正在获取打印标签");
                     BaseUtil.SetFormCenter(stw);
                     stw.ShowDialog();
+                    LogicHandler.CustInit(PI_ID);
                     //重置采集项次
                     LogManager.DoLog("输入单号【" + pi_inoutno.Text + "】");
                 }
@@ -1752,7 +1732,7 @@ namespace UAS_LabelMachine
                 sdh.BatchInsert("prodiobarcode", LabelInfDataTable);
             }
             sql.Clear();
-            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' order by "+ (SystemInf.Master.Contains("SZSI")? "pib_custbarcode":"pib_id"));
+            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "'");
             LabelInfDataTable = (DataTable)sdh.ExecuteSql(sql.ToString(), "select");
             bindingsource(LabelInf, LabelInfDataTable);
             //有数据的话默认取第一条的品牌去取采集策略