修复库管订单列表bug

代码/System.Model/T_Bus_Order.cs

@@ -106,7 +106,7 @@ namespace System.Model
 			get { return _f_recommendId; }
 		}
 		/// <summary>
-		/// 审核备注
+		/// 审核备注 售后id
 		/// </summary>
 		public string F_AfterSaleId
 		{

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

@@ -143,6 +143,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
                     return Error("订单已审核");
                 }
+                if (string.IsNullOrEmpty(modelOrder.F_Express))
+                {
+                    return Error("快递不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_AddPhone))
+                {
+                    return Error("收件人电话不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_AddTown))
+                {
+                    return Error("收件人地址不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_Address))
+                {
+                    return Error("收件人详细地址不能为空");
+                }
                 modelOrder.F_CheckTime = DateTime.Now;
                 modelOrder.F_CheckUser = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
                 modelOrder.F_CheckUserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
@@ -323,7 +339,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             if (input.F_IsExpress > -1)
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_IsExpress", ConditionalType = ConditionalType.GreaterThan, FieldValue = input.F_IsExpress.ToString() });
+                conModels.Add(new ConditionalModel() { FieldName = "F_IsExpress", ConditionalType = ConditionalType.Equal, FieldValue = input.F_IsExpress.ToString() });
             }
 
 

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

@@ -68,20 +68,23 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "3" });
 
-            //根据角色展示列表
-            if (UserLogin.RoleCode == "XS")
+            if (input.F_State >= 0)
             {
-                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 });
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
+
             }
-            else if (UserLogin.RoleCode == "KG" && input.F_State != 3)
+
+            conModels.Add(new ConditionalCollections()
             {
-                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 });
-            }
+                ConditionalList = new List<KeyValuePair<WhereType, SqlSugar.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_State", ConditionalType = ConditionalType.Equal, FieldValue = "3" })
+}
+            });
+
             if (!string.IsNullOrEmpty(input.F_ADFrom))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_ADFrom", ConditionalType = ConditionalType.Equal, FieldValue = input.F_ADFrom });

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

@@ -83,6 +83,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             List<T_Bus_StockLog> newstockLogList = new List<T_Bus_StockLog>();
             if (state == 1) 
             {
+                if (modelDetailList.Count <= 0)
+                    return "提交商品详情不能为空";
                 foreach (T_Bus_OrderDetail productstock in modelDetailList)
                 {
                     T_Bus_StockLog modelStock = new T_Bus_StockLog();

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

@@ -579,7 +579,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                 return Error("请输入删除id");
             #endregion
 
-            if (await _productRepository.Update(s => new T_Bus_Product() { F_IsDelete = -1 }, q => ids.Contains("," + q.F_ProductId.ToString() + ",")))
+            if (await _productRepository.Delete( q => ids.Contains("," + q.F_ProductId.ToString() + ",")))
                 return Success("删除商品成功");
             else
                 return Success("删除商品失败");