添加FTP地址可配置

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

@@ -11,27 +11,28 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        ////海创外网地址
-        //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 FTPAdress = "ftp://cmityj.gicp.net|HCFTP|Admin1@#";
-        ////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!#%*(";
+        //海创ERP地址
+        public static readonly string ERPAddesss = "http://cmityj.gicp.net:8099/ERP/";
+        //海创FTP
+        public static readonly string FTPAdress = "ftp://" + Properties.Settings.Default.IPAddress + "|HCFTP|Admin1@#";
 
-        //凯而高地址
-        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)));";
-        //凯而高ERP地址
-        public static readonly string ERPAddesss = "http://112.25.154.186:8099/ERP/";
-        //凯而高FTP
-        public static readonly string FTPAdress = "ftp://112.25.154.186:21|KEGFTP|Admin1@#";
         //Oracle端口
         public static readonly string OraclePort = "1521";
         //需要显示的账套
-        public static readonly string Masters = "GOLDEN";
+        public static readonly string Masters = "HC_TEST";
+
+        ////凯而高地址
+        //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)));";
+        ////凯而高ERP地址
+        //public static readonly string ERPAddesss = "http://112.25.154.186:8099/ERP/";
+        ////凯而高FTP
+        //public static readonly string FTPAdress = "ftp://112.25.154.186: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=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)));";
@@ -363,7 +364,6 @@ namespace UAS_LabelMachine
             string sql = "select ";
             sql += AddField(Fields);
             sql += " from " + TableName + " where " + Condition;
-            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             ad.Fill(dt);

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

@@ -6,6 +6,7 @@ using NPOI.HSSF.Util;
 using NPOI.XSSF.UserModel;
 using System;
 using UAS_LabelMachine.Entity;
+using UAS_LabelMachine.PublicMethod;
 
 namespace UAS_LabelMachine
 {
@@ -64,10 +65,14 @@ namespace UAS_LabelMachine
                 {
                     // 2007版本
                     if (filePath.IndexOf(".xlsx") > 0)
+                    {
                         workbook = new XSSFWorkbook(fs);
+                    }
                     // 2003版本
                     else if (filePath.IndexOf(".xls") > 0)
+                    {
                         workbook = new HSSFWorkbook(fs);
+                    }
                     if (workbook != null)
                     {
                         sheet = workbook.GetSheetAt(0);//读取第一个sheet，当然也可以循环读取每个sheet
@@ -105,7 +110,6 @@ namespace UAS_LabelMachine
                                         dataTable.Columns.Add(column);
                                     }
                                 }
-
                                 //填充行
                                 for (int i = startRow; i <= rowCount; ++i)
                                 {

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

@@ -2349,7 +2349,7 @@ namespace UAS_LabelMachine
                 {
                     custserialnum = int.Parse(maxnum);
                 }
-                dt = ExcelHandler.ExcelToDataTable(ImportExcel.FileName, true);
+                DataTable dt = ExcelHandler.ExcelToDataTable(ImportExcel.FileName, true);
                 if (dt == null)
                 {
                     MessageBox.Show("文件" + ImportExcel.FileName + "被占用");
@@ -2414,8 +2414,11 @@ namespace UAS_LabelMachine
                     string LotNo = "";
                     if (dt.Columns.Contains("DC/LOT NO"))
                     {
-                        DateCode = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[0];
-                        LotNo = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[1];
+                        if (dt.Rows[i]["DC/LOT NO"].ToString().IndexOf("-") > 0)
+                        {
+                            DateCode = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[0];
+                            LotNo = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[1];
+                        }
                     }
                     if (dt.Columns.Contains("DC"))
                     {
@@ -2527,8 +2530,8 @@ namespace UAS_LabelMachine
                 string ErrMsg = "";
                 foreach (var item in sumqty)
                 {
-                    dt = (DataTable)dh.ExecuteSql("select nvl(sum(pd_outqty),0)pd_outqty,pr_orispeccode from prodiodetail left join product on pr_code=pd_prodcode where pd_piid=" + PI_ID + "group by pr_orispeccode", "select");
-                    dt1 = (DataTable)dh.ExecuteSql("select nvl(sum(pib_qty),0)pib_qty,pr_orispeccode  from prodiobarcode left join product on pib_prodcode=pr_code where pib_piid=" + PI_ID + " group by pr_orispeccode", "select");
+                    dt = (DataTable)dh.ExecuteSql("select nvl(sum(pd_outqty),0)pd_outqty,pr_orispeccode from prodiodetail left join product on pr_code=pd_prodcode where pd_piid='" + PI_ID + "' group by pr_orispeccode", "select");
+                    dt1 = (DataTable)dh.ExecuteSql("select nvl(sum(pib_qty),0)pib_qty,pr_orispeccode  from prodiobarcode left join product on pib_prodcode=pr_code where pib_piid='" + PI_ID + "' group by pr_orispeccode", "select");
                     DataRow[] dr = dt.Select("pr_orispeccode='" + item.Key + "'");
                     DataRow[] dr1 = dt1.Select("pr_orispeccode='" + item.Key + "'");
                     if (dr.Length > 0)
@@ -2549,16 +2552,23 @@ namespace UAS_LabelMachine
                 }
                 if (ErrMsg == "")
                 {
-                    sql.Clear();
-                    sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,pib_inman,PIB_INDATE,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_PDNO,");
-                    sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,pib_datecode,pib_lotno,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,pib_orderdetno,pib_outboxcode2,pib_custbarcode)");
-                    sql.Append(" values (prodiobarcode_seq.nextval,:pd_prodcode,'" + User.UserName + "',sysdate,'" + pi_inoutno.Text + "'");
-                    sql.Append("," + PI_ID + ",:pr_brand,:barcode,:pd_pdno,:pd_id,");
-                    sql.Append("'" + pi_class.Text + "',:pib_inqty,:pib_datecode,:pib_lotno,0,0,:pd_ordercode,'',:pd_orderdetno,:outboxcode,:custbarcode)");
-                    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" }, 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());
-                    //更新流水
-                    dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
-                    LoadGridData();
+                    if (pdprodcode.Count > 0)
+                    {
+                        sql.Clear();
+                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,pib_inman,PIB_INDATE,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_PDNO,");
+                        sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,pib_datecode,pib_lotno,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,pib_orderdetno,pib_outboxcode2,pib_custbarcode)");
+                        sql.Append(" values (prodiobarcode_seq.nextval,:pd_prodcode,'" + User.UserName + "',sysdate,'" + pi_inoutno.Text + "'");
+                        sql.Append("," + PI_ID + ",:pr_brand,:barcode,:pd_pdno,:pd_id,");
+                        sql.Append("'" + pi_class.Text + "',:pib_inqty,:pib_datecode,:pib_lotno,0,0,:pd_ordercode,'',:pd_orderdetno,:outboxcode,:custbarcode)");
+                        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" }, 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());
+                        //更新流水
+                        dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
+                        LoadGridData();
+                    }
+                    else
+                    {
+                        MessageBox.Show("解析数据不包含出货单数据，请重新导入", "提示");
+                    }
                 }
                 else
                 {
@@ -2567,6 +2577,7 @@ namespace UAS_LabelMachine
             }
             catch (Exception ex)
             {
+                LogManager.DoLog(ex.StackTrace);
                 MessageBox.Show(ex.Message);
             }
         }