提交代码

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -184,5 +184,21 @@ namespace Mall.Model.Extend.Product
             set;
         }
 
+
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int NewGoodsId
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 出库商品名称
+        /// </summary>
+        public string NewGoodsName { get; set; }
+
     }
 }

Mall.Repository/Property/RB_Supplies_CheckRepository.cs

@@ -66,13 +66,15 @@ namespace Mall.Repository.Property
 
             if (dmodel.StartDate.HasValue)
             {
-                where += $" and  {nameof(RB_Supplies_Check_Extend.StartDate)} >='{dmodel.StartDate}' ";
+                where += $" and  {nameof(RB_Supplies_Check_Extend.StartDate)} <='{dmodel.StartDate}' ";
             }
             if (dmodel.EndDate.HasValue)
             {
-                where += $" and  {nameof(RB_Supplies_Check_Extend.StartDate)} <='{dmodel.EndDate}' ";
+                where += $" and  {nameof(RB_Supplies_Check_Extend.StartDate)} >='{dmodel.EndDate}' ";
             }
 
+      
+
             if (!string.IsNullOrWhiteSpace(dmodel.Periods))
             {
                 where += " and " + nameof(RB_Supplies_Check_Extend.Periods) + " like '%" + dmodel.Periods + "%'";

Mall.WebApi/Controllers/Property/WarehouseOutController.cs

@@ -112,7 +112,7 @@ namespace Mall.WebApi.Controllers.Property
             //根据订单商品id查询商品信息
             var orderGoodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId));
             var orderGoodsList = orderModule.GetOrderGoodsList(new Model.Extend.Product.RB_Goods_OrderDetail_Extend { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, IdList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).ToList() });
-            if (demodel.WarehouseOutGoodsList.Count != orderGoodsList.Count)
+            if (demodel.WarehouseOutGoodsList.GroupBy(x => x.OrderGoodsId).Count() != orderGoodsList.Count)
             {
                 List<int> chajiList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).Except(orderGoodsList.Select(x => x.Id)).ToList();
                 string msg = "";
@@ -237,6 +237,8 @@ namespace Mall.WebApi.Controllers.Property
             list.ForEach(x => x.NewSpecificationSort = x.SpecificationSort);
             list.ForEach(x => x.NewSpecification = x.Specification);
             list.ForEach(x => x.NewNumber = (x.Number ?? 0));
+            list.ForEach(x => x.NewGoodsId = x.GoodsId ?? 0);
+            list.ForEach(x => x.NewGoodsName = x.GoodsName);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list;
             return ApiResult.Success("", pagelist);