新增自动退单

This commit is contained in:
2026-02-24 11:36:52 +08:00
parent 0ca436377a
commit 7e0a6523e5
2 changed files with 102 additions and 96 deletions
+2 -1
View File
@@ -55,6 +55,7 @@ public partial class supplierDownload : System.Web.UI.Page
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
Response.Buffer = true; Response.Buffer = true;
downloadMore(); downloadMore();
} }
@@ -359,7 +360,7 @@ public partial class supplierDownload : System.Web.UI.Page
private string getDesignDate(object v) private string getDesignDate(object v)
{ {
return DateTime.Now.ToString("yyyy-MM-dd"); return DateTime.Now.ToString("yyyy") + "\\" + DateTime.Now.ToString("MM") + "\\" + DateTime.Now.ToString("dd");
/*if (v.ToString() == "") return ""; /*if (v.ToString() == "") return "";
return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/ return Convert.ToDateTime(v).ToString("yyyy-MM-dd");*/
} }
+12 -7
View File
@@ -17,11 +17,8 @@ using System.Drawing.Imaging;
using CorelDRAW; using CorelDRAW;
using System.Security.Principal; using System.Security.Principal;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Threading;
using System.Runtime.InteropServices;
using System.Data; using System.Data;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using NHibernate.Mapping;
public partial class uploadFile : System.Web.UI.Page public partial class uploadFile : System.Web.UI.Page
{ {
@@ -247,6 +244,7 @@ public partial class uploadFile : System.Web.UI.Page
{ {
entity.MemoOpt = 0; entity.MemoOpt = 0;
} }
if (entity.payment < 500) if (entity.payment < 500)
{ {
if (entity.seller_memo.Contains("插卡") && entity.ProductCount != null && !entity.seller_memo.Contains("S_")) if (entity.seller_memo.Contains("插卡") && entity.ProductCount != null && !entity.seller_memo.Contains("S_"))
@@ -266,10 +264,12 @@ public partial class uploadFile : System.Web.UI.Page
} }
} }
if (!entity.seller_memo.Contains("出货"))
{
if (entity.payment <= 300 && num >= 200 && num <= 3000 && entity.ShopId != 14 && entity.ShopId != 99) if (entity.payment <= 300 && num >= 200 && num <= 3000 && entity.ShopId != 14 && entity.ShopId != 99)
{ {
//300克铜板纸/铜版纸300克-覆哑膜/覆膜/不覆膜-直角/裁切 //300克铜板纸/铜版纸300克-覆哑膜/覆膜/不覆膜-直角/裁切
if (!entity.seller_memo.Contains("opp") && !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("排序"))
{ {
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("不覆膜"))) 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("不覆膜")))
{ {
@@ -280,7 +280,7 @@ public partial class uploadFile : System.Web.UI.Page
} }
} }
if (entity.payment <= 100 && num > 200 && num <= 1500) if (entity.payment <= 100 && num > 500 && num <= 1500)
{ {
//数量0-1500 //数量0-1500
//0-80*54 //0-80*54
@@ -312,7 +312,10 @@ public partial class uploadFile : System.Web.UI.Page
{ {
isIn = true; isIn = true;
} }
if (width < 30 || height < 30)
{
isIn = false;
}
} }
} }
@@ -320,6 +323,7 @@ public partial class uploadFile : System.Web.UI.Page
{ {
} }
//铜版纸不干胶-覆亮膜 //铜版纸不干胶-覆亮膜
if (isIn && entity.seller_memo.Contains("铜版纸不干胶") && entity.seller_memo.Contains("覆亮膜") && !entity.seller_memo.Contains("烫金") && !entity.seller_memo.Contains("排序")) if (isIn && entity.seller_memo.Contains("铜版纸不干胶") && entity.seller_memo.Contains("覆亮膜") && !entity.seller_memo.Contains("烫金") && !entity.seller_memo.Contains("排序"))
{ {
@@ -368,6 +372,8 @@ public partial class uploadFile : System.Web.UI.Page
entity.FinishPlaceTime = DateTime.Now; entity.FinishPlaceTime = DateTime.Now;
} }
} }
}
if (entity.ProductId == 2690) if (entity.ProductId == 2690)
{ {
entity.IsVerifyToSupplier = true; entity.IsVerifyToSupplier = true;
@@ -380,7 +386,6 @@ public partial class uploadFile : System.Web.UI.Page
entity.SupplierId = 98; entity.SupplierId = 98;
entity.FinishPlaceTime = DateTime.Now; entity.FinishPlaceTime = DateTime.Now;
} }
string dPath = entity.FinishDesignTime.GetValueOrDefault().ToString("yyyyMMdd"); string dPath = entity.FinishDesignTime.GetValueOrDefault().ToString("yyyyMMdd");
//XLog.SaveLog(5, dPath); //XLog.SaveLog(5, dPath);
string sPath = Path.Combine(upPath, dPath); string sPath = Path.Combine(upPath, dPath);