|
|
@@ -58,7 +58,7 @@ namespace SiteCore.Handler
|
|
|
|
|
|
string poscode = CurrentUser.UserPost.Post.Code;
|
|
|
DataStruct dStruct = GetPostStruct();
|
|
|
- //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\uv特殊工艺价格(1).xls");
|
|
|
+ //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\特种纸打码烫金.xls");
|
|
|
//apiHelper.Api_SyncOrderByTime("598825");
|
|
|
//apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
|
|
|
//apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
|
|
|
@@ -3785,20 +3785,23 @@ namespace SiteCore.Handler
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- string sql = string.Format("select ptid,payment from CE_ErpTradeCell where ptid in (" + string.Join(",", tids) + ") and IsSample = 2");
|
|
|
- DataTable dt_price = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
|
|
|
- if (dt_price != null && dt_price.Rows.Count > 0)
|
|
|
+ if (tids.Count > 0)
|
|
|
{
|
|
|
-
|
|
|
- foreach (DataRow dr in dt_price.Rows)
|
|
|
+ string sql = string.Format("select ptid,payment from CE_ErpTradeCell where ptid in (" + string.Join(",", tids) + ") and IsSample = 2");
|
|
|
+ DataTable dt_price = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
|
|
|
+ if (dt_price != null && dt_price.Rows.Count > 0)
|
|
|
{
|
|
|
- foreach (DataRow row in dt.Rows)
|
|
|
- {
|
|
|
|
|
|
- if (row["tid"].Equals(dr["ptid"]))
|
|
|
+ foreach (DataRow dr in dt_price.Rows)
|
|
|
+ {
|
|
|
+ foreach (DataRow row in dt.Rows)
|
|
|
{
|
|
|
- row["compenPrice"] = Convert.ToDouble(row["compenPrice"]) + Convert.ToDouble(dr["payment"]);
|
|
|
- break;
|
|
|
+
|
|
|
+ if (row["tid"].Equals(dr["ptid"]))
|
|
|
+ {
|
|
|
+ row["compenPrice"] = Convert.ToDouble(row["compenPrice"]) + Convert.ToDouble(dr["payment"]);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3918,10 +3921,12 @@ namespace SiteCore.Handler
|
|
|
if (entity != null)
|
|
|
{
|
|
|
string message = "操作成功！";
|
|
|
+ string isDown = "";
|
|
|
|
|
|
if (entity.OrderState == 6 || entity.IsHaveNewOrder == 2)
|
|
|
{
|
|
|
message = "订单有被点击下载。请注意沟通是否已下载完！";
|
|
|
+ isDown = "被点击下载";
|
|
|
}
|
|
|
if (CurrentUser.UserPost.Post.Code != "Supplier")//不是供应商打回
|
|
|
{
|
|
|
@@ -3945,8 +3950,9 @@ namespace SiteCore.Handler
|
|
|
entity.OrderState = 5;
|
|
|
}
|
|
|
entity.Update();
|
|
|
+
|
|
|
CeErpSukuraData.createInfo(entity.ctid, 5);
|
|
|
- LogHelper.addLog(entity.ctid, CurrentUser.UserID, "供应商退回下单：" + reason, entity.OrderState);
|
|
|
+ LogHelper.addLog(entity.ctid, CurrentUser.UserID, "供应商退回下单：" + reason + "-" + isDown, entity.OrderState);
|
|
|
returnSuccessMsg(message);
|
|
|
return;
|
|
|
}
|
zhuyiyi