edit

SiteCore/Handler/sync.getbase.cs

@@ -104,7 +104,7 @@ namespace SiteCore.Handler
                 sqlbd.AppendFormat(") as bname,pemShop from view_ErpUser");
                 sqlbd.AppendFormat(" where (PostCode like 'Designer%' or PostCode like 'wxDesigner%' or ID={0} or PostCode='SysAdmin'  ) and isOpen=1 ", CurrentUser.UserID);
             }
-            else if (cusCode == "SysAdmin" || cusCode == "Summarize" || cusCode == "CustomerMr")
+            else if (cusCode == "SysAdmin" || cusCode == "Summarize" || cusCode == "CustomerMr" || cusCode == "HumanResMr")
             {
                 sqlbd.AppendFormat("select id, (name+'_'+");
                 sqlbd.AppendFormat("(select convert(varchar,count(ctid)) from view_erptradecell where designuserid=view_ErpUser.id and orderstate=4)");

SiteCore/Handler/sync.order.cs

@@ -4196,6 +4196,24 @@ namespace SiteCore.Handler
             dStruct.Order = "MemoOpt desc,IsSF desc, FinishPlaceTime desc, ctid desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_erptradecell", dStruct);
+            /*if (tid.Length > 0)
+            {
+                List<string> tids = new List<string>();
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    foreach (DataRow item in dt.Rows)
+                    {
+                        tids.Add("'" + item["tid"] + "'");
+                    }
+                }
+                if (tids.Count > 0)
+                {
+                    lw.RemoveAt(0);
+                    lw.Add(string.Format("tid in ({0})", string.Join(", ", tids)));
+                    dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+                    dt = WebCache.GetData("view_erptradecell", dStruct);
+                }
+            }*/
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }
 
@@ -4253,6 +4271,24 @@ namespace SiteCore.Handler
             dStruct.Order = "MemoOpt desc,IsSF desc, FinishPlaceTime desc, ctid desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_erptradecell", dStruct);
+            /*if (tid.Length > 0)
+            {
+                List<string> tids = new List<string>();
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    foreach (DataRow item in dt.Rows)
+                    {
+                        tids.Add("'" + item["tid"] + "'");
+                    }
+                }
+                if (tids.Count > 0)
+                {
+                    lw.RemoveAt(0);
+                    lw.Add(string.Format("tid in ({0})", string.Join(", ", tids)));
+                    dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+                    dt = WebCache.GetData("view_erptradecell", dStruct);
+                }
+            }*/
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }
 
@@ -4976,6 +5012,24 @@ namespace SiteCore.Handler
             dStruct.Order = "MemoOpt desc, FinishPlaceTime desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_erptradecell", dStruct);
+            /*if (tid.Length > 0)
+            {
+                List<string> tids = new List<string>();
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    foreach (DataRow item in dt.Rows)
+                    {
+                        tids.Add("'" + item["tid"] + "'");
+                    }
+                }
+                if (tids.Count > 0)
+                {
+                    lw.Remove(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
+                    lw.Add(string.Format("tid in ({0})", string.Join(", ", tids)));
+                    dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+                    dt = WebCache.GetData("view_erptradecell", dStruct);
+                }
+            }*/
             if (dt != null)
             {
                 foreach (DataRow dr in dt.Rows)
@@ -5053,6 +5107,24 @@ namespace SiteCore.Handler
             dStruct.Order = "MemoOpt desc, FinishPlaceTime desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_erptradecell", dStruct);
+           /* if (tid.Length > 0)
+            {
+                List<string> tids = new List<string>();
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    foreach (DataRow item in dt.Rows)
+                    {
+                        tids.Add("'" + item["tid"] + "'");
+                    }
+                }
+                if (tids.Count > 0)
+                {
+                    lw.Remove(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
+                    lw.Add(string.Format("tid in ({0})", string.Join(", ", tids)));
+                    dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+                    dt = WebCache.GetData("view_erptradecell", dStruct);
+                }
+            }*/
             foreach (DataRow dr in dt.Rows)
             {
                 dr["receiver_address"] = dr["receiver_name"].ToString() + "   " + dr["receiver_mobile"].ToString() + "   " + dr["receiver_state"].ToString() + dr["receiver_city"].ToString() + dr["receiver_district"].ToString() + dr["receiver_address"].ToString();
@@ -11870,7 +11942,7 @@ namespace SiteCore.Handler
                     DateTime FinishDeliveryTime = DateTime.Parse(row["FinishDeliveryTime"].ToString());
                     if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
                     {
-                        if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                        if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeTwoEnd, FinishDeliveryTime) > 0)//当天发货
                         {
                             map["today"]++;
                         }
@@ -12352,6 +12424,10 @@ namespace SiteCore.Handler
                 string shopid = CurrentUser.User.pemShop;
                 lw.Add(string.Format("shopId in ({0})", shopid));
             }
+            if ("AfterSale".Equals(poscode) || "AfterSaleMaster".Equals(poscode))
+            {
+                lw.Add("IssueState = 1");
+            }
             lw.Add("IssueState > 0");
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_ErpTradeCellIssue", dStruct);

SiteCore/taobao/commonHelper.cs

@@ -269,7 +269,7 @@ namespace SiteCore
                     //用昵称找之前的订单
                     string name = ceErpTrade.buyer_nick;
                     StringBuilder CeErpTradeSql = new StringBuilder();
-                    CeErpTradeSql.AppendFormat("select top 1 * from ce_erptrade o left join CE_ErpTradeCell c on c.tid=o.tid where o.buyer_nick='{0}' and o.tid <> '{1}' and c.SupplierId <> 35 order by created desc;", name, trade.tid);
+                    CeErpTradeSql.AppendFormat("select top 1 * from ce_erptrade o left join CE_ErpTradeCell c on c.tid=o.tid where o.buyer_nick='{0}' and o.tid <> '{1}' and c.SupplierId <> 35 AND c.SupplierId <> 33 order by created desc;", name, trade.tid);
                     DataSet data = DbHelper.DbConn.ExecuteDataset(CeErpTradeSql.ToString());
                     DataTable datatable = data.Tables[0];
 

SiteCore/taobao/preSalesHelper.cs

@@ -287,6 +287,175 @@ namespace SiteCore.Handler
             }
             returnErrorMsg("缺少必要的参数ctid");
         }
+        /// <summary>
+        /// 转单
+        /// </summary>
+        public void upd_erp_transcustomer()
+        {
+            if (UrlPostParmsCheck("ctid"))
+            {
+                string eid = GetPostString("ctid");
+                int customerUserId = GetPostInt("CustomerUserId");
+                int userid = GetPostInt("UserID");
+                CeErpTradeCell entity = null;
+                if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
+                if (entity != null)
+                {
+
+                    entity.CustomerUserId = customerUserId;
+
+                    entity.Update();
+                    returnSuccessMsg("操作成功！");
+                    LogHelper.addLog(entity.ctid, userid, "转单给其他客服" + userid, entity.OrderState);
+                    return;
+                }
+
+                returnErrorMsg("找不到记录");
+            }
+        }
+        /// <summary>
+        /// 推购审核
+        /// </summary>
+        public void upd_erp_staygoods()
+        {
+            if (UrlPostParmsCheck("id"))
+            {
+                int eid = GetPostInt("id");
+                int userid = GetPostInt("UserID");
+                string name = GetPostString("name");
+                CeErpStayGoods entity = null;
+                if (eid != 0) entity = CeErpStayGoods.GetStayId(eid);
+                if (entity != null)
+                {
+                    entity.audit_type = 1;
+                    entity.audit_time = DateTime.Now;
+                    entity.audit_u_id = userid;
+                    entity.audit_u_name = name;
+                    entity.Update();
+                    returnSuccessMsg("审核成功！");
+                    return;
+                }
+                returnErrorMsg("找不到订单记录");
+            }
+        }
+        /// <summary>
+        /// 推购退回
+        /// </summary>
+        public void upd_erp_stayGoodsback()
+        {
+            if (UrlPostParmsCheck("id"))
+            {
+                int eid = GetPostInt("id");
+                int userid = GetPostInt("UserID");
+                string name = GetPostString("name");
+                CeErpStayGoods entity = null;
+                if (eid != 0) entity = CeErpStayGoods.GetStayId(eid);
+                if (entity != null)
+                {
+                    entity.audit_text = GetPostString("reason");
+                    entity.audit_type = 2;
+                    entity.audit_time = DateTime.Now;
+                    entity.audit_u_id = userid;
+                    entity.audit_u_name = name;
+                    entity.Update();
+                    returnSuccessMsg("退回成功！");
+                    return;
+                }
+                returnErrorMsg("找不到订单记录");
+            }
+        }
+        /// <summary>
+        /// 取消推购
+        /// </summary>
+        public void upd_erp_ordertag_cancel()
+        {
+            if (UrlPostParmsCheck("ctid"))
+            {
+                int userid = GetPostInt("UserID");
+                string eid = GetPostString("ctid");
+                CeErpTradeCell entity = null;
+                if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
+                if (entity != null)
+                {
+                    entity.wechatTag = 0;
+                    entity.Update();
+                    CeErpStayGoods pers = CeErpStayGoods.GetByTid(entity.tid);
+                    if (pers != null)
+                    {
+                        pers.status = "取消推购";
+                        pers.audit_type = 3;
+                        pers.Update();
+
+                    }
+                    LogHelper.addLog(entity.ctid, userid, "取消：推多推购");
+                    returnSuccessMsg("标记成功！");
+                    return;
+                }
+
+                returnErrorMsg("找不到记录");
+            }
+
+        }
+        /// <summary>
+        /// 获取推购列表
+        /// </summary>
+        public void get_erp_staygoods()
+        {
+            DataStruct dStruct = GetPostStruct();
+
+
+            int userId = GetPostInt("UserId");
+
+            CeErpUser ceErpUser = CeErpUser.Get(userId);
+            if (ceErpUser == null)
+            {
+                returnErrorMsg("查无该用户");
+                return;
+            }
+            List<string> lw = new List<string>();
+            string tid = GetPostString("tid");
+            if (tid.Length > 0) lw.Add(string.Format("tid like '%{0}%'", tid));
+
+            string shopname = GetPostString("shopname");
+            if (shopname.Length > 0) lw.Add(string.Format("shop_name like '%{0}%'", shopname));
+
+            string wangwang = GetPostString("wangwang");
+            if (wangwang.Length > 0) lw.Add(string.Format("wangwang like '%{0}%'", wangwang));
+
+            string customer = GetPostString("customer");
+            if (customer.Length > 0) lw.Add(string.Format("create_u_name like '%{0}%'", customer));
+
+            string returndate1 = GetPostString("returndate1");
+            string returndate2 = GetPostString("returndate2");
+            string dw = GetDateMinuteWhere("creata_time", returndate1, returndate2);
+            if (dw.Length > 0) lw.Add(dw);
+
+            string finishDate1 = GetPostString("finishdate1");
+            string finishDate2 = GetPostString("finishdate2");
+            string dw_finish = GetDateMinuteWhere("audit_time", finishDate1, finishDate2);
+            if (dw_finish.Length > 0) lw.Add(dw_finish);
+
+            string returnvstate = GetPostString("returnvstate");
+            if (returnvstate.Length > 0) lw.Add(string.Format("audit_type={0}", Convert.ToInt32(returnvstate)));
+
+            string persuadetype = GetPostString("persuadetype");
+            if (persuadetype.Length > 0) lw.Add(string.Format("stay_type like '%{0}%'", persuadetype));
+            string customerOrg = GetPostString("customerOrg");
+            if (customerOrg.Length > 0)
+            {
+                lw.Add(string.Format("OrgID = {0}", customerOrg));
+            }
+            if (ceErpUser != null && ceErpUser.ManageOrgIds.Length > 0)
+            {
+                lw.Add(string.Format("OrgId in ({0}) ", ceErpUser.ManageOrgIds));
+            }
+
+            dStruct.Order = "creata_time desc";
+            dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+            DataTable dt = WebCache.GetData("view_ErpStayGoods", dStruct);
+            ReturnSuccess("{" + string.Format("\"total\":{0},\"data\":{1}", dStruct.TotalCount, Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt)) + "}");
+
+        }
         /**
          * 预发货
          * ctid

Web/EDelivery/js/DeliveredList.js

@@ -33,9 +33,39 @@ function memoRenderer(e) {
     replace_list.forEach(item => {
         memo = memo.replace(item[0], item[1]);
     })
-    var html = "<div class='white-space' ondblclick=\"copyText(this)\">" + memo + "</div>";
+    var html = "<div class='white-space' ondblclick=\"copyText(this)\" data-ctid = \"" + record.ctid + "\">" + memo + "</div>";
     return html;
 }
+function copyText(obj) {
+    var div = obj;
+    var rec = grid.getSelected();
+    let text = div.innerText;
+    let ctid = div.dataset.ctid;
+    div.innerText = text + "《" + ctid + "》";
+    if (document.body.createTextRange) {
+        var range = document.body.createTextRange();
+        range.moveToElementText(div);
+        range.select();
+    } else if (window.getSelection) {
+        var selection = window.getSelection();
+        var range = document.createRange();
+        range.selectNodeContents(div);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    } else {
+        //console.warn("none");
+        return;
+    }
+    document.execCommand("Copy");
+    div.innerText = text;
+    mini.showTips({
+        content: "复制成功！",
+        state: "danger",
+        x: "Center",
+        y: "Center",
+        timeout: 1000
+    });
+}
 function viewCdrImg(id) {
     var rec = grid.getSelected();
     if (rec.OrderState < 5) {

Web/EDelivery/js/PddDelivered.js

@@ -33,9 +33,40 @@ function memoRenderer(e) {
     replace_list.forEach(item => {
         memo = memo.replace(item[0], item[1]);
     })
-    var html = "<div class='white-space' ondblclick=\"copyText(this)\">" + memo + "</div>";
+    var html = "<div class='white-space' ondblclick=\"copyText(this)\" data-ctid = \"" + record.ctid + "\">" + memo + "</div>";
     return html;
 }
+function copyText(obj) {
+    var div = obj;
+    var rec = grid.getSelected();
+    let text = div.innerText;
+    let ctid = div.dataset.ctid;
+    div.innerText = text + "《" + ctid + "》";
+    if (document.body.createTextRange) {
+        var range = document.body.createTextRange();
+        range.moveToElementText(div);
+        range.select();
+    } else if (window.getSelection) {
+        var selection = window.getSelection();
+        var range = document.createRange();
+        range.selectNodeContents(div);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    } else {
+        //console.warn("none");
+        return;
+    }
+    document.execCommand("Copy");
+    div.innerText = text;
+    mini.showTips({
+        content: "复制成功！",
+        state: "danger",
+        x: "Center",
+        y: "Center",
+        timeout: 1000
+    });
+}
+
 function viewCdrImg(id) {
     var rec = grid.getSelected();
     if (rec.OrderState < 5) {

Web/EDelivery/js/PddDelivering.js

@@ -37,9 +37,39 @@ function memoRenderer(e) {
     replace_list.forEach(item => {
         memo = memo.replace(item[0], item[1]);
     })
-    var html = "<div class='white-space' ondblclick=\"copyText(this)\">" + memo + "</div>";
+    var html = "<div class='white-space' ondblclick=\"copyText(this)\" data-ctid = \"" + record.ctid + "\">" + memo + "</div>";
     return html;
 }
+function copyText(obj) {
+    var div = obj;
+    var rec = grid.getSelected();
+    let text = div.innerText;
+    let ctid = div.dataset.ctid;
+    div.innerText = text + "《" + ctid + "》";
+    if (document.body.createTextRange) {
+        var range = document.body.createTextRange();
+        range.moveToElementText(div);
+        range.select();
+    } else if (window.getSelection) {
+        var selection = window.getSelection();
+        var range = document.createRange();
+        range.selectNodeContents(div);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    } else {
+        //console.warn("none");
+        return;
+    }
+    document.execCommand("Copy");
+    div.innerText = text;
+    mini.showTips({
+        content: "复制成功！",
+        state: "danger",
+        x: "Center",
+        y: "Center",
+        timeout: 1000
+    });
+}
 
 function orderPTimeRenderer(e) {
     var grid = e.sender;

Web/EDelivery/js/WaitingDelivery.js

@@ -37,10 +37,39 @@ function memoRenderer(e) {
     replace_list.forEach(item => {
         memo = memo.replace(item[0], item[1]);
     })
-    var html = "<div class='white-space' ondblclick=\"copyText(this)\">" + memo + "</div>";
+    var html = "<div class='white-space' ondblclick=\"copyText(this)\" data-ctid = \"" + record.ctid + "\">" + memo + "</div>";
     return html;
 }
-
+function copyText(obj) {
+    var div = obj;
+    var rec = grid.getSelected();
+    let text = div.innerText;
+    let ctid = div.dataset.ctid;
+    div.innerText = text + "《" + ctid + "》";
+    if (document.body.createTextRange) {
+        var range = document.body.createTextRange();
+        range.moveToElementText(div);
+        range.select();
+    } else if (window.getSelection) {
+        var selection = window.getSelection();
+        var range = document.createRange();
+        range.selectNodeContents(div);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    } else {
+        //console.warn("none");
+        return;
+    }
+    document.execCommand("Copy");
+    div.innerText = text;
+    mini.showTips({
+        content: "复制成功！",
+        state: "danger",
+        x: "Center",
+        y: "Center",
+        timeout: 1000
+    });
+}
 function orderPTimeRenderer(e) {
     var grid = e.sender;
     var record = e.record;

Web/EDelivery/js/WaitingOrder.js

@@ -33,10 +33,39 @@ function memoRenderer(e) {
     replace_list.forEach(item => {
         memo = memo.replace(item[0], item[1]);
     })
-    var html = "<div class='white-space' ondblclick=\"copyText(this)\">" + memo + "</div>";
+    var html = "<div class='white-space' ondblclick=\"copyText(this)\" data-ctid = \"" + record.ctid + "\">" + memo + "</div>";
     return html;
 }
-
+function copyText(obj) {
+    var div = obj;
+    var rec = grid.getSelected();
+    let text = div.innerText;
+    let ctid = div.dataset.ctid;
+    div.innerText = text + "《" + ctid + "》";
+    if (document.body.createTextRange) {
+        var range = document.body.createTextRange();
+        range.moveToElementText(div);
+        range.select();
+    } else if (window.getSelection) {
+        var selection = window.getSelection();
+        var range = document.createRange();
+        range.selectNodeContents(div);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    } else {
+        //console.warn("none");
+        return;
+    }
+    document.execCommand("Copy");
+    div.innerText = text;
+    mini.showTips({
+        content: "复制成功！",
+        state: "danger",
+        x: "Center",
+        y: "Center",
+        timeout: 1000
+    });
+}
 function orderPTimeRenderer(e) {
     var grid = e.sender;
     var record = e.record;

Web/Ehr/EmployeeManage.aspx.cs

@@ -54,7 +54,7 @@ public partial class Ehr_EmployeeManage : TreeBasePage, ITreePage
             string orgids = CurrentUser.User.ManageOrgIds;
             string[] list = orgids != null ? orgids.Split(',') : new string[0];
 
-            if (CurrentUser.UserPost.Post.Code == "SysAdmin")
+            if (CurrentUser.UserPost.Post.Code == "SysAdmin" || CurrentUser.UserPost.Post.Code == "HumanResMr")
             {
                 TreeSelValue = "0";
                 str.Append("{");