edit

SiteCore/taobao/commonHelper.cs

@@ -1846,20 +1846,18 @@ namespace SiteCore
             }
             if (!string.IsNullOrEmpty(ctid))
             {
-
-                /* CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(ctid);
-                 if (ceErpTradeCellExtend != null && !string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id))
-                 {
-                     string result = designHelper.API_CheckOrderTo(ctid, ceErpTradeCellExtend.spu_id);
-                     if ("外协".Equals(result))
-                     {
-                         return new designApiResponseVo(200, "");
-                     }
-                     else if ("内部".Equals(result))
-                     {
-                         return new designApiResponseVo(-1, "内部设计！");
-                     }
-            }*/
+                CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(ctid);
+                if (ceErpTradeCellExtend != null)
+                {
+                    if ("外协".Equals(ceErpTradeCellExtend.ToType))
+                    {
+                        return new designApiResponseVo(200, "");
+                    }
+                    if ("内部".Equals(ceErpTradeCellExtend.ToType))
+                    {
+                        return new designApiResponseVo(-1, "设计系统判断内部");
+                    }
+                }
             }
             string info_sql = string.Format("SELECT ctid,ProductId,seller_memo FROM [dbo].[CE_ErpTradeCell] WHERE tid ='{0}'", tid);
             DataTable data = DbHelper.DbConn.ExecuteDataset(info_sql).Tables[0];
@@ -1905,6 +1903,7 @@ namespace SiteCore
         static List<int> no_design_shops = new List<int>() { 134 };
         public static designApiResponseVo checkOrderDesignInfo(CeErpTradeCell ceErpTradeCell, string post = "", DataTable dt = null)
         {
+
             if (ceErpTradeCell.DispatchSort == 2)
             {
                 return new designApiResponseVo(200, "");
@@ -2715,8 +2714,16 @@ namespace SiteCore
 
                     if (!string.IsNullOrEmpty(spu_id))
                     {
-                        string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id);
+                        CeErpTradeCell ceErpTradeCell = CeErpTradeCell.GetByCtid(ceErpTradeCellExtend.ctid);
+                        string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, ceErpTradeCell.ShopId);
                         ceErpTradeCellExtend.ToType = result;
+                        List<int> products = new List<int>() { 13, 2524, 2557, 4, 2554, 57, 19 };
+
+                        if (products.Contains(ceErpTradeCell.ProductId) || ceErpTradeCell.seller_memo.IndexOf("手绘") > -1 || ceErpTradeCell.seller_memo.IndexOf("电子稿") > -1 || ceErpTradeCell.isDianziOrder > 0)
+                        {
+                            ceErpTradeCellExtend.ToType = "外协";
+                        }
+
                     }
 
                     if (ceErpTradeCellExtend.ID == 0)
@@ -2729,7 +2736,7 @@ namespace SiteCore
                     }
                 }
             }
-            List<string> list = new List<string>() { "kevin_boz", "奥丽芙旗舰店", "鼎怡旗舰店", "格图旗舰店", "宫契旗舰店", "海角七旗舰店", "航和旗舰店", "岚恬旗舰店", "琳19890725", "领淘文具旗舰店", "麦郁旗舰店", "米笛儿旗舰店", "千方百计旗舰店", "颂盼旗舰店", "涛莱旗舰店", "腾科吉旗舰店", "万慕办公旗舰店", "喜印说旗舰店", "欣克利旗舰店", "阳光猫旗舰店", "翊喜旗舰店", "尹灵旗舰店", "悦加旗舰店", "竹范旗舰店", "卓胜旗舰店" };
+            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 + "';";

SiteCore/taobao/designHelper.cs

@@ -74,17 +74,14 @@ namespace SiteCore.Handler
             }
             string post_url = pUrl + "createOrder";
             CeErpOrderFormData formData = null;
-            if (post != "SysAdmin" && post != "Summarize")
+
+            if (!ceErpTradeCell.ctid.Contains("S_") && ceErpTradeCell.ShopId != 136)
             {
-                if (!ceErpTradeCell.ctid.Contains("S_"))
+                formData = CeErpOrderFormData.GetByTid(ceErpTradeCell.ctid.ToString());
+                if (formData == null)
                 {
-                    formData = CeErpOrderFormData.GetByTid(ceErpTradeCell.ctid.ToString());
-                    if (formData == null)
-                    {
-                        return new designApiResponseVo(-1, "请填写订单的手机号或者微信号才可指派到设计系统");
-                    }
+                    return new designApiResponseVo(-1, "请填写订单的手机号或者微信号才可指派到设计系统");
                 }
-
             }
 
             designApiResponseVo response = commonHelper.checkOrderDesignInfo(ceErpTradeCell, post);
@@ -459,8 +456,14 @@ namespace SiteCore.Handler
             }
         }
 
-        public static string API_CheckOrderTo(string orderNumber, string spuId)
+        public static string API_CheckOrderTo(string orderNumber, string spuId, int shopId)
         {
+            List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 124, 126, 127, 128 };
+            string result = "无";
+            if (!shopIds.Contains(shopId))
+            {
+                return result;
+            }
             string post_url = test_baseUrl + "api/originalOrder/discernOrder";
             System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; // 根据需要选择合适的协议版本
 
@@ -469,7 +472,6 @@ namespace SiteCore.Handler
             NameValueCollection PostVars = new NameValueCollection();
             PostVars.Add("orderNumber", orderNumber);
             PostVars.Add("spuId", spuId);
-            string result = "无";
             try
             {
                 byte[] ret = wc.UploadValues(post_url, "POST", PostVars);

SiteCore/taobao/preSalesHelper.cs

@@ -1903,8 +1903,15 @@ namespace SiteCore.Handler
                 {
                     if (!string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id))
                     {
-                        string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id);
+                        string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, entity.ShopId);
                         ceErpTradeCellExtend.ToType = result;
+                        List<int> products = new List<int>() { 13, 2524, 2557, 4, 2554, 57, 19 };
+
+                        if (products.Contains(entity.ProductId) || entity.seller_memo.IndexOf("手绘") > -1 || entity.seller_memo.IndexOf("电子稿") > -1 || entity.isDianziOrder > 0)
+                        {
+                            ceErpTradeCellExtend.ToType = "外协";
+                        }
+
                     }
                     ceErpTradeCellExtend.Create();
                 }

Web/EOrder/OrderList.aspx

@@ -152,7 +152,7 @@
     <ul id="gridMenu" class="mini-contextmenu" onbeforeopen="onBeforeOpen">
         <li name="edit" iconcls="icon-copy" onclick="onCopyOrder">复制单号</li>
         <li name="edit" iconcls="icon-copy" onclick="onCopyBuyerNick">复制旺旺号</li>
-        <li name="edit" iconcls="icon-copy" onclick="onCopyUpLoaderUrl">复制上传地址</li>
+        <li name="edit" iconcls="icon-copy" onclick="onCopyUpLoaderUrl">打开上传地址</li>
         <li name="edit" iconcls="icon-epay" onclick="onTagArrived">顺丰到付</li>
         <li name="edit" iconcls="icon-spay" onclick="onTagStarted">顺丰寄付</li>
         <li name="edit" iconcls="icon-stop" onclick="stopTagStarted">撤销顺丰</li>

Web/EOrder/js/p_order.js

@@ -1342,15 +1342,15 @@ function onCopyBuyerNick(e) {
 function onCopyUpLoaderUrl(e) {
     var rec = grid.getSelected();
     if (rec.gongchuang != 200) {
-        showToast("订单不符合要求，无法外链");
-        return;
+        //showToast("订单不符合要求，无法外链");
+        //return;
     }
     if (rec.OrderState == -1) {
         showToast("待审核订单不符合要求，无法外链");
         return;
     }
     let url = 'https://file.lingtao8.com/?tid=' + rec.ctid + "&userId=" + rec.CustomerUserId;
-    copyTextPlus(url);
+    window.open(url, '_blank');
 }
 
 function downloadFileFn(e) {

Web/Index.aspx

@@ -1,11 +1,11 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeFile="Index.aspx.cs" Inherits="Index" %>
 
 <html>
-<head>    
+<head>
     <meta charset="utf-8" />
-    <meta name="renderer" content="webkit"/>
-    <meta name="force-rendering" content="webkit"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/>
+    <meta name="renderer" content="webkit" />
+    <meta name="force-rendering" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
     <title>领淘ERP</title>
     <script src="js/boot.js?v=<%=SiteVer %>" type="text/javascript"></script>
     <link href="js/res/fonts/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
@@ -21,106 +21,113 @@
     <link href="css/view.css" rel="stylesheet" />
     <script type="text/javascript" src="js/index.js?t=<%=_t%>&v=<%=SiteVer %>"></script>
 </head>
+<script>
+    function reloadTemp() {
+        window.location.replace(window.location.href)
+    }
+</script>
 <body>
-<div class="navbar">
-    <div class="navbar-header">
-        <div class="navbar-brand" style="background-image:url(images/logo.png);background-repeat:no-repeat;background-position:center"></div>
-        <div class="navbar-brand navbar-brand-compact">ERP</div>
-    </div>
-    <ul class="nav navbar-nav">
-        <li><a id="toggle"><span class="fa fa-bars" ></span></a></li>
-       <li class="icontop"><a href="javascript:void(0)" onclick="openUserCenter()"><i class="fa fa-user-o"></i><span >个人中心</span></a></li>
-    </ul>
-    <ul class="nav navbar-nav navbar-right">
-        <li ></li>
-<%--        <li ><a href="#"><i class="fa fa-paper-plane"></i> 代办事项</a></li>--%>
+    <div class="navbar">
+        <div class="navbar-header">
+            <div class="navbar-brand" style="background-image: url(images/logo.png); background-repeat: no-repeat; background-position: center"></div>
+            <div class="navbar-brand navbar-brand-compact">ERP</div>
+        </div>
+        <ul class="nav navbar-nav">
+            <li><a id="toggle"><span class="fa fa-bars"></span></a></li>
+            <li class="icontop"><a href="javascript:void(0)" onclick="openUserCenter()"><i class="fa fa-user-o"></i><span>个人中心</span></a></li>
+        </ul>
+        <ul class="nav navbar-nav navbar-right">
+            <li></li>
+            <%--        <li ><a href="#"><i class="fa fa-paper-plane"></i> 代办事项</a></li>--%>
+            <li style="display: flex; align-items: center;"><a onclick="reloadTemp()" style="width: 120px; height: 36px; font-size: 16px; font-weight: bold; padding: 7px 5px 2px 5px;">清除缓存</a></li>
 
-        <li class="dropdown" style="margin-right:10px;">
-            <a class="user-toggle userinfo" style="line-height: 60px;cursor:pointer;padding:0px 10px;">
-                <img src="images/net.png" class="user-img" /><span class="net_span">访问外网</span><i class="fa fa-angle-down"></i>
-            </a>
-            <ul class="dropdown-menu pull-right">
-                <li><a href="#" onclick="transnet(1)"><i class="fa fa-circle-o"></i> 访问内网</a></li>
-                <li><a href="#" onclick="transnet(0)"><i class="fa fa-circle"></i> 访问外网</a></li>
-            </ul>
-        </li>
-        <asp:PlaceHolder ID="transPlace" runat="server" Visible="false">
-        <li class="dropdown" style="margin-right:10px;">
-            <a class="user-toggle userinfo" style="line-height: 60px;cursor:pointer;padding:0px 10px;">
-                <img src="images/trans.png" class="user-img" /><span class="user_span">友情链接</span><i class="fa fa-angle-down"></i>
-            </a>
-            <ul class="dropdown-menu pull-right">
-                <li><a href="#" onclick="transRole(1)"><i class="fa fa-user"></i> 报价系统</a></li>
-                <li><a href="#" onclick="transRole(2)"><i class="fa fa-user"></i> 百度</a></li>
-            </ul>
-        </li>
-        </asp:PlaceHolder>
-        
-        <li class="dropdown" style="margin-right:10px;">
-            <a class="user-toggle userinfo" style="line-height: 60px;cursor:pointer;padding:0px 10px;">
-                <img src="images/user-icon.png" class="user-img" /><span class="user_span"><asp:Literal ID="litUser" runat="server"></asp:Literal> </span><i class="fa fa-angle-down"></i>
-            </a>
-            <ul class="dropdown-menu pull-right">
-                <li><a href="#" onclick="edit_pwd()"><i class="fa fa-pencil-square-o"></i> 修改密码</a></li>
-                <li><a href="#" onclick="loginOut()"><i class="fa fa-user"></i> 退出登录</a></li>
-            </ul>
-        </li>
-    </ul>
-</div>
+            <li class="dropdown" style="margin-right: 10px;">
+                <a class="user-toggle userinfo" style="line-height: 60px; cursor: pointer; padding: 0px 10px;">
+                    <img src="images/net.png" class="user-img" /><span class="net_span">访问外网</span><i class="fa fa-angle-down"></i>
+                </a>
+                <ul class="dropdown-menu pull-right">
+                    <li><a href="#" onclick="transnet(1)"><i class="fa fa-circle-o"></i>访问内网</a></li>
+                    <li><a href="#" onclick="transnet(0)"><i class="fa fa-circle"></i>访问外网</a></li>
+                </ul>
+            </li>
+            <asp:PlaceHolder ID="transPlace" runat="server" Visible="false">
+                <li class="dropdown" style="margin-right: 10px;">
+                    <a class="user-toggle userinfo" style="line-height: 60px; cursor: pointer; padding: 0px 10px;">
+                        <img src="images/trans.png" class="user-img" /><span class="user_span">友情链接</span><i class="fa fa-angle-down"></i>
+                    </a>
+                    <ul class="dropdown-menu pull-right">
+                        <li><a href="#" onclick="transRole(1)"><i class="fa fa-user"></i>报价系统</a></li>
+                        <li><a href="#" onclick="transRole(2)"><i class="fa fa-user"></i>百度</a></li>
+                    </ul>
+                </li>
+            </asp:PlaceHolder>
 
-<div class="container">
-    <div class="sidebar">
-        <div class="sidebar-toggle"><i class = "fa fa-fw fa-dedent" ></i></div>
-        <div id="mainMenu"></div>
+            <li class="dropdown" style="margin-right: 10px;">
+                <a class="user-toggle userinfo" style="line-height: 60px; cursor: pointer; padding: 0px 10px;">
+                    <img src="images/user-icon.png" class="user-img" /><span class="user_span"><asp:Literal ID="litUser" runat="server"></asp:Literal>
+                    </span><i class="fa fa-angle-down"></i>
+                </a>
+                <ul class="dropdown-menu pull-right">
+                    <li><a href="#" onclick="edit_pwd()"><i class="fa fa-pencil-square-o"></i>修改密码</a></li>
+                    <li><a href="#" onclick="loginOut()"><i class="fa fa-user"></i>退出登录</a></li>
+                </ul>
+            </li>
+        </ul>
     </div>
-    <div class="main">
-        <div id="mainTabs" class="mini-tabs main-tabs" activeIndex="0" style="height:100%;" plain="false" maskOnLoad="false">
-            <div width="100%" name="index" url="Center.aspx" title="个人中心"></div>
+
+    <div class="container">
+        <div class="sidebar">
+            <div class="sidebar-toggle"><i class="fa fa-fw fa-dedent"></i></div>
+            <div id="mainMenu"></div>
         </div>
-<%--        <div id="tabsButtons">
+        <div class="main">
+            <div id="mainTabs" class="mini-tabs main-tabs" activeindex="0" style="height: 100%;" plain="false" maskonload="false">
+                <div width="100%" name="index" url="Center.aspx" title="个人中心"></div>
+            </div>
+            <%--        <div id="tabsButtons">
             <a class="tabsBtn"><i class="fa fa-home"></i></a>
             <a class="tabsBtn"><i class="fa fa-refresh"></i></a>
             <a class="tabsBtn"><i class="fa fa-remove"></i></a>
             <a class="tabsBtn"><i class="fa fa-arrows-alt"></i></a>
         </div>--%>
+        </div>
     </div>
-</div>
     <asp:Literal ID="litScript" runat="server"></asp:Literal>
-    <input  type="hidden" value="" id="userPostCode" />
-    <div id="pwd_win_index" class="mini-window" title="修改密码" style="width:320px;height:250px;">
-        <div class="mini-toolbar" style="border-top:0;border-left:0;border-right:0;">                
-            <a class="mini-button" iconCls="icon-save" plain="true"  onclick="savePwdFn()">保存</a>
+    <input type="hidden" value="" id="userPostCode" />
+    <div id="pwd_win_index" class="mini-window" title="修改密码" style="width: 320px; height: 250px;">
+        <div class="mini-toolbar" style="border-top: 0; border-left: 0; border-right: 0;">
+            <a class="mini-button" iconcls="icon-save" plain="true" onclick="savePwdFn()">保存</a>
         </div>
         <table class="win_tb" border="0" cellpadding="0" cellspacing="0">
             <tr>
-                <td colspan="2" style="font-size:12px;">必须包含字母、数字、特殊字符，密码长度大于6位！</td>
+                <td colspan="2" style="font-size: 12px;">必须包含字母、数字、特殊字符，密码长度大于6位！</td>
             </tr>
             <tr>
                 <td class="td1">当前密码：</td>
                 <td class="td2">
-                    <input type="password" id="tbxOldPwd"  autocomplete="off" style="width:120px" />
+                    <input type="password" id="tbxOldPwd" autocomplete="off" style="width: 120px" />
                 </td>
             </tr>
             <tr>
                 <td class="td1">新密码：</td>
                 <td class="td2">
-                    <input type="password" id="tbxNewPwd"  autocomplete="off" style="width:120px" />
+                    <input type="password" id="tbxNewPwd" autocomplete="off" style="width: 120px" />
                 </td>
             </tr>
             <tr>
                 <td class="td1">确认新密码：</td>
                 <td class="td2">
-                    <input type="password" id="tbxRNewPwd"  autocomplete="off" style="width:120px" />
+                    <input type="password" id="tbxRNewPwd" autocomplete="off" style="width: 120px" />
                 </td>
             </tr>
 
         </table>
     </div>
 
-    <div id="contextMenu" class="mini-contextmenu" >
-	    <li iconCls="icon-close" onclick="closeOtherFn">除此之外全部关闭</li>
+    <div id="contextMenu" class="mini-contextmenu">
+        <li iconcls="icon-close" onclick="closeOtherFn">除此之外全部关闭</li>
         <li class="separator"></li>
-	    <li iconCls="icon-remove" onclick="closeAllFn">全部关闭</li>
+        <li iconcls="icon-remove" onclick="closeAllFn">全部关闭</li>
     </div>
     <script type="text/javascript">