下单统计新增待发货数据

SiteCore/Handler/sync.order.cs

@@ -66,7 +66,7 @@ namespace SiteCore.Handler
 
             DataStruct dStruct = GetPostStruct();
             //string a = SecurityHelper.DecryptSymmetric("BnK3+504SQ8=");
-            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\新品售价(4).xls");
+            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\天使殿下(1).cdr");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -903,7 +903,7 @@ namespace SiteCore.Handler
                         memo = delMemo;
                         LogHelper.addLog(entity.ctid, CurrentUser.UserID, "系统千牛修改为：" + memo, entity.OrderState, 1);
                     }
-                    commonHelper.getCytPrice(entity);
+                    //commonHelper.getCytPrice(entity);
                     int memoopt = GetPostInt("MemoOpt");
                     Boolean ismemoopt = false;
                     if (memoopt > 0)
@@ -947,7 +947,7 @@ namespace SiteCore.Handler
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
                     if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
-                        dataHelper.api_orderBack(entity.ctid, "0", "");
+                        //dataHelper.api_orderBack(entity.ctid, "0", "");
                     }
                     if (entity.seller_memo.Contains("改稿"))
                     {
@@ -1526,7 +1526,7 @@ namespace SiteCore.Handler
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
                     if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
-                        dataHelper.api_orderBack(entity.ctid, "0", "");
+                        //dataHelper.api_orderBack(entity.ctid, "0", "");
                     }
                     returnSuccessMsg("领单成功！");
                     return;
@@ -4365,7 +4365,7 @@ namespace SiteCore.Handler
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
                     if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
-                        dataHelper.api_orderBack(entity.ctid, fromType, entity.ReturnReason);
+                        //dataHelper.api_orderBack(entity.ctid, fromType, entity.ReturnReason);
                     }
                     //CeErpSukuraData.createInfo(entity.ctid, 5);
                     //apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, entity.seller_memo, false, true, entity.ReturnReason);
@@ -12763,12 +12763,16 @@ namespace SiteCore.Handler
             }
             string startMonthDate = commonHelper.FirstDayOfMonth(DateTime.Now).ToString("yyyy-MM-dd 00:00:00");
             string endMonthDate = commonHelper.LastDayOfMonth(DateTime.Now).ToString("yyyy-MM-dd 23:59:59");
-            string sql = string.Format("select SupplierId,ProductId,seller_memo,ProductCount,ProductName,payment,SupplierName,UnusualTime,FinishPlaceTime,OrderState,FinishDeliveryTime,AfterSaleState=0,AfterSaleReason = '' from view_ErpTradeCell where ( ( FinishPlaceTime BETWEEN '{0}' AND '{1}' ) OR ( OrderState = 6 AND UnusualTag = 5 AND IsRefund <= 1 ) )  AND IsSample = 0 and SupplierId > 0 ", starttime, endtime);
+            string sql = string.Format("select SupplierId,ProductId,seller_memo,ProductCount,ProductName,payment,SupplierName,UnusualTime,FinishPlaceTime,OrderState,FinishDeliveryTime,AfterSaleState=0,AfterSaleReason = '',delivery=0 from view_ErpTradeCell where ( ( FinishPlaceTime BETWEEN '{0}' AND '{1}' ) OR ( OrderState = 6 AND UnusualTag = 5 AND IsRefund <= 1 ) )  AND IsSample = 0 and SupplierId > 0 ", starttime, endtime);
             DataTable data = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
 
-            sql = string.Format("SELECT SupplierId, ProductId, seller_memo, ProductCount, ProductName, payment, SupplierName, UnusualTime, FinishPlaceTime, OrderState, FinishDeliveryTime, AfterSaleState,AfterSaleReason  FROM view_ErpTradeCell  WHERE ( AfterSalePreTime BETWEEN '{0}' AND '{1}' )  AND IsSample = 0  AND SupplierId > 0  AND FinishPlaceTime IS NOT NULL", startMonthDate, endMonthDate);
+            sql = string.Format("SELECT SupplierId, ProductId, seller_memo, ProductCount, ProductName, payment, SupplierName, UnusualTime, FinishPlaceTime, OrderState, FinishDeliveryTime, AfterSaleState,AfterSaleReason,delivery=0  FROM view_ErpTradeCell  WHERE ( AfterSalePreTime BETWEEN '{0}' AND '{1}' )  AND IsSample = 0  AND SupplierId > 0  AND FinishPlaceTime IS NOT NULL", startMonthDate, endMonthDate);
             DataTable afterSaleData = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
             data.Merge(afterSaleData);
+
+            sql = string.Format("SELECT SupplierId, ProductId, seller_memo, ProductCount, ProductName, payment, SupplierName, UnusualTime, FinishPlaceTime, OrderState, FinishDeliveryTime, AfterSaleState=0,AfterSaleReason = '',delivery=1 FROM view_ErpTradeCell  WHERE orderstate = 6  AND IsSample = 0  AND SupplierId > 0  AND  FinishPlaceTime > '2024-01-01 00:00:31.000' AND IsRefund <= 1 AND status = 'NOT_SHIPPED'", startMonthDate, endMonthDate);
+            DataTable deliveryData = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            data.Merge(deliveryData);
             //不干胶-----1,卡片-----29
             Dictionary<string, Dictionary<string, int>> other_map = new Dictionary<string, Dictionary<string, int>>();
             foreach (DataRow row in data.Rows)
@@ -12864,11 +12868,13 @@ namespace SiteCore.Handler
                     map.Add("today", 0);//当天出货数量
                     map.Add("unusua", 0);//异常数
                     map.Add("aftersale", 0);//异常数
+                    map.Add("deliveryNum", 0);//待发货数
                     other_map.Add(map_key, map);
                     other_map.TryGetValue(map_key, out map);
                 }
                 int afterSaleState = Convert.ToInt32(row["AfterSaleState"]);
-                if (afterSaleState == 0)
+                int delivery = Convert.ToInt32(row["delivery"]);
+                if (afterSaleState == 0 && delivery == 0)
                 {
                     DateTime palceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
                     DateTime palceTimeStart = DateTime.Parse(palceTime.ToString("yyyy-MM-dd 00:00:00"));
@@ -13020,7 +13026,7 @@ namespace SiteCore.Handler
                         }
                     }
                 }
-                else
+                else if (delivery == 0)
                 {
                     if (row["AfterSaleReason"].ToString().Contains("车间责任"))
                     {
@@ -13028,6 +13034,10 @@ namespace SiteCore.Handler
                     }
 
                 }
+                else
+                {
+                    map["deliveryNum"]++;
+                }
 
             }
 
@@ -13041,6 +13051,7 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("dayDev", typeof(string)));
             dt.Columns.Add(new DataColumn("dayRate", typeof(string)));
             dt.Columns.Add(new DataColumn("aftersale", typeof(string)));
+            dt.Columns.Add(new DataColumn("deliveryNum", typeof(string)));
             other_map.Keys.ForEach(key =>
             {
                 DataRow dr = dt.NewRow();
@@ -13067,6 +13078,7 @@ namespace SiteCore.Handler
                 }
                 dr[7] = rate.ToString();
                 dr[8] = map["aftersale"];
+                dr[9] = map["deliveryNum"];
                 dt.Rows.Add(dr);
             });
 

Web/ECharts/PlaceGather.aspx

@@ -280,6 +280,7 @@
                 <div field="payTotal" width="160" align="center" headeralign="center">金额5百以上单量</div>
                 <div field="today" width="160" align="center" headeralign="center">当天出货</div>
                 <div field="aftersale" width="160" align="center" headeralign="center">售后单</div>
+                <div field="deliveryNum" width="160" align="center" headeralign="center">待发货单</div>
                 <div field="unusua" width="160" align="center" headeralign="center">异常单</div>
                 <div field="unusua_reson" width="160" visible="false" align="center" headeralign="center">异常原因</div>
             </div>