工单，商品

代码/System.Model/Bus/T_Bus_Order.cs

@@ -68,14 +68,16 @@ namespace System.Model
 		private string _f_customertel = "";
 		private int _f_isexpress = 0;
 		private string _f_tag = "";
+        private int _f_ispayment = 0;
 
-		private string _f_recommendName = "";
+       
+        private string _f_recommendName = "";
+      
 
-
-		/// <summary>
-		/// 推荐人姓名
-		/// </summary>
-		public string F_RecommendName
+        /// <summary>
+        /// 推荐人姓名
+        /// </summary>
+        public string F_RecommendName
 		{
 			set { _f_recommendName = value; }
 			get { return _f_recommendName; }
@@ -295,7 +297,7 @@ namespace System.Model
 			get { return _f_usescore; }
 		}
 		/// <summary>
-		///  订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货
+		///  订单状态 -1无效 0暂存 1提交  2KF退回  3分仓 4无货 5已分拣 6已发货 7付款待审核 8分物流 
 		/// </summary>
 		public int F_State
 		{
@@ -550,8 +552,18 @@ namespace System.Model
 			set { _f_sendusername = value; }
 			get { return _f_sendusername; }
 		}
-		#endregion Model
+        /// <summary>
+        /// 是否提前付款
+        /// </summary>
+        public int F_IsPayment
+        {
+            set { _f_ispayment = value; }
+            get { return _f_ispayment; }
+        }
+    
+      
+        #endregion Model
 
-	}
+    }
 }
 

代码/System.Model/Bus/T_Bus_Product.cs

@@ -46,12 +46,15 @@ namespace System.Model
 		private int _f_freezestock = 0;
 		private int _f_stock1 = 0;
 		private int _f_freezestock1 = 0;
+        private int _f_usenumber = 0;
+        private int _f_match = 0;
+        private int _f_match1 = 0;
 
 
-		/// <summary>
-		/// 产品编号ID
-		/// </summary>
-		public string F_ProductId
+        /// <summary>
+        /// 产品编号ID
+        /// </summary>
+        public string F_ProductId
 		{
 			set { _f_productid = value; }
 			get { return _f_productid; }
@@ -339,9 +342,30 @@ namespace System.Model
 			set { _f_freezestock1 = value; }
 			get { return _f_freezestock1; }
 		}
+        public int F_Match
+        {
+
+            set { _f_match = value; }
+            get { return _f_match; }
+
+
+        }
+        public int F_Match1
+        {
+
+            set { _f_match1 = value; }
+            get { return _f_match1; }
+
 
-		#endregion Model
+        }
+        
+        public int F_UseNumber
+        {
+            set { _f_usenumber= value; }
+            get { return _f_usenumber; }
+        }
+        #endregion Model
 
-	}
+    }
 }
 

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

@@ -385,7 +385,53 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             }
             return $"同步情况  成功/总数 = {n1}/{totle}";
         }
-       
 
+        /// <summary>
+        /// 同步外呼状态
+        /// </summary>
+        /// <returns></returns>
+        [NonAction]
+        internal async Task<string> SyncArchivePool()
+        {
+            List<task> modellist = await taskRepository.GetListALL(q => q.status == 0 && q.state == 1);
+            int totle = 0;
+            int n = 0;
+            int n1 = 0;
+            if (modellist != null && modellist.Count > 0)
+            {
+                List<T_Sys_AutoDial> modelAutoDial = new List<T_Sys_AutoDial>();
+                List<task> taskList = new List<task>();
+                foreach (task it in modellist)
+                {
+                    var AutoDial = await sys_autodialrepository.GetSingle(q => q.F_ID == it.outbound_id);
+                    if (AutoDial != null)
+                    {
+                        AutoDial.F_ISOutbound = 1;
+                        modelAutoDial.Add(AutoDial);
+                        n++;
+                    }
+                    it.status = 1;
+                    taskList.Add(it);
+          
+                    n1++;
+                    if (n >= 2000)
+                    {
+                        await sys_autodialrepository.AddAndUpdateList(modelAutoDial);
+                        modelAutoDial.Clear();
+                        n = 0;
+                    }
+                    if (n1 >= 2000)
+                    {
+                        await taskRepository.UpdateList(taskList);
+                        taskList.Clear();
+                        n1 = 0;
+                    }
+                }
+                await sys_autodialrepository.AddAndUpdateList(modelAutoDial);
+                await taskRepository.UpdateList(taskList);
+
+            }
+            return $"同步情况  成功/总数 = {n1}/{totle}";
+        }
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -322,6 +322,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 model.F_Lastholetime  = call[call.Count -1].BeginTime;
             }
            
+           
                
             if (await _cus_vip_infoRepository.GetCount(x => x.F_Mobile == model.F_Mobile && x.F_Name == input.name) > 0)
             {

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

@@ -110,9 +110,146 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             return Success("请选择要导入的文件");
         }
+        /// <summary>
+        /// 上传文件并导入数据库
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("importorderbackexcel")]
+        public async Task<IActionResult> ImportorderbackExcel(int state=0,int headrow = 0)
+        {
+            Microsoft.AspNetCore.Http.IFormFile _upfile = Request.Form.Files[0];
+            if (!_upfile.ContentType.Equals("application/vnd.ms-excel") && !_upfile.ContentType.Equals("application/x-xls") && !_upfile.ContentType.Equals("application/x-xlsx") && !_upfile.ContentType.Equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") && !_upfile.ContentType.Equals("application/octet-stream"))
+                return Error($"请正确上传Excel文件：file.ContentType={_upfile.ContentType}");
+            NPOIHelper npoi = new NPOIHelper();
+            var dtExcel = npoi.ExcelToTable1(_upfile, headrow);
+            int num = dtExcel.Rows.Count;
+            var cols = dtExcel.Columns;
+            int colnum = cols.Count;
+            string errmsg = string.Empty;
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            if (num > 0)
+            {
+                int index = 1;
+                foreach (DataRow dr in dtExcel.Rows)
+                {
+
+                    T_Bus_Order modelOrder = new T_Bus_Order();
+                    if (dr.Table.Columns.Contains("订单号"))
+                    {
+                        if (!string.IsNullOrEmpty(dr["订单号"].ToString()))
+                        {
+                            modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == dr["订单号"].ToString());
+                            if (modelOrder==null )
+                            {
+                                errmsg = errmsg + "\r\n第" + index + "行导入失败！订单不存在";
+                                continue;
+                            }
+                        }
+                        else
+                        {
+                            errmsg = errmsg + "\r\n第" + index + "行导入失败！订单不存在";
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        return Error("模板错误，请选择正确的模板");
+                    }
+                   if (state ==1)
+                    {
+                        if (dr.Table.Columns.Contains("退回说明"))
+                        {
+                            modelOrder.F_CheckRemark = dr["退回说明"].ToString();
+                            modelOrder.F_State = 2;
+                        }
+                        else
+                        {
+                            return Error("模板错误，请选择正确的模板");
+                        }
+                    }
+                   else
+                    {
+                        modelOrder.F_State = 1;
+                    }
+                    modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+                    modelOrder.F_CheckUserName = UserLogin.UserName;
+                    modelOrder.F_CheckTime = DateTime.Now;
+                    orderLIst.Add(modelOrder);
+                   
+                    index++;
+
+                }
+                
+                if (!await bus_OrderRepository.UpdateList (orderLIst))
+                {
+                    if (!string.IsNullOrEmpty(errmsg))
+                    {
+                        errmsg = errmsg + "导入失败！";
+                    }
+                    else
+                    {
+                        errmsg ="导入失败！";
+                    }
+                }
+            }
+            else
+            {
+                return Error("文件中无数据");
+            }
+
+            if (!string.IsNullOrEmpty(errmsg))
+            {
+                return Error(errmsg);
+            }
+
+            return Success("导入成功");
+        }
+        /// <summary>
+        /// 分仓
+        /// </summary>
+        /// <param name="orderids"></param>
+        /// <param name="stock"></param>
+        /// <returns></returns>
+        [HttpPost("orderback")]
+        public async Task<IActionResult> OrderBack(string orderids,string remark, int  state=0)
+        {
+
+            if (string.IsNullOrEmpty(orderids))
+                return Error("请选择订单号");
+            string msg = "";
+            string[] ids = orderids.Split(',');
+            List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+            foreach (var it in ids)
+            {
+
+                T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
+               
+                modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+                modelOrder.F_CheckUserName = UserLogin.UserName;
+                modelOrder.F_CheckTime = DateTime.Now;
+                if (state==0)
+                {
+                    modelOrder.F_CheckRemark = remark;
+                   modelOrder.F_State = 2;
+                }
+                else
+                {
+                    modelOrder.F_State = 1;
+                }
+                orderLIst.Add(modelOrder);
+            }
+            if (await bus_OrderRepository.UpdateList(orderLIst))
+            {
+                return Success("退回成功");
+            }
+            else
+                return Error("退回失败");
 
 
 
+
+        }
         /// <summary>
         /// 订单二审 审完 走发货
         /// </summary>
@@ -221,7 +358,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/api/order/getorderlistbykfpage")]
-        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input,int PayState=0,int state=-1)
+        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input,string Product,int PayState=0,int state=-1)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -326,6 +463,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Stock", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Stock });
             }
+            if (input.F_IsExpress>-1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_IsExpress", ConditionalType = ConditionalType.Equal, FieldValue = input.F_IsExpress.ToString () });
+            }
+            
             if (input.F_PayState > -1)
             {
                 if (PayState>0)
@@ -365,12 +507,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 conModels.Add(new ConditionalModel() { FieldName = "F_IsExpress", ConditionalType = ConditionalType.Equal, FieldValue = input.F_IsExpress.ToString() });
             }
 
-
+           
 
 
             #endregion
             RefAsync<int> recordCount = 0;
-            PageData<T_Bus_Order> list = await bus_OrderRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = recordCount }, " F_AddTime DESC");
+            PageData<T_Bus_Order> list = await bus_OrderRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = recordCount }, " F_AddTime ASC");
             PageData<OrderInput> returnobj = new PageData<OrderInput>() { Totals = list.Totals };
             List<OrderInput> returnlist = new List<OrderInput>();
             foreach (T_Bus_Order t in list.Rows)
@@ -392,15 +534,23 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                 #endregion
                 m.OrderDetailList = orderDetailInputs;
-
+                if (!string.IsNullOrEmpty(Product))
+                {
+                    if (orderDetailInputs.Select (x=>x.F_ProductId ==Product ).Count ()>0 )
+                        returnlist.Add(m);
+                }
+                else 
                 returnlist.Add(m);
             }
-            returnobj.Rows = returnlist;
+           
+                returnobj.Rows = returnlist;
+
 
             return Success("成功", returnobj);
 
 
         }
+     
 
         /// <summary>
         /// 修改订单 
@@ -483,14 +633,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             if (!string.IsNullOrEmpty(modelOrder.F_Express))
                 modelOrder.F_IsExpress = 1;
             //选填 关联属性
-
-
-
             modelOrder.F_ExpressFee = input.F_ExpressFee;
             modelOrder.F_State = input.F_State;
             modelOrder.F_Status = 0;
-
-
             //必须属性 系统生成
             modelOrder.F_CheckTime = DateTime.Now;
             modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
@@ -604,7 +749,81 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             return Error("失败,请重试！");
 
         }
+        /// <summary>
+        /// 分仓
+        /// </summary>
+        /// <param name="orderids"></param>
+        /// <param name="stock"></param>
+        /// <returns></returns>
+        [HttpPost("updatestock")]
+        public async Task<IActionResult> UpdateStock(string orderids, string stock)
+        {
+
+            if (string.IsNullOrEmpty(orderids))
+                return Error("请选择订单号");
+            if (string.IsNullOrEmpty(stock))
+                return Error("请选择出货仓");
+            T_Cus_ScoreSet modelscore = await cus_score_setRepository.GetSingle(x => x.F_State == 1);
+            if (modelscore == null)
+            {
+                modelscore = new T_Cus_ScoreSet();
+                modelscore.F_Start = 0;
+                modelscore.F_StartDebit = 1;
+                modelscore.F_DebitPercent = 1000;
+            }
+          string msg="";
+            string[] ids = orderids.Split(',');
+            List<T_Bus_Order> orderLIst = new List<T_Bus_Order>();
+
+            foreach (var it  in ids)
+            {
+
+                T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == it);
+                if (modelscore.F_Start == 1)
+                {
+                    //订单完成后计算积分
+                    modelOrder.F_Score = -0.01M;
+                }
+                else
+                {  //订单完成后也不计算积分
+                    modelOrder.F_Score = 0.00M;
+                }
+                if (modelscore.F_StartDebit == 0 || modelOrder.F_VipId == 0)
+                {
+                    modelOrder.F_UseScore = 0;
+                }
+                List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == modelOrder.F_Id, o => o.F_Sort, OrderByType.Asc);
+                string strStock = await busOrderFunctionController.ChangeStockOne(modelOrder, 1, detaillist);
+                modelOrder.F_CheckUser = UserLogin.UserId.ObjToInt();
+                modelOrder.F_CheckUserName = UserLogin.UserName;
+                modelOrder.F_CheckTime = DateTime.Now;
+                modelOrder.F_Stock = stock;
+                if (strStock != "1")
+                {
+                    msg += "订单" + modelOrder.F_Id + strStock;
+                    modelOrder.F_State = 4;
+                    //   { return Error(strStock); }
+                }
+               else
+                {
+                    modelOrder.F_State = 3;
+                }
+                orderLIst.Add(modelOrder);
+            }
+            if (await bus_OrderRepository.UpdateList(orderLIst))
+            {
+               if (msg =="")
+                return Success("分仓成功");
+               else
+                    return Success(msg);
+            }
+            else
+                return Error("分仓失败");
 
+           
+
+
+        }
 
         [HttpPost("checkordermoney")]
         public async Task<IActionResult> CheckOrderMoney(OrderMoneyInput input)

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderFunctionController.cs

@@ -173,9 +173,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 //long masterlong =long.Parse(modelOrder.F_FlowNum.Replace("U", "").Replace("R", "") + DateTime.Now.ToString("ddHHmmss"));
                 setStockModel.masterid = modelOrder.F_FlowNum+ state;
                 if(state==1)
-                setStockModel.remark = "销售提交锁库存";
+                setStockModel.remark = "客服分仓锁库存";
                 else if (state == 0)
-                    setStockModel.remark = "销售撤回加库存";
+                    setStockModel.remark = "客服撤回加库存";
                 else if (state == 2)
                     setStockModel.remark = "审核不通过加库存";
                 //更新库存记录   

代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -525,6 +525,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                                 if (a.sku == p.F_ProductId)
                                 {
                                     p.F_Stock = a.qty;
+                                    p.F_Match = a.qty - p.F_UseNumber;
                                     break;
                                 }
                             }
@@ -536,6 +537,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                                 if (a.sku == p.F_ProductId)
                                 {
                                     p.F_Stock1 = a.qty;
+                                    p.F_Match = a.qty - p.F_UseNumber;
                                     break;
                                 }
                             }
@@ -638,6 +640,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                                 if (a.sku == p.F_ProductId)
                                 {
                                     p.F_Stock = a.qty;
+                                    p.F_Match = a.qty - p.F_UseNumber;
                                     break;
                                 }
                             }
@@ -649,6 +652,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                                 if (a.sku == p.F_ProductId)
                                 {
                                     p.F_Stock1 = a.qty;
+                                    p.F_Match1= a.qty - p.F_UseNumber;
                                     break;
                                 }
                             }

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

@@ -69,9 +69,10 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private string _f_tag = "";
 
         private string _f_recommendName = "";
-        private int _f_isExpress = 0;
-
-
+        private int _f_isExpress = -1;
+        private int _f_ispayment = -1;
+       
+       
         /// <summary>
         /// 客服是否选择快递 1已分配 0未分配
         /// </summary>
@@ -540,6 +541,17 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         }
         public int? IsSale
         { get; set; }
+        /// <summary>
+        /// 是否提前付款
+        /// </summary>
+        public int F_IsPayment
+        {
+            set { _f_ispayment = value; }
+            get { return _f_ispayment; }
+            
+        }
+      
+        public OrderMoneyInput OrderMoney { get; set; }
         #endregion Model
 
     }