更新售后操作规则

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

@@ -329,27 +329,27 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
                 List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
 
-                //更新售后流程的退货商品
+                #region 退回商品展示 更新售后流程的退货商品
                 if (string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
                 {
-                    #region 退回商品展示
+
 
                     foreach (string product in modelAfterSale.F_OldDetailList.Split('|'))
                     {
                         string productid = product.Split(',')[0];
-
+                        int count = product.Split(',')[1].ObjToInt();
                         T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
-                        if (modelDetail.F_State >= 1)
+                        if (count > (modelDetail.F_Count - modelDetail.F_State))
                         {
-                            return Error("此商品已参加售后:" + modelDetail.F_ProductName);
+                            return Error("此商品部分已参加售后:" + modelDetail.F_ProductName);
                         }
-                        modelDetail.F_State = 1;
+                        modelDetail.F_State = count;
                         modelOldDetailList.Add(modelDetail);
                     }
 
-                    #endregion
-                }
 
+                }
+                #endregion
                 if (input.F_Type == 4)
                 {
                     if (input.F_CheckStateSH == 1)
@@ -421,11 +421,44 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     //物流状态0 未发出 1物流运送中2签收3改代收4拒收
                     return Error("订单状态不符合售后");
                 }
+
                 T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
                 if (modelAfterSale.F_CheckStateSH == 1)
                 {
                     return Error("不能重复审核提交");
                 }
+
+                List<T_Bus_OrderDetail> modelOldDetailList = new List<T_Bus_OrderDetail>();
+
+                #region 退回商品展示 更新售后流程的退货商品
+                if (string.IsNullOrEmpty(input.F_OldDetailList))
+                {
+
+                    foreach (string product in input.F_OldDetailList.Split('|'))
+                    {
+                        string productid = product.Split(',')[0];
+                        int count = product.Split(',')[1].ObjToInt();
+                        T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
+                        foreach (string productold in modelAfterSale.F_OldDetailList.Split('|'))
+                        {
+                            string productidold = product.Split(',')[0];
+                            if (productidold == productid)
+                            {
+                                int countold = product.Split(',')[1].ObjToInt();
+                                count = count - countold;
+                            }
+                        }
+                        if (count > (modelDetail.F_Count - modelDetail.F_State))
+                        {
+                            return Error("此商品部分已参加售后:" + modelDetail.F_ProductName);
+                        }
+                        modelDetail.F_State = modelDetail.F_State + count;
+                        modelOldDetailList.Add(modelDetail);
+                    }
+
+
+                }
+                #endregion
                 modelAfterSale.F_CheckTimeSH = DateTime.Now;
                 modelAfterSale.F_CheckStateSH = input.F_State;
                 modelAfterSale.F_CheckUserSH = UserLogin.UserId.ObjToInt();
@@ -434,6 +467,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
 
                 modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_OldDetailList = input.F_OldDetailList;
                 modelAfterSale.F_Type = input.F_Type;
                 modelAfterSale.F_Money = input.F_Money;
 
@@ -459,6 +493,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         }
                     }
                 }
+                if (modelOldDetailList != null && modelOldDetailList.Count > 0)
+                {
+                    //批量更新状态 为售后中
+                    await bus_OrderDetailRepository.UpdateList(modelOldDetailList);
+                }
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
                 {
                     if (input.F_CheckStateSH == 0)
@@ -543,6 +582,260 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
         }
 
+
+
+        /// <summary>
+        /// 获取订单分页列表 售后
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getorderlistbyshpage")]
+        public async Task<IActionResult> GetSHOrderListByPage(OrderInput input)
+        {
+
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+
+
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+
+            //状态
+            if (input.F_State > -2)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
+            }
+            //根据角色展示列表
+            if (UserLogin.RoleCode == "SH")
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+            }
+            else if (UserLogin.RoleCode == "KF" && input.F_State != 1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+            }
+            else if (UserLogin.RoleCode == "KG" && input.F_State != 3)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                //OR  conModels.Add(new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+            }
+            if (!string.IsNullOrEmpty(input.F_ADFrom))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_ADFrom", ConditionalType = ConditionalType.Equal, FieldValue = input.F_ADFrom });
+            }
+            if (!string.IsNullOrEmpty(input.F_Type))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Type });
+            }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Id", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Id });
+            }
+            if (!string.IsNullOrEmpty(input.F_Customer))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Customer", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Customer });
+            }
+            if (!string.IsNullOrEmpty(input.F_CustomerPhone))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CustomerPhone", ConditionalType = ConditionalType.Equal, FieldValue = input.F_CustomerPhone });
+            }
+            if (!string.IsNullOrEmpty(input.F_TrackingNo))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_TrackingNo", ConditionalType = ConditionalType.Equal, FieldValue = input.F_TrackingNo });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddProvince))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddProvince", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddProvince });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddCity))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddCity", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddCity });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddArea))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddArea", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddArea });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddTown))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTown", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddTown });
+            }
+            if (!string.IsNullOrEmpty(input.F_Express))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Express", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Express });
+            }
+            if (!string.IsNullOrEmpty(input.F_PayType))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_PayType", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayType });
+            }
+            if (!string.IsNullOrEmpty(input.F_Stock))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Stock", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Stock });
+            }
+            if (input.F_PayState > -1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayState.ToString() });
+            }
+            if (input.SearchEndTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThan, FieldValue = input.SearchEndTime.GetValueOrDefault().ToString("yyyy-MM-dd 23:59:59") });
+            }
+            if (input.SearchStartTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThan, FieldValue = input.SearchStartTime.GetValueOrDefault().ToString("yyyy-MM-dd 00:00:01") });
+            }
+
+
+
+
+            #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<OrderInput> returnobj = new PageData<OrderInput>() { Totals = list.Totals };
+            List<OrderInput> returnlist = new List<OrderInput>();
+            foreach (T_Bus_Order t in list.Rows)
+            {
+                OrderInput m = new OrderInput();
+                ModelConvertHelper<OrderInput, T_Bus_Order>.ModeToModel(m, t);
+
+                List<OrderDetailInput> orderDetailInputs = new List<OrderDetailInput>();
+                #region 遍历订单商品
+                List<T_Bus_OrderDetail> orderDetails = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == t.F_Id);
+                if (orderDetails != null)
+                {
+                    foreach (T_Bus_OrderDetail t1 in orderDetails)
+                    {
+                        OrderDetailInput m1 = new OrderDetailInput();
+                        ModelConvertHelper<OrderDetailInput, T_Bus_OrderDetail>.ModeToModel(m1, t1);
+                        orderDetailInputs.Add(m1);
+                    }
+                }
+                #endregion
+                m.OrderDetailList = orderDetailInputs;
+
+                returnlist.Add(m);
+            }
+            returnobj.Rows = returnlist;
+
+            return Success("成功", returnobj);
+
+
+        }
+
+
+        /// <summary>
+        /// 修改订单 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("editorder")]
+        public async Task<IActionResult> EditOrder([FromBody]OrderInput input)
+        {
+            T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
+            #region 验证参数 必填项  
+
+            if (string.IsNullOrEmpty(input.F_ADFrom))
+                return Error("请输入选择广告来源");
+            if (string.IsNullOrEmpty(input.F_Type))
+                return Error("请输入选择订单类型");
+            if (string.IsNullOrEmpty(input.F_Id))
+                return Error("请输入订单编号");
+            if (string.IsNullOrEmpty(input.F_Customer))
+                return Error("请输入客户姓名");
+            if (string.IsNullOrEmpty(input.F_CustomerPhone))
+                return Error("请输入客户电话");
+            #endregion
+
+
+            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_Id);
+            if (modelOrder == null)
+            {
+                return Error("此订单号不存在");
+            }
+            //保存 审退回 仓退回
+            if (!(new int[] { 0, 2 }.Contains(modelOrder.F_State)))
+            {
+                return Error("已提交订单不允许修改，先撤回订单");
+            }
+            #region 数据绑定
+            //必填
+            modelOrder.F_ADFrom = input.F_ADFrom;
+            modelOrder.F_Type = input.F_Type;
+            modelOrder.F_Id = input.F_Id;
+
+            modelOrder.F_Customer = input.F_Customer;
+            modelOrder.F_CustomerPhone = input.F_CustomerPhone;
+            //选填 快递属性
+            modelOrder.F_TrackingNo = input.F_TrackingNo;
+            modelOrder.F_Addressee = input.F_Addressee;
+            modelOrder.F_AddPhone = input.F_AddPhone;
+            modelOrder.F_AddProvince = input.F_AddProvince;
+            modelOrder.F_AddCity = input.F_AddCity;
+            modelOrder.F_AddArea = input.F_AddArea;
+            modelOrder.F_AddTown = input.F_AddTown;
+            modelOrder.F_AddDes = input.F_AddDes;
+            modelOrder.F_Address = input.F_Address;
+            modelOrder.F_PostalCode = input.F_PostalCode;
+            modelOrder.F_Express = input.F_Express;
+
+            modelOrder.F_PayType = input.F_PayType;
+            modelOrder.F_Stock = input.F_Stock;
+            modelOrder.F_Remark = input.F_Remark;
+
+            modelOrder.F_RealPrice = input.F_RealPrice;
+            modelOrder.F_UseScore = input.F_UseScore;
+            //选填 关联属性
+            modelOrder.F_VipId = input.F_VipId;
+
+
+
+            modelOrder.F_State = input.F_State;
+            modelOrder.F_Status = 0;
+
+
+            //必须属性 系统生成
+            modelOrder.F_AddTime = DateTime.Now;
+            modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
+            modelOrder.F_AddUserName = UserLogin.UserName;
+
+            #endregion
+
+
+            List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
+
+
+
+            //直接提交  锁库存
+
+            #region 提交 更改状态   库存  积分
+
+
+            if (input.F_State == 1)
+            {
+                if (string.IsNullOrEmpty(input.F_Stock))
+                {
+                    return Error("请选择货仓");
+                }
+                modelOrder.F_FlowNum = Guid.NewGuid().ToString().Replace("-", "");
+                string strStock = await orderController.ChangeStockOne(modelOrder, 1, modelDetailList);
+                if (strStock != "1")
+                { return Error(strStock); }
+                modelOrder.F_SubmitTime = DateTime.Now;
+
+            }
+            #endregion
+
+
+
+            if (await bus_OrderRepository.Update(modelOrder))
+            {
+                 return Success("成功"); 
+            }
+
+            return Error("失败,请重试！");
+
+
+        }
+
+
         #endregion
 
         #region 仓库操作
@@ -588,23 +881,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 //1收到货（根据状态自动创建订单）2货物不符3未收到货
                 if (modelAfterSale.F_CheckStateKG == 1)
                 {
-                    #region 更新用户快递商品
-                    if (string.IsNullOrEmpty(modelAfterSale.F_OldDetailList))
-                    {
-                        foreach (string product in modelAfterSale.F_DetailList.Split('|'))
-                        {
-                            string productid = product.Split(',')[0];
 
-                            T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
-                            if (modelDetail.F_State == 2)
-                            {
-                                return Error("此商品已参加过售后:" + modelDetail.F_ProductName);
-                            }
-                            modelDetail.F_State = 2;
-                            modelOldDetailList.Add(modelDetail);
-                        }
-                    }
-                    #endregion
                     if (modelAfterSale.F_Type == 4)
                     {
 
@@ -638,13 +915,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             foreach (string product in modelAfterSale.F_DetailList.Split('|'))
                             {
                                 string productid = product.Split(',')[0];
-
+                                int count = product.Split(',')[1].ObjToInt();
                                 T_Bus_OrderDetail modelDetail = await bus_OrderDetailRepository.GetSingle(q => q.F_OrderId == modeOrder.F_Id && q.F_ProductId == productid);
-                                if (modelDetail.F_State == 2)
-                                {
-                                    return Error("此商品已参加过售后:" + modelDetail.F_ProductName);
-                                }
-                                modelDetail.F_State = 0;
+
+                                modelDetail.F_State = modelDetail.F_State- count;
                                 modelOldDetailList.Add(modelDetail);
                             }
                         }
@@ -873,91 +1147,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         {
             if (string.IsNullOrEmpty(orderid))
                 return Error("请输入订单号");
-            T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid);
-            OrderInput modelreturn = new OrderInput();
-            if (modelOrder != null)
-            {
-                modelreturn.F_ADFrom = modelOrder.F_ADFrom;
-                modelreturn.F_Type = modelOrder.F_Type;
-                modelreturn.F_Id = modelOrder.F_Id;
-
-                modelreturn.F_Customer = modelOrder.F_Customer;
-                modelreturn.F_CustomerPhone = modelOrder.F_CustomerPhone;
-                //选填 快递属性
-                modelreturn.F_TrackingNo = modelOrder.F_TrackingNo;
-                modelreturn.F_Addressee = modelOrder.F_Addressee;
-                modelreturn.F_AddPhone = modelOrder.F_AddPhone;
-                modelreturn.F_AddProvince = modelOrder.F_AddProvince;
-                modelreturn.F_AddCity = modelOrder.F_AddCity;
-                modelreturn.F_AddArea = modelOrder.F_AddArea;
-                modelreturn.F_AddTown = modelOrder.F_AddTown;
-                modelreturn.F_AddDes = modelOrder.F_AddDes;
-                modelreturn.F_Address = modelOrder.F_Address;
-                modelreturn.F_PostalCode = modelOrder.F_PostalCode;
-                modelreturn.F_Express = modelOrder.F_Express;
-
-                modelreturn.F_PayType = modelOrder.F_PayType;
-                modelreturn.F_PayState = modelOrder.F_PayState;
-                modelreturn.F_Stock = modelOrder.F_Stock;
-                modelreturn.F_Remark = modelOrder.F_Remark;
-
-                modelreturn.F_RealPrice = modelOrder.F_RealPrice;
-
-                //选填 关联属性
-                modelreturn.F_VipId = modelOrder.F_VipId;
-                modelreturn.F_UseScore = modelOrder.F_UseScore;
-                modelreturn.F_Score = modelOrder.F_Score;
-
-                modelreturn.F_State = modelOrder.F_State;
-                modelreturn.F_Status = modelOrder.F_Status;
-
-
-                //必须属性 系统生成
-                modelreturn.F_AddTime = modelOrder.F_AddTime;
-                modelreturn.F_AddUser = modelOrder.F_AddUser;
-                modelreturn.F_AddUserName = modelOrder.F_AddUserName;
-
-
-                modelreturn.F_TotlePrice = modelOrder.F_TotlePrice;
-                modelreturn.F_ShouldPrice = modelOrder.F_ShouldPrice;
-                modelreturn.F_ActivityMoney = modelOrder.F_ActivityMoney;
-                modelreturn.F_UseActivity = modelOrder.F_UseActivity;
-
-                List<OrderDetailInput> modeldetailreturn = new List<OrderDetailInput>();
-                List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == modelOrder.F_Id, o => o.F_Sort, OrderByType.Asc);
-                if (detaillist != null)
-                {
-                    foreach (T_Bus_OrderDetail m in detaillist)
-                    {
-                        OrderDetailInput model = new OrderDetailInput();
-                        model.F_ProductName = m.F_ProductName;
-                        model.F_ProductId = m.F_ProductId;
-                        model.F_Id = m.F_Id;
-                        model.F_OrderId = m.F_OrderId;
-                        model.F_Count = m.F_Count;
-                        model.F_Price = m.F_Price;
-
-                        model.F_DealPrice = m.F_DealPrice;
-                        model.F_Sort = m.F_Sort;
-                        model.F_AddTime = m.F_AddTime;
-                        model.F_Remark = m.F_Remark;
-                        model.F_AddUser = m.F_AddUser;
-                        model.F_AddUserName = m.F_ProductName;
-                        model.F_TotlePrice = m.F_TotlePrice;
-                        model.F_Activity = m.F_Activity;
-                        modeldetailreturn.Add(model);
-                    }
-                }
-                modelreturn.OrderDetailList = modeldetailreturn;
-
-                modelreturn.UseActList = null;
-
-            }
-
-
-            return Success("成功", modelreturn);
 
+            List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == orderid && q.F_State == 0, o => o.F_Sort, OrderByType.Asc);
 
+            return Success("成功", detaillist);
         }
         #endregion
 

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

@@ -875,7 +875,15 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             //根据角色展示列表
             if (UserLogin.RoleCode == "ZX")
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_Belong", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId })
+                     }
+                } );
+
             }
             else if (UserLogin.RoleCode == "KF" && input.F_State != 1)
             {
@@ -1151,14 +1159,31 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KF" && input.F_State != 1)
+            else if (UserLogin.RoleCode == "KF")
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_CheckUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "1" })
+                     }
+                });
+               // conModels.Add(new ConditionalModel() { FieldName = "", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
             }
-            else if (UserLogin.RoleCode == "KG" && input.F_State != 3)
+            else if (UserLogin.RoleCode == "KG")
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
-                //OR  conModels.Add(new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                //conModels.Add(new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
+                
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And , new ConditionalModel() { FieldName = "F_StockUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_SendUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "3" })
+                     }
+                });
             }
             if (!string.IsNullOrEmpty(input.F_ADFrom))
             {

代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -8,7 +8,7 @@
     "stock1": "WLZZ0001"
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=TVCallCenter_ZLJ;MultipleActiveResultSets=true;"
+    "DefaultConnection": "Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=TVCallCenter_ZLJ;MultipleActiveResultSets=true;Pooling=true;Min Pool Size=15;Max Pool Size=100;"
   },
   "Jwt": {
     "Issuer": "HnjySignToken",