edit

SiteCore/Handler/sync.getbase.cs

@@ -122,7 +122,7 @@ namespace SiteCore.Handler
                 sqlbd.AppendFormat(") as bname,pemShop from view_ErpUser");
                 sqlbd.AppendFormat(" where (PostCode like '%Designer%' or PostCode like '%Place%'or PostCode like '%Director%' or ID={1} or PostCode='SysAdmin' or PostCode='Summarize' or PostCode='CustomerMr')  and charindex((select ','+convert(varchar(10),ID)+',' from CE_ErpShop where ShopName='{0}'),','+pemShop+',')>0 and isOpen=1", penShopName, CurrentUser.UserID);
             }
-            if (cusCode != "SysAdmin" && cusCode != "Summarize")
+            if (cusCode != "SysAdmin" && cusCode != "Summarize" && CurrentUser.UserID != 73)
             {
                 sqlbd.AppendFormat(" and ID <> 3542");
             }

SiteCore/Handler/sync.order.cs

@@ -101,7 +101,7 @@ namespace SiteCore.Handler
                 }
                 ceErpTradeSpu.Update();
             }*/
-
+            //string result = designHelper.API_CheckOrderTo("12123123123132", "456456465465");
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
             string date1 = GetPostString("date1");
@@ -2428,7 +2428,12 @@ namespace SiteCore.Handler
                         }
                         if (userid == 3542 && entity.seller_memo != "")
                         {
-                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(entity, CurrentUser.UserPost.Post.Code);
+                            string userPost = CurrentUser.UserPost.Post.Code;
+                            if (CurrentUser.UserID == 73)
+                            {
+                                userPost = "SysAdmin";
+                            }
+                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(entity, userPost);
                             LogHelper.addLog(entity.ctid, 3542, "手动派单:" + response.msg, entity.OrderState);
                             if (response.msg != "设计共创：成功")
                             {
@@ -2492,6 +2497,25 @@ namespace SiteCore.Handler
             return list;
         }
 
+        public List<string> getReceiverIdByCtidLike(List<string> tids)
+        {
+            string sql = string.Format("select receiverId from CE_ErpTrade where tid in ({0})", string.Join(",", tids));
+            DataTable dataTable = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            List<string> list = new List<string>();
+            if (dataTable != null && dataTable.Rows.Count > 0)
+            {
+                foreach (DataRow item in dataTable.Rows)
+                {
+                    if (string.IsNullOrEmpty(item["receiverId"].ToString()))
+                    {
+                        continue;
+                    }
+                    list.Add("'" + item["receiverId"].ToString() + "'");
+                }
+            }
+            return list;
+        }
+
         public void get_erp_myorderlist()
         {
             DataStruct dStruct = GetPostStruct();
@@ -4289,6 +4313,11 @@ namespace SiteCore.Handler
                     if (tids.Count > 0 && tids.Count < 10)
                     {
                         tid_sql = string.Format("tid in ({0}) ", string.Join(",", tids));
+                        List<string> receiverIds = getReceiverIdByCtidLike(tids);
+                        if (receiverIds.Count > 0 && receiverIds.Count < 10)
+                        {
+                            tid_sql = string.Format("(tid in ({0}) or receiverId in ({1}))  ", string.Join(",", tids), string.Join(",", receiverIds));
+                        }
                     }
                 }
 
@@ -4450,6 +4479,11 @@ namespace SiteCore.Handler
                     if (tids.Count > 0 && tids.Count < 10)
                     {
                         tid_sql = string.Format("tid in ({0}) ", string.Join(",", tids));
+                        List<string> receiverIds = getReceiverIdByCtidLike(tids);
+                        if (receiverIds.Count > 0 && receiverIds.Count < 10)
+                        {
+                            tid_sql = string.Format("(tid in ({0}) or receiverId in ({1}))  ", string.Join(",", tids), string.Join(",", receiverIds));
+                        }
                     }
                 }
 
@@ -8340,6 +8374,12 @@ namespace SiteCore.Handler
         {
             if (UrlPostParmsCheck("id"))
             {
+                //林小连
+                if (CurrentUser.UserID == 36 || CurrentUser.UserID == 1760 || CurrentUser.UserID == 33)
+                {
+                    upd_erp_masteraftersale();
+                    return;
+                }
                 string id = GetPostString("id");
                 int st = GetPostInt("afterstate");
                 string afmemo = GetPostString("supmemo");
@@ -8391,6 +8431,7 @@ namespace SiteCore.Handler
                             apiVo.actionName = "afterOver";
                             designHelper.API_WorkCore(apiVo);     //afterOver
                         }
+
                         entity.UpdateTime = DateTime.Now;
                         entity.Update();
                         returnSuccessMsg("操作成功！");
@@ -10806,7 +10847,8 @@ namespace SiteCore.Handler
                     if (entity.OrderState == -1)
                     {
                         CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
-                        if (string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id))
+
+                        if (string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id) && !entity.ctid.Contains("N_") && !entity.ctid.Contains("S_"))
                         {
                             returnErrorMsg("订单spu没有确认无法通过审核！");
                             return;

SiteCore/taobao/commonHelper.cs

@@ -2729,7 +2729,8 @@ namespace SiteCore
                     }
                 }
             }
-            if (string.IsNullOrEmpty(spu_id))
+            List<string> list = new List<string>() { "kevin_boz", "奥丽芙旗舰店", "鼎怡旗舰店", "格图旗舰店", "宫契旗舰店", "海角七旗舰店", "航和旗舰店", "岚恬旗舰店", "琳19890725", "领淘文具旗舰店", "麦郁旗舰店", "米笛儿旗舰店", "千方百计旗舰店", "颂盼旗舰店", "涛莱旗舰店", "腾科吉旗舰店", "万慕办公旗舰店", "喜印说旗舰店", "欣克利旗舰店", "阳光猫旗舰店", "翊喜旗舰店", "尹灵旗舰店", "悦加旗舰店", "竹范旗舰店", "卓胜旗舰店" };
+            if (string.IsNullOrEmpty(spu_id) && list.IndexOf(father.seller_nick) > -1)
             {
                 string sql_pay = "update CE_ErpTradeCell with(rowlock) set orderstate=-1 where tid='" + father.tid + "';";
                 CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());

SiteCore/taobao/dataHelper.cs

@@ -667,6 +667,7 @@ namespace SiteCore.Handler
             spuInfo info = getSpuInfo(bean.ShortText1728890649488);
             if (info != null)
             {
+                return null;
                 bean.StaffSingle1728891078584 = info.StaffSingle1728891078584;
                 bean.Date1728891021647 = info.Date1728891021647;
                 bean.ShortText1729677042659 = info.ShortText1729677067460;

SiteCore/taobao/designHelper.cs

@@ -462,6 +462,7 @@ namespace SiteCore.Handler
         public static string API_CheckOrderTo(string orderNumber, string spuId)
         {
             string post_url = test_baseUrl + "api/originalOrder/discernOrder";
+            System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; // 根据需要选择合适的协议版本
 
             WebClient wc = new WebClient();
             wc.Encoding = Encoding.GetEncoding("utf-8");

SiteCore/taobao/preSalesHelper.cs

@@ -1901,6 +1901,11 @@ namespace SiteCore.Handler
                 }
                 else
                 {
+                    if (!string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id))
+                    {
+                        string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id);
+                        ceErpTradeCellExtend.ToType = result;
+                    }
                     ceErpTradeCellExtend.Create();
                 }
                 if (item.isGift == 1)

Web/EDelivery/js/pddPrintBill.js

@@ -452,7 +452,7 @@ function sendPrintData(iTag) {
     let vend_list = supperIds == null ? [] : supperIds.split(",");
     //console.log("start" + billOrderList.length);
     var item = billOrderList[iTag];
-    let suppiers = ["97", "98","119","3"];
+    let suppiers = ["97", "98", "119", "3"];
     let intersection = vend_list.length == 0 ? [] : suppiers.filter(function (v) { return vend_list.indexOf(v) > -1 });
     if (intersection.length > 0) {
         checkOrderSplit(item, iTag)
@@ -627,7 +627,7 @@ function checkOrderSplit(item, iTag) {
                 </table>
             </div>
             <style>.mini-messagebox-content td{font-size:14px;padding: 5px;}.mini-panel-body{overflow-y: scroll !important;}</style>`;
-                let btns = islast ? ["合并打单", isNumber ? "同号等待" : "取号等待", "取消打印"] : [isNumber ? "同号等待" : "取号等待", "取消打印"];
+                let btns = ["合并打单", isNumber ? "同号等待" : "取号等待", "取消打印"];
                 mini.showMessageBox({
                     title: "合包提示！",
                     iconCls: "mini-messagebox-question",

Web/EDelivery/js/printBill.js

@@ -618,7 +618,7 @@ function checkOrderSplit(item, iTag) {
             </div>
             <style>.mini-messagebox-content td{font-size:14px;padding: 5px;}.mini-panel-body{overflow-y: scroll !important;}</style>`;
 
-                let btns = islast ? ["合并打单", isNumber ? "同号等待" : "取号等待", "取消打印"] : [isNumber ? "同号等待" : "取号等待", "取消打印"];
+                let btns = ["合并打单", isNumber ? "同号等待" : "取号等待", "取消打印"];
                 mini.showMessageBox({
                     title: "合包提示！",
                     iconCls: "mini-messagebox-question",