修改打包上传

caiyintongload.aspx.cs

@@ -374,7 +374,10 @@ public partial class caiyingtongload : System.Web.UI.Page
 
     private string getDesignDate(object v)
     {
-        return DateTime.Now.ToString("yyyy-MM-dd");
+        int year = DateTime.Now.Year;
+        int month = DateTime.Now.Month;
+        int day = DateTime.Now.Day;
+        return year + "\\" + month + "\\" + day;
         /*if (v.ToString() == "") return "";
         return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/
     }

download.aspx.cs

@@ -266,9 +266,10 @@ public partial class download : System.Web.UI.Page
 
     private string getDesignDate(object v)
     {
-        return DateTime.Now.ToString("yyyy-MM-dd");
-        /*if (v.ToString() == "") return "";
-        return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/
+        int year = DateTime.Now.Year;
+        int month = DateTime.Now.Month;
+        int day = DateTime.Now.Day;
+        return year + "\\" + month + "\\" + day;
     }
 
     ///  批量进行多个文件压缩到一个文件

supplierBuildFile.aspx.cs

@@ -1,31 +1,20 @@
 using Aliyun.OSS;
 using Aliyun.OSS.Common;
-using Aspose.Imaging.FileFormats.Tiff.FileManagement;
 using BizCom;
 using ICSharpCode.SharpZipLib.Zip;
-using MSharp.Framework;
-using NPOI.OpenXmlFormats.Dml.Diagram;
-using NPOI.OpenXmlFormats.Shared;
-using NPOI.POIFS.Properties;
-using SiteCore.Handler;
-using SiteCore.Redis;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
-using System.Data.SqlClient;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Net;
+using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
-using System.Web.Services.Description;
-using System.Web.UI;
 
 
 public partial class supplierBuildFile : System.Web.UI.Page
@@ -67,7 +56,6 @@ public partial class supplierBuildFile : System.Web.UI.Page
         if (!IsPostBack)
         {
             Response.Buffer = true;
-
             downloadMore();
         }
     }
@@ -112,30 +100,34 @@ public partial class supplierBuildFile : System.Web.UI.Page
                 {
                     foreach (DataRow dr in dt.Rows)
                     {
+                        string zipFileName = dr["fileName"].ToString();
+                        int supplierId = 0;
                         string packId = dr["ID"].ToString();
                         try
                         {
                             CeErpTradeLog.ExecuteNonQuery(string.Format("update CE_ErpPackData set upStatus = 1 where ID= {0} ;", packId));
                             DataTable itemData = CeErpTradeCell.ExecuteDataset(string.Format("select ctid,seller_memo,FinishDesignTime,OrderState,SupplierName,OrderSn,tid,SupplierId from view_erptradecell where FinishDesignTime is not null and ctid in (SELECT ctid FROM CE_ErpPackDataItem WHERE packId = {0})", packId)).Tables[0];
                             List<string> files = new List<string>();
-                            List<string> supplierIds = new List<string>();
                             List<string> tids = new List<string>();
                             int upStatus = 3;
                             string url = "";
                             if (itemData != null && itemData.Rows.Count > 0)
                             {
+                                string suppierName = "";
                                 foreach (DataRow row in itemData.Rows)
                                 {
+                                    supplierId = Convert.ToInt32(row["SupplierId"].ToString());
                                     string finishDesignTime = getDesignTime(row["FinishDesignTime"]);
                                     string ctid = row["ctid"].ToString();
                                     string df_name = upPath + "\\" + finishDesignTime + "\\" + formatMemo(row["seller_memo"]);
                                     string ext = getCanDownFile(df_name);
+                                    suppierName = row["SupplierName"].ToString();
                                     if (string.IsNullOrEmpty(ext))
                                     {
                                         //不存在则打包失败
                                         updateSql += string.Format("update CE_ErpPackDataItem set message = '文件不存在!' where packId= {0} and ctid='{1}' ;", packId, ctid);
                                         files = new List<string>();
-                                        supplierIds = new List<string>();
+                                        supplierId = 0;
                                         break;
                                     }
                                     string fname = df_name + ext;
@@ -176,9 +168,9 @@ public partial class supplierBuildFile : System.Web.UI.Page
                                     }
                                     try
                                     {
-                                        copyFile(getDesignDate(row["FinishDesignTime"]), row["SupplierName"].ToString(), fname);
+                                        copyFile(getDesignDate(row["FinishDesignTime"]), suppierName, fname, zipFileName.Replace(".zip", ""));
                                         files.Add(fname);
-                                        supplierIds.Add(row["SupplierId"].ToString());
+                                        supplierId = 0;
                                         tids.Add("'" + ctid + "'");
                                     }
                                     catch (Exception ex)
@@ -186,7 +178,7 @@ public partial class supplierBuildFile : System.Web.UI.Page
                                         writeLog("打包复制文件出错！" + ex.Message);
                                         updateSql += string.Format("update CE_ErpPackDataItem set message = '复制文件出错!{2}' where packId= {0} and ctid='{1}' ;", packId, ctid, ex.Message);
                                         files = new List<string>();//清空数据
-                                        supplierIds = new List<string>();
+                                        supplierId = 0;
                                         break;
                                     }
                                 }
@@ -198,43 +190,10 @@ public partial class supplierBuildFile : System.Web.UI.Page
                                 else
                                 {
 
-                                    MemoryStream ms = new MemoryStream();
-                                    byte[] buffer = null;
-                                    using (ZipFile file = ZipFile.Create(ms))
-                                    {
-
-                                        file.BeginUpdate();
-                                        //file.NameTransform = new ZipNameTransform();
-                                        file.NameTransform = new MyNameTransfom();
-                                        for (int i = 0; i < files.Count; i++)
-                                        {
-                                            if (File.Exists(files[i]))
-                                            {
-                                                try
-                                                {
-                                                    string fname = Path.GetFileName(files[i]);
-                                                    if ("14".Equals(supplierIds[i]))
-                                                    {
-                                                        fname = dealMemoName(fname);
-                                                    }
-
-                                                    file.Add(files[i], fname);
-                                                }
-                                                catch (Exception ex)
-                                                {
-
-                                                }
-                                            }
-                                        }
-
-                                        file.CommitUpdate();
-                                        buffer = new byte[ms.Length];
-                                        ms.Position = 0;
-                                        ms.Read(buffer, 0, buffer.Length);   //读取文件内容(1次读ms.Length/1024M)
-                                        ms.Flush();
-                                        ms.Close();
-                                    }
-                                    url = FileOssUp(buffer, dr["fileName"].ToString());
+                                    string sourceFolder = getCopyPath(getDesignDate(""), suppierName, zipFileName.Replace(".zip", ""));
+                                    string zipFilePath = getCopyPath(getDesignDate(""), suppierName) + "\\" + zipFileName;
+                                    ZipLargeFolder(sourceFolder, zipFilePath, supplierId);
+                                    url = FileOssUpV2(zipFilePath, zipFileName);
 
                                     if (url != null)
                                     {
@@ -264,7 +223,7 @@ public partial class supplierBuildFile : System.Web.UI.Page
         //FileOssUp();
     }
 
-    private string dealMemoName(string name)
+    private static string dealMemoName(string name)
     {
         string[] al = name.Split('-');
         List<string> list = new List<string>();
@@ -300,9 +259,10 @@ public partial class supplierBuildFile : System.Web.UI.Page
         return m;
     }
 
-    private void copyFile(string date, string supplier, string file)
+    private void copyFile(string date, string supplier, string file, string zipName = "")
     {
-        string path = copyPath + "\\" + date + "\\" + supplier + "\\" + "车间下载";
+        string path = getCopyPath(date, supplier, zipName);
+
         if (!Directory.Exists(path)) Directory.CreateDirectory(path);
         string fname = Path.GetFileName(file);
         File.Copy(file, path + "\\" + fname, true);
@@ -312,6 +272,16 @@ public partial class supplierBuildFile : System.Web.UI.Page
         }
     }
 
+    private string getCopyPath(string date, string supplier, string zipName = "")
+    {
+        string path = copyPath + "\\" + date + "\\" + supplier + "\\" + "车间下载";
+        if (!string.IsNullOrEmpty(zipName))
+        {
+            path = path + "\\" + zipName;
+        }
+        return path;
+    }
+
     private string getDesignTime(object v)
     {
         if (v.ToString() == "") return "";
@@ -320,7 +290,10 @@ public partial class supplierBuildFile : System.Web.UI.Page
 
     private string getDesignDate(object v)
     {
-        return DateTime.Now.ToString("yyyy-MM-dd");
+        int year = DateTime.Now.Year;
+        int month = DateTime.Now.Month;
+        int day = DateTime.Now.Day;
+        return year + "\\" + month + "\\" + day;
         /*if (v.ToString() == "") return "";
         return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/
     }
@@ -367,6 +340,112 @@ public partial class supplierBuildFile : System.Web.UI.Page
 
         return "https://ltcloudfile.oss-cn-hangzhou.aliyuncs.com/" + objectName;
     }
+
+    private string FileOssUpV2(string filePath, string fileName)
+    {
+        // yourEndpoint填写Bucket所在地域对应的Endpoint。以华东1（杭州）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
+        var endpoint = "https://oss-cn-hangzhou.aliyuncs.com";
+        // 从环境变量中获取访问凭证。运行本代码示例之前，请确保已设置环境变量OSS_ACCESS_KEY_ID和OSS_ACCESS_KEY_SECRET。
+        var accessKeyId = "LTAI5tE7wuNkeT9jZ42bQnyr";
+        var accessKeySecret = "NnutvWhKl4HbQFSad3HosYbCkEkbjN";
+        // 填写Bucket名称，例如examplebucket。
+        var bucketName = "ltcloudfile";
+        int year = DateTime.Now.Year;
+        int month = DateTime.Now.Month;
+        int day = DateTime.Now.Day;
+        // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。
+        var objectName = "supplierFile/" + year + "/" + month + "/" + day + "/" + fileName;
+
+        // 填写Bucket所在地域对应的Region。以华东1（杭州）为例，Region填写为cn-hangzhou。
+        string region = "cn-hangzhou";
+
+        // 创建ClientConfiguration实例，按照您的需要修改默认参数。
+        var conf = new ClientConfiguration();
+
+        // 设置v4签名。
+        conf.SignatureVersion = SignatureVersion.V4;
+
+        // 创建OssClient实例。
+        var client = new OssClient(endpoint, accessKeyId, accessKeySecret, conf);
+        client.SetRegion(region);
+        var uploadId = "";
+        try
+        {
+            // 定义上传的文件及所属Bucket的名称。您可以在InitiateMultipartUploadRequest中设置ObjectMeta，但不必指定其中的ContentLength。
+            var request = new InitiateMultipartUploadRequest(bucketName, objectName);
+            var result = client.InitiateMultipartUpload(request);
+            uploadId = result.UploadId;
+
+        }
+        catch (Exception ex)
+        {
+
+            writeLog("Init multi part upload failed, {0}" + ex.Message);
+            Environment.Exit(1);
+        }
+        // 计算分片总数。
+        // 分片最小值为100 KB，最大值为5 GB。最后一个分片的大小允许小于100 KB。
+        var partSize = 10 * 1024 * 1024;
+        var fi = new FileInfo(filePath);
+        var fileSize = fi.Length;
+        var partCount = fileSize / partSize;
+        if (fileSize % partSize != 0)
+        {
+            partCount++;
+        }
+
+        var partETags = new List<PartETag>();
+        try
+        {
+            using (var fs = File.Open(filePath, FileMode.Open))
+            {
+                for (var i = 0; i < partCount; i++)
+                {
+                    var skipBytes = (long)partSize * i;
+                    // 定位到本次上传的起始位置。
+                    fs.Seek(skipBytes, 0);
+                    // 计算本次上传的分片大小，最后一片为剩余的数据大小。
+                    var size = (partSize < fileSize - skipBytes) ? partSize : (fileSize - skipBytes);
+                    var request = new UploadPartRequest(bucketName, objectName, uploadId)
+                    {
+                        InputStream = fs,
+                        PartSize = size,
+                        PartNumber = i + 1
+                    };
+                    // 调用UploadPart接口执行上传功能，返回结果中包含了这个数据片的ETag值。
+                    var result = client.UploadPart(request);
+                    partETags.Add(result.PartETag);
+                    writeLog(string.Format(fileName + "：finish {0}/{1}", partETags.Count, partCount));
+                }
+                writeLog(string.Format(fileName + "：Put multi part upload succeeded"));
+            }
+        }
+        catch (Exception ex)
+        {
+            writeLog(string.Format("Put multi part upload failed, {0}", ex.Message));
+            Environment.Exit(1);
+        }
+        // 当分片上传成功后，合并分片。
+        try
+        {
+            var completeMultipartUploadRequest = new CompleteMultipartUploadRequest(bucketName, objectName, uploadId);
+            foreach (var partETag in partETags)
+            {
+                completeMultipartUploadRequest.PartETags.Add(partETag);
+            }
+            var result = client.CompleteMultipartUpload(completeMultipartUploadRequest);
+        }
+        catch (Exception ex)
+        {
+            writeLog(string.Format("complete multi part failed, {0}", ex.Message));
+            Environment.Exit(1);
+        }
+
+        return "https://ltcloudfile.oss-cn-hangzhou.aliyuncs.com/" + objectName;
+    }
+
+
+
     ///  批量进行多个文件压缩到一个文件
     /// </summary>
     /// <param name="files">文件列表(绝对路径)</param> 这里用的数组，你可以用list 等或者
@@ -480,6 +559,83 @@ public partial class supplierBuildFile : System.Web.UI.Page
         //CeErpTradeCell.ExecuteNonQuery(sql.ToString());
     }
 
+    /// <summary>
+    /// 压缩大文件夹（分块处理）
+    /// </summary>
+    public static void ZipLargeFolder(string sourceFolder, string zipFilePath, int supplierId, CompressionLevel compressionLevel = CompressionLevel.Optimal)
+    {
+        // 参数验证
+        if (string.IsNullOrEmpty(sourceFolder))
+            throw new ArgumentNullException("sourceFolder", "源文件夹路径不能为空");
+
+        if (string.IsNullOrEmpty(zipFilePath))
+            throw new ArgumentNullException("zipFilePath", "压缩文件路径不能为空");
+
+        if (!Directory.Exists(sourceFolder))
+        {
+            throw new DirectoryNotFoundException("源文件夹不存在: " + sourceFolder);
+        }
+
+        // 确保目标目录存在
+        var zipDir = Path.GetDirectoryName(zipFilePath);
+        if (!string.IsNullOrEmpty(zipDir) && !Directory.Exists(zipDir))
+        {
+            Directory.CreateDirectory(zipDir);
+        }
+        if (File.Exists(zipFilePath))
+        {
+            File.Delete(zipFilePath);
+        }
+
+        // 使用 EnumerateFiles 减少内存使用
+        var files = Directory.EnumerateFiles(sourceFolder, "*.*", SearchOption.AllDirectories);
+
+        using (var fileStream = new FileStream(zipFilePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192))
+        using (var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Create, true))
+        {
+            foreach (var file in files)
+            {
+                try
+                {
+                    string fileName = Path.GetFileName(file);
+                    if (supplierId == 14)
+                    {
+                        fileName = dealMemoName(fileName);
+                    }
+                    // 获取相对路径
+                    string relativePath = GetRelativePath(sourceFolder, file);
+
+                    // 创建zip条目
+                    var entry = zipArchive.CreateEntry(fileName, compressionLevel);
+
+                    // 使用流写入文件内容
+                    using (var entryStream = entry.Open())
+                    using (var stream = File.OpenRead(file))
+                    {
+                        // 使用更大的缓冲区提高性能
+                        stream.CopyTo(entryStream, 81920);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 记录错误但继续处理其他文件
+                    writeLog("压缩文件失败:  错误: " + ex);
+                }
+            }
+        }
+
+    }
+
+    // 辅助方法：获取相对路径
+    private static string GetRelativePath(string basePath, string fullPath)
+    {
+        Uri baseUri = new Uri(basePath + Path.DirectorySeparatorChar);
+        Uri fullUri = new Uri(fullPath);
+        Uri relativeUri = baseUri.MakeRelativeUri(fullUri);
+        return Uri.UnescapeDataString(relativeUri.ToString()).Replace('\\', '/');
+    }
+
+
     public static void addLog(string ctid, int userid, string con, int orderState = 0, int aftersaleState = 0)
     {
         CeErpTradeLog log = new CeErpTradeLog();

supplierDownload.aspx.cs

@@ -360,9 +360,10 @@ public partial class supplierDownload : System.Web.UI.Page
 
     private string getDesignDate(object v)
     {
-        return DateTime.Now.ToString("yyyy") + "\\" + DateTime.Now.ToString("MM") + "\\" + DateTime.Now.ToString("dd");
-        /*if (v.ToString() == "") return "";
-        return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/
+        int year = DateTime.Now.Year;
+        int month = DateTime.Now.Month;
+        int day = DateTime.Now.Day;
+        return year + "\\" + month + "\\" + day;
     }
 
     ///  批量进行多个文件压缩到一个文件

uploadFile.aspx.cs

@@ -269,7 +269,7 @@ public partial class uploadFile : System.Web.UI.Page
                         if (entity.payment <= 300 && num >= 200 && num <= 3000 && entity.ShopId != 14 && entity.ShopId != 99)
                         {
                             //300克铜板纸/铜版纸300克-覆哑膜/覆膜/不覆膜-直角/裁切
-                            if (!entity.seller_memo.Contains("opp") && !entity.seller_memo.Contains("按文件") && !entity.seller_memo.Contains("流苏") && !entity.seller_memo.Contains("排序"))
+                            if (!entity.seller_memo.Contains("opp") && !entity.seller_memo.Contains("按文件") && !entity.seller_memo.Contains("流苏") && !entity.seller_memo.Contains("排序") && !entity.seller_memo.Contains("烫金"))
                             {
                                 if ((entity.seller_memo.Contains("直角") || entity.seller_memo.Contains("裁切")) && (entity.seller_memo.Contains("300克铜板纸") || entity.seller_memo.Contains("300克铜板纸")) && (entity.seller_memo.Contains("覆哑膜") || entity.seller_memo.Contains("覆膜") || entity.seller_memo.Contains("不覆膜")))
                                 {
@@ -469,7 +469,6 @@ public partial class uploadFile : System.Web.UI.Page
                     {
                         var identity = WindowsIdentity.GetCurrent();
                         var principal = new WindowsPrincipal(identity);
-                        writeLog("上传完成！" + saveFile);
                         Task.Run(async () =>
                        {
                            string filePath = Path.GetFullPath(saveFile);
@@ -528,7 +527,6 @@ public partial class uploadFile : System.Web.UI.Page
         {
             lock (lockObject)
             {
-                writeLog("开始截图！" + filePath);
                 targPath = targPath.Replace(".cdr", ".png");
                 try
                 {