修改售前获取订单去向

BizCom/Dao/CeErpTradeCell.cs

@@ -1173,12 +1173,12 @@ namespace BizCom
                 //{
                 StringBuilder sql = new StringBuilder();
                 //sql.AppendFormat("insert into S_BuChaJia(ctid,addtime) values('{0}',getdate()); ", ctid);values('{0}',getdate())
-                CeErpTradeCell ceErpTradeCell = FindFirst(Expression.Sql(string.Format("ptid='{0}'", needCtid)));
-                if (ceErpTradeCell != null)
-                {
+                //CeErpTradeCell ceErpTradeCell = FindFirst(Expression.Sql(string.Format("ptid='{0}'", needCtid)));
+                //if (ceErpTradeCell != null)
+                //{
                     sql.AppendFormat("insert into S_BuChaJia(ctid,addtime) values('{0}',getdate()); ", ctid);
                     ExecuteNonQuery(sql.ToString());
-                }
+                //}
                 //}
             }
             catch (Exception ex)

SiteCore/Handler/sync.order.cs

@@ -60,6 +60,7 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
+            //string a = SecurityHelper.DecryptSymmetric("iXI3wJyH6QXRCrZPXvZBSQ==");
             //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\uv特殊工艺价格(1).xls");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
@@ -7286,6 +7287,7 @@ namespace SiteCore.Handler
             {
                 lw.Add(string.Format("AfterSaleResSupId in ({0})", CurrentUser.User.pemVend));
                 lw.Add(string.Format("IsSupNeedAfterSale=1")); //特定的供应商才需要供应商审核；
+                lw.Add("type = 1");
                 dStruct.Order = "AfterSaleSupplierState asc,HandleTime desc";
             }
             else if (code == "logistics")
@@ -7296,6 +7298,7 @@ namespace SiteCore.Handler
             }
             else if (CurrentUser.UserPost.Post.Code == "Director" || CurrentUser.UserPost.Post.Code == "CustomerMaster" || CurrentUser.UserPost.Post.Code == "CustomerMr" || CurrentUser.UserPost.Post.Code == "DesignerMr" || CurrentUser.UserPost.Post.Code == "wxDesignerMr" || CurrentUser.UserPost.Post.Code == "Designerhd" || CurrentUser.UserPost.Post.Code == "PlaceMr")
             {
+                lw.Add("type = 0");
                 int orgid = CurrentUser.UserPost.OrgID;
                 string manageOrgIds = CurrentUser.User.ManageOrgIds;
                 if (string.IsNullOrEmpty(manageOrgIds))
@@ -7309,6 +7312,7 @@ namespace SiteCore.Handler
             }
             else
             {
+                lw.Add("type = 0");
                 lw.Add(string.Format("UserId = {0} ", CurrentUser.UserID));
             }
             dStruct.Order = "HandleTime desc,AfterSaleTime desc";

SiteCore/taobao/preSalesHelper.cs

@@ -2553,14 +2553,7 @@ namespace SiteCore.Handler
                     ceErpTradeCellExtend = commonHelper.sendSpuData(ceErpTradeCell, ceErpTradeCellExtend);
                     if (ceErpTradeCellExtend != null)
                     {
-                        if ("外协".Equals(ceErpTradeCellExtend.ToType))
-                        {
-                            result = "外协";
-                        }
-                        if ("内部".Equals(ceErpTradeCellExtend.ToType))
-                        {
-                            result = "内部";
-                        }
+                        result = ceErpTradeCellExtend.ToType;
                     }
                     if (result == "无")
                     {

ecomServer/MainForm.cs

@@ -346,7 +346,7 @@ namespace ErpServer
                                         {
                                             DataTable dataTable = SqlHelper.ExecuteDataset(string.Format("SELECT orderFrom FROM [dbo].[Ce_ErpTradeCellExtend] WHERE ctid = '{0}'", dr["ctid"].ToString())).Tables[0];
                                             int num = 0;
-                                            if (!Convert.IsDBNull(dataTable.Rows[0]["orderFrom"]))
+                                            if (dataTable!= null && !Convert.IsDBNull(dataTable.Rows[0]["orderFrom"]))
                                             {
                                                 num = Convert.ToInt16(dataTable.Rows[0]["orderFrom"]);
                                             }