This commit is contained in:
2025-04-30 23:48:07 +08:00
parent b40b82d812
commit 8b845a27c2
61 changed files with 29041 additions and 3462 deletions
+29 -3
View File
@@ -217,8 +217,14 @@ public partial class uploadFile : System.Web.UI.Page
entity.FinishDesignTime = DateTime.Now;
if (entity.isDianziOrder == 1 || entity.ProductId == 57 || entity.ProductId == 28)
{
entity.OrderState = 7;
commonHelper.setOrderDummyDelivery(entity.tid);
entity.OrderState = 6;
entity.SupplierId = 35;
entity.FinishPlaceTime = DateTime.Now;
bool sendResult = commonHelper.SetOrderDummyDelivery(entity.tid);
if (sendResult)
{
entity.OrderState = 7;
}
}
else
entity.OrderState = 5; //设计完成
@@ -264,7 +270,7 @@ public partial class uploadFile : System.Web.UI.Page
entity.FinishPlaceTime = DateTime.Now;
}
}
if (((entity.seller_memo.Contains("条幅彩色") && !entity.seller_memo.Contains("辽宁") && !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("山东")) || entity.seller_memo.Contains("贡锻布") || entity.seller_memo.Contains("贡缎布") || entity.seller_memo.Contains("旗帜布")) && !entity.seller_memo.Contains("双喷"))
{
entity.IsVerifyToSupplier = true;
entity.SupplierId = 98;
@@ -310,7 +316,27 @@ public partial class uploadFile : System.Web.UI.Page
CeErpTradeCell.UpdateRelationOrder(entity.ctid);
CeErpTradeLog.AddLog(entity.ctid, entity.OrderState, userId, "上传设计文件-" + saveFile);
if (ctid.IndexOf("S_") >= -1)
{
StringBuilder sql = new StringBuilder();
sql.AppendFormat("select * from Ce_ErpTradeCellExtend where ctid='{0}'", entity.ctid);
DataTable cellEx = CeErpTradeCell.ExecuteDataset(sql.ToString()).Tables[0];
if (cellEx.Rows.Count > 0)
{
string txtReprintTime = cellEx.Rows[0]["ReprintTime"].ToString();
if (!string.IsNullOrEmpty(txtReprintTime) && !"null".Equals(txtReprintTime))
{
DateTime reprint = DateTime.Parse(txtReprintTime);
if (DateTime.Compare(DateTime.Now.AddHours(-24), reprint) >= 0)
{
string parentId = entity.ctid.Substring(2);
string update_sql = string.Format("update Ce_ErpTradeAfterSaleExtend set ReprintOut = ReprintOut+1 where tid= '{0}' ;", parentId);
CeErpTradeLog.ExecuteNonQuery(update_sql);
}
}
}
}
if (Path.GetExtension(saveFile).IndexOf("cdr", StringComparison.OrdinalIgnoreCase) != -1)
{
//string sql = string.Format("insert into s_cdrtopng(name,addtime)values('{0}',getdate()) ;", saveFile);