edit

SiteCore/Handler/sync.dic.cs

@@ -444,12 +444,6 @@ namespace SiteCore.Handler
                     return;
                 }
                 string shopIds = GetPostString("shopIds");
-                if (shopIds == "")
-                {
-                    returnSuccessMsg("数据不全无法设置");
-                    return;
-
-                }
                 int type = GetPostInt("type");
 
                 if (!string.IsNullOrWhiteSpace(shopIds))
@@ -457,6 +451,11 @@ namespace SiteCore.Handler
                     string delsql = "delete from Ce_ErpDesignInfo where type =" + type + " and tarId = " + tarId + " and shopId not in (" + shopIds + ")";
                     CeErpDesignInfo.ExecuteNonQuery(delsql);
                 }
+                else
+                {
+                    string delsql = "delete from Ce_ErpDesignInfo where type =" + type + " and tarId = " + tarId;
+                    CeErpDesignInfo.ExecuteNonQuery(delsql);
+                }
 
 
                 returnSuccessMsg("添加成功!");

SiteCore/Handler/sync.initorder.cs

@@ -30,10 +30,19 @@ namespace SiteCore.Handler
                 lw.Add(string.Format("buyer_nick like '%{0}%'", buyernick));
 
             }
-            if (tid.Length == 0 && date1.Length == 0 && buyernick.Length == 0)
+            string deliverydate1 = GetPostString("deliverydate1");
+            string deliverydate2 = GetPostString("deliverydate2");
+            if (tid.Length == 0 && date1.Length == 0 && buyernick.Length == 0 && deliverydate1.Length == 0)
             {
                 lw.Add(string.Format("datediff(d,pay_time,getdate())<=91 "));
             }
+
+
+            if (deliverydate1.Length > 0)
+            {
+                string dw = GetDateMinuteWhere("delivery_time", deliverydate1, deliverydate2);
+                if (dw.Length > 0) lw.Add(dw);
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick like '%{0}%'", shopname));
 

SiteCore/Handler/sync.order.cs

@@ -3915,7 +3915,7 @@ namespace SiteCore.Handler
                         designHelper.API_WorkCore(apiVo);//rebutDesign
                     }
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
-                    if (ceErpTradeCellExtend.orderFrom == 30)
+                    if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
                         dataHelper.api_orderBack(entity.ctid, fromType, entity.ReturnReason);
                     }

SiteCore/Handler/sync.orderReport.cs

@@ -491,7 +491,7 @@ namespace SiteCore.Handler
                 string sqlFinish = string.Format("SELECT A.DesignUserId AS did, COUNT ( CASE WHEN a.FinishDesignTime BETWEEN '{0}' AND '{1}' THEN 1 END ) AS DesignFinish  FROM dbo.CE_ErpTradeCell AS A LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID WHERE A.FinishDesignTime BETWEEN '{0}'  AND '{1}' AND b.orgid = '{2}' AND a.IsSample!= 2  AND a.ctid NOT LIKE 'S_%'  GROUP BY DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable finishDesign = DbHelper.DbConn.ExecuteDataset(sqlFinish).Tables[0];
 
-                string sqlRefund = string.Format("SELECT A.DesignUserId AS did, COUNT ( * ) AS refund FROM dbo.CE_ErpTradeRefund AS C LEFT OUTER JOIN dbo.CE_ErpTradeCell AS A ON c.tid= A.tid LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID WHERE A.WaitDesignTime BETWEEN '{0}'  AND '{1}'  AND b.orgid = '{2}'  AND a.IsSample!= 2  AND a.ctid NOT LIKE '%S%' AND A.IsRefund > 0  AND ( C.created < A.FinishDesignTime OR A.FinishDesignTime IS NULL )  GROUP BY A.DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                string sqlRefund = string.Format("SELECT A.DesignUserId AS did, COUNT ( DISTINCT A.tid ) AS refund FROM dbo.CE_ErpTradeRefund AS C LEFT OUTER JOIN dbo.CE_ErpTradeCell AS A ON c.tid= A.tid LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID WHERE A.WaitDesignTime BETWEEN '{0}'  AND '{1}'  AND b.orgid = '{2}'  AND a.IsSample!= 2  AND a.ctid NOT LIKE '%S%' AND A.IsRefund > 0  AND ( C.created < A.FinishDesignTime OR A.FinishDesignTime IS NULL )  GROUP BY A.DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable refundDesign = DbHelper.DbConn.ExecuteDataset(sqlRefund).Tables[0];
                 Dictionary<object, Dictionary<String, object>> mapweek = new Dictionary<object, Dictionary<String, object>>();
                 foreach (DataRow dr3 in dt3.Rows)

SiteCore/taobao/dataHelper.cs

@@ -382,8 +382,8 @@ namespace SiteCore.Handler
 
         public static void api_orderBack(string orderNumber, string state, string content)
         {
-            string post_url = "http://api.presales.lingtao8.com/open/order/orderProcessReturn";
-            //string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
+            //string post_url = "http://api.presales.lingtao8.com/open/order/orderProcessReturn";
+            string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
             string remoteInfo = "";
             string param = JsonConvert.SerializeObject(new
             {

SiteCore/taobao/designHelper.cs

@@ -58,8 +58,8 @@ namespace SiteCore.Handler
             }
         }
 
-        static string pUrl = "http://47.122.60.212:8181/api/originalOrder/";
-        //static string pUrl = "http://47.122.40.91:8181/api/originalOrder/";
+        //static string pUrl = "http://47.122.60.212:8181/api/originalOrder/";
+        static string pUrl = "http://47.122.40.91:8181/api/originalOrder/";
 
         static HttpHelper tb_http = new HttpHelper();
 

SiteCore/taobao/preSalesHelper.cs

@@ -1,6 +1,7 @@
 using BizCom;
 using Newtonsoft.Json;
 using NHibernate.Cache;
+using NHibernate.Engine;
 using NPOI.OpenXmlFormats.Shared;
 using NPOI.OpenXmlFormats.Wordprocessing;
 using NPOI.SS.Formula.Functions;
@@ -435,7 +436,7 @@ namespace SiteCore.Handler
 
 
                         CeErpUserPost userEntity = CeErpUserPost.GetByUserID(userid);
-                        if (entity.ctid.IndexOf("S_") == -1 && userEntity.OrgID == 10)
+                        if (userEntity != null && entity.ctid.IndexOf("S_") == -1 && userEntity.OrgID == 10)
                         {
                             int suid = commonHelper.autoDistributeToSupplier(entity); //自动分配供应商
                             entity.SupplierId = suid;

Web/EDesign/MyReDesign.aspx

@@ -89,6 +89,8 @@
             <div property="columns">
                 <div type="checkcolumn" width="20"></div>
                 <div field="tid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
+                <div field="seller_nick" visible="false" align="center" headeralign="center">店铺</div>
+                <div field="buyer_nick" visible="false" align="center" headeralign="center">买家旺旺</div>
                 <div field="pay_time" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
                 <div field="payment" width="40" align="center" headeralign="center">订单金额</div>
                 <div field="refund_fee" width="50" align="center" headeralign="center" renderer="refundRenderer">退款金额</div>

Web/EOrder/InitList.aspx

@@ -17,6 +17,7 @@
                 <div field="seller_nick" visible="false" align="center" headeralign="center">店铺</div>
                 <div field="buyer_nick" visible="false" align="center" headeralign="center">旺旺</div>
                 <div field="pay_time" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
+                <div field="delivery_time" visible="false" align="center" headeralign="center">发货时间</div>
                 <div field="total_fee" width="40" align="center" headeralign="center">总金额</div>
                 <div field="payment" width="40" align="center" headeralign="center" >付款金额</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>

Web/EOrder/InitList.aspx.cs

@@ -8,7 +8,7 @@ public partial class EOrder_InitList : BasePage
         _repTitle = "原单列表";
         PmTag = "initlist";
         //_selfCheckPermission = true;
-        _filterItem = "all";
+        _filterItem = "order,bichOrder,shop,wang,fukuan,moeny,shouhuo,memo,cus,des,state,delivery_time";
         _keyFilterVisible = false;
         _addVisible = false;
     }

Web/EOrder/js/InitList.js

@@ -82,9 +82,8 @@ function searchFn() {
     //var s = mini.encode(data);
     //alert(s);
     //form.setIsValid(false);
-    console.log("565656565", data);
     grid.load({
-        tid: s.tid, shopname: s.shop, buyer_nick: s.ww,
+        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2,
         date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo
     });
 }
@@ -368,7 +367,7 @@ $(function () {
     if (openPageData != "") {
         var s = openPageData;
         grid.load({
-            tid: s.tid, shopname: s.shop, buyer_nick: s.ww,
+            tid: s.tid, shopname: s.shop, buyer_nick: s.ww, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2,
             date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo
         });
         var form = new mini.Form("#ctl00_f_all");
@@ -407,7 +406,7 @@ function onSearchCheckedChanged(e) {
         etime = timearr[1];
         console.log(text, stime, etime)
         grid.load({
-            tid: s.tid, shopname: s.shop, buyer_nick: s.ww,
+            tid: s.tid, shopname: s.shop, buyer_nick: s.ww, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2,
             date1: stime, date2: etime, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo
         });
     }

Web/Ehr/Employee_Edit.aspx

@@ -437,10 +437,6 @@
                 type: 1,
                 shopIds: shopIds.join(",")
             }
-            if (shopIds.length == 0) {
-                saveFn(true)
-                return;
-            }
             postAjax("save_shop_info", params, function (data) {
                 saveFn(true)
             })