|
|
@@ -66,7 +66,7 @@ namespace SiteCore.Handler
|
|
|
DataStruct dStruct = GetPostStruct();
|
|
|
|
|
|
//string a = SecurityHelper.DecryptSymmetric("BnK3+504SQ8=");
|
|
|
- //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\(250924170328638492)-210x140mm-10个-UV转印贴彩色模切-GL-gzb520gzb-广东省-龙井《4765947843000325546-琳19890725》.ai");
|
|
|
+ //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\626262.cdr");
|
|
|
//apiHelper.Api_SyncOrderByTime("598825");
|
|
|
//apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
|
|
|
//apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
|
|
|
@@ -952,7 +952,7 @@ namespace SiteCore.Handler
|
|
|
{
|
|
|
commonHelper.sendSpuData(entity, ceErpTradeCellExtend);
|
|
|
}
|
|
|
- apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, memo, ismemoopt, false);
|
|
|
+ //apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, memo, ismemoopt, false);
|
|
|
returnSuccessMsg("保存成功!");
|
|
|
return;
|
|
|
}
|
|
|
@@ -1837,7 +1837,7 @@ namespace SiteCore.Handler
|
|
|
}
|
|
|
|
|
|
string prebill = "ltb";
|
|
|
- for (int idx = 1; idx <= billCount; idx++)
|
|
|
+ for (int idx = 1; idx <= 1; idx++)
|
|
|
{
|
|
|
string dtstr = DateTime.Now.ToString("yyyyMMddHHmmss");
|
|
|
string billoid = prebill + idx + dtstr;
|
|
|
@@ -2611,7 +2611,7 @@ namespace SiteCore.Handler
|
|
|
|
|
|
if (userid == 2125 && entity.seller_memo != "")
|
|
|
{
|
|
|
- apiDesign.API_GetPrintData_CreateOrder(entity);
|
|
|
+ //apiDesign.API_GetPrintData_CreateOrder(entity);
|
|
|
}
|
|
|
if (userid == 3542 && entity.seller_memo != "")
|
|
|
{
|
|
|
@@ -4362,8 +4362,8 @@ namespace SiteCore.Handler
|
|
|
{
|
|
|
dataHelper.api_orderBack(entity.ctid, fromType, entity.ReturnReason);
|
|
|
}
|
|
|
- CeErpSukuraData.createInfo(entity.ctid, 5);
|
|
|
- apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, entity.seller_memo, false, true, entity.ReturnReason);
|
|
|
+ //CeErpSukuraData.createInfo(entity.ctid, 5);
|
|
|
+ //apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, entity.seller_memo, false, true, entity.ReturnReason);
|
|
|
LogHelper.addLog(entity.ctid, CurrentUser.UserID, "退单:" + entity.ReturnReason, entity.OrderState);
|
|
|
if (isPlace)
|
|
|
{
|
|
|
@@ -4409,7 +4409,7 @@ namespace SiteCore.Handler
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (isNeedUpdateCell2)
|
|
|
+ /*if (isNeedUpdateCell2)
|
|
|
{
|
|
|
if (entity.MakeSupplier.IndexOf(",") != -1)
|
|
|
{
|
|
|
@@ -4423,7 +4423,7 @@ namespace SiteCore.Handler
|
|
|
sql2.AppendFormat("update ce_erptradecell2 WITH(ROWLOCK) set BackState='已打回',ReturnReason='{0}',IsReturn={2} where ID in (select top 1 ID from ce_erptradecell2 where ctid='{1}' order by ID desc)", entity.ReturnReason, entity.ctid, returnTag);
|
|
|
DbHelper.DbConn.ExecuteNonQuery(sql2.ToString());
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
|
|
|
@@ -4518,7 +4518,7 @@ namespace SiteCore.Handler
|
|
|
designHelper.API_WorkCore(apiVo);//rebutDesign
|
|
|
}
|
|
|
CeErpSukuraData.createInfo(entity.ctid, 5);
|
|
|
- apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, entity.seller_memo, false, true, entity.ReturnReason);
|
|
|
+ //apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, entity.seller_memo, false, true, entity.ReturnReason);
|
|
|
LogHelper.addLog(entity.ctid, CurrentUser.UserID, "退单:" + entity.ReturnReason, entity.OrderState);
|
|
|
|
|
|
if (isNeedUpdateCell2)
|
|
|
@@ -12715,7 +12715,7 @@ namespace SiteCore.Handler
|
|
|
{13,"数码" }, {45,"卷标" }, {31,"联单" }, {118,"海报" },
|
|
|
{71,"数码" }, {70,"uv" },{93,"金属标" },{105,"uv" },{97,"数码" },
|
|
|
{49,"暖心贴" }, {117,"手提袋" },{108,"写真布" },{44,"PVC" },{32,"扇子" },
|
|
|
- {4,"不干胶" },{106,"不干胶" },{94,"纸杯" },{100,"暖心贴" },{114,"定制衫" },{ 129,"种子纸"},{ 125,"胶带"}
|
|
|
+ {4,"不干胶" },{106,"不干胶" },{94,"纸杯" },{100,"暖心贴" },{114,"定制衫" },{ 129,"种子纸"},{ 125,"胶带"},{ 127,"PET透卡"}
|
|
|
};
|
|
|
//不统计
|
|
|
List<int> no_suppliers = new List<int>()
|
|
|
@@ -12899,7 +12899,7 @@ namespace SiteCore.Handler
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (supplierId == 80)
|
|
|
+ if (supplierId == 80 || supplierId == 126)
|
|
|
{
|
|
|
if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeTwoEnd, FinishDeliveryTime) > 0)//当天发货
|
|
|
{
|