From 9fe266f1956ac01a7ab446d3c84a046ac4ea90af Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 09:33:31 +0800
Subject: [PATCH] 1
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index b24e962..a397772 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -4,9 +4,6 @@
using System.Data;
using System.Web;
using System.Text;
-using System;
-using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
-
namespace Admin.NET.Application;
/// <summary>
/// 搴撳瓨淇℃伅鏈嶅姟
@@ -15,16 +12,9 @@
public class WmsStockQuanService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WmsStockQuan> _rep;
- private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _Mes_BatchOrderUPI_New_Rep;
- private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan_Rep;
-
- public WmsStockQuanService(SqlSugarRepository<WmsStockQuan> rep,
- SqlSugarRepository<Mes_BatchOrderUPI_New> Mes_BatchOrderUPI_New_Rep,
- SqlSugarRepository<V_Station_Quan> v_Station_Quan_Rep)
+ public WmsStockQuanService(SqlSugarRepository<WmsStockQuan> rep)
{
_rep = rep;
- _Mes_BatchOrderUPI_New_Rep = Mes_BatchOrderUPI_New_Rep;
- _V_Station_Quan_Rep = v_Station_Quan_Rep;
}
/// <summary>
@@ -168,12 +158,12 @@
.Select<WmsStockQuanOutput>();
if(input.InTimeRange != null && input.InTimeRange.Count >0)
{
- DateTime? start= input.InTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.InTime > start);
+ DateTime? start= input.InTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.InTime >= start);
if (input.InTimeRange.Count >1 && input.InTimeRange[1].HasValue)
{
- var end = input.InTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.InTime < end);
+ var end = input.InTimeRange[1].Value;
+ query = query.Where(u => u.InTime <= end);
}
}
if(input.OperTimeRange != null && input.OperTimeRange.Count >0)
@@ -199,13 +189,13 @@
return query;
}
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist( WmsStockQuan input,bool isEdit=false)
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsStockQuan input,bool isEdit=false)
{
@@ -228,13 +218,20 @@
throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
//鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
//鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
}
- #endregion
-
-
-
+ #endregion
}
--
Gitblit v1.9.3