edit
This commit is contained in:
+1
-1
@@ -204,7 +204,7 @@ public partial class autocopy : System.Web.UI.Page
|
|||||||
//CeErpTradeLog.ExecuteNonQuery(sqlpng);
|
//CeErpTradeLog.ExecuteNonQuery(sqlpng);
|
||||||
}
|
}
|
||||||
CeErpTradeLog.AddLog(newctid, 5, userId, "自动上传老客户文件-" + newPathFileName);
|
CeErpTradeLog.AddLog(newctid, 5, userId, "自动上传老客户文件-" + newPathFileName);
|
||||||
string fileSql = string.Format("INSERT INTO [dbo].[CE_ErpTradeCellFile]([tid], [ctid], [isDel], [url], [createtime], [type]) SELECT '{0}', '{1}', isDel ,url,getdate(),type FROM [dbo].[CE_ErpTradeCellFile] WHERE tid='{2}' and ctid='{3}' and isDel = 0 and type = 'AUTH_FILE'", dtnew.Rows[0]["tid"], dtnew.Rows[0]["ctid"], dt.Rows[0]["tid"], dt.Rows[0]["ctid"]);
|
string fileSql = string.Format("INSERT INTO [dbo].[CE_ErpTradeCellFile]([tid], [ctid], [isDel], [url], [createtime], [type]) SELECT '{0}', '{1}', isDel ,url,getdate(),type FROM [dbo].[CE_ErpTradeCellFile] WHERE tid='{2}' and ctid='{3}' and isDel = 0 and type = 'AUTH_FILE'", dtnew.Rows[0]["tid"], dtnew.Rows[0]["tid"], dt.Rows[0]["tid"], dt.Rows[0]["tid"]);
|
||||||
CeErpTradeCell.ExecuteNonQuery(fileSql);
|
CeErpTradeCell.ExecuteNonQuery(fileSql);
|
||||||
conSuc("文件已上传到共享目录");
|
conSuc("文件已上传到共享目录");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -158,17 +158,20 @@ public partial class supplierBuildFile : System.Web.UI.Page
|
|||||||
if (result != 1)
|
if (result != 1)
|
||||||
{
|
{
|
||||||
addLog(ctid, userId, "初始化秘钥失败" + result, 0);
|
addLog(ctid, userId, "初始化秘钥失败" + result, 0);
|
||||||
|
updateSql += string.Format("update CE_ErpPackDataItem set message = '解密失败!' where packId= {0} and ctid='{1}' ;", packId, ctid);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
uint a = DecFile(fname);
|
uint a = DecFile(fname);
|
||||||
if (a != 0)
|
if (a != 0)
|
||||||
{
|
{
|
||||||
addLog(ctid, userId, "解密失败" + a, 0);
|
addLog(ctid, userId, "解密失败" + a, 0);
|
||||||
|
updateSql += string.Format("update CE_ErpPackDataItem set message = '解密失败!' where packId= {0} and ctid='{1}' ;", packId, ctid);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (string.IsNullOrEmpty(fname))
|
if (string.IsNullOrEmpty(fname))
|
||||||
{
|
{
|
||||||
|
updateSql += string.Format("update CE_ErpPackDataItem set message = '解密失败!' where packId= {0} and ctid='{1}' ;", packId, ctid);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
|
|||||||
+7
-2
@@ -276,7 +276,7 @@ public partial class uploadFile : System.Web.UI.Page
|
|||||||
entity.FinishPlaceTime = DateTime.Now;
|
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("旗帜布")) && !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.seller_memo.Contains("帆布") && !entity.seller_memo.Contains("帆布袋")))
|
||||||
{
|
{
|
||||||
entity.IsVerifyToSupplier = true;
|
entity.IsVerifyToSupplier = true;
|
||||||
entity.SupplierId = 98;
|
entity.SupplierId = 98;
|
||||||
@@ -290,7 +290,12 @@ public partial class uploadFile : System.Web.UI.Page
|
|||||||
entity.SupplierId = 97;
|
entity.SupplierId = 97;
|
||||||
entity.FinishPlaceTime = DateTime.Now;
|
entity.FinishPlaceTime = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
if(entity.ProductId == 2701)
|
||||||
|
{
|
||||||
|
entity.IsVerifyToSupplier = true;
|
||||||
|
entity.SupplierId = 98;
|
||||||
|
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user