From fe5dd3d5e16980a1fe722712e488875e34bc7455 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 06:20:25 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/Dto/KittingListInput.cs | 0
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/WmsCommonnQueryService.cs | 61 ++++++++++++++++++++++++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 24 ++----------
4 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
index c3a8126..df9ad37 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
@@ -65,5 +65,5 @@
public const string ThirdInterFaceServiceGroupName = "绗笁鏂规湇鍔℃帴鍙ｇ鐞�";
public const string ThirdInterFaceGroupName = "绗笁鏂规湇鍔℃帴鍙ｇ鐞�2";
-
+ public const string WmsCommonnQueryGroupName = "閫氱敤鏌ヨ";
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/Dto/KittingListInput.cs
similarity index 100%
rename from LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs
rename to LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/Dto/KittingListInput.cs
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/WmsCommonnQueryService.cs
new file mode 100644
index 0000000..0359bb2
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -0,0 +1,61 @@
+锘縰sing Admin.NET.Core.Service;
+using Admin.NET.Application.Entity;
+using Microsoft.AspNetCore.Http;
+using System.Data;
+using System.Web;
+using System.Text;
+using DocumentFormat.OpenXml.Office.CustomUI;
+using Microsoft.CodeAnalysis.Operations;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+
+namespace Admin.NET.Application;
+/// <summary>
+/// 閫氱敤鏌ヨ鏈嶅姟
+/// </summary>
+[ApiDescriptionSettings(ApplicationConst.WmsCommonnQueryGroupName, Order = 100)]
+public class WmsCommonnQueryService : IDynamicApiController, ITransient
+{
+ private readonly SqlSugarRepository<WmsRbLineTask> _rep;
+ private readonly SqlSugarRepository<WmsStockQuan> _wmsStockQuanRep;
+ private readonly SqlSugarRepository<Mes_Package_Gather> _mesPackageGatherRep;
+ private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
+ private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
+ private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
+
+ public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
+ , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
+ , SqlSugarRepository<SysConfig> sysConfigRep
+ , SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
+ , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
+ )
+ {
+ _sysConfigRep = sysConfigRep;
+ _mesPackageGatherRep = mesPackageGatherRep;
+ _rep = rep;
+ _wmsStockQuanRep = wmsStockQuanRep;
+ _mesBatchOrderUpiRep = mesBatchOrderUpiRep;
+ _mesOrderGatherRep = mesOrderGatherRep;
+ }
+
+ /// <summary>
+ /// 鏌ヨ涓嶉綈濂楀崟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryNoKittingList")]
+ [Description("WmsCommonnQuery/QueryNoKittingList")]
+ public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
+ {
+ var list = await _mesOrderGatherRep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
+ .Where(x => x.IsKitting == false)
+ .OrderBy(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+ return list; // 缁撴灉
+ }
+}
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index 2e52b0f..f4a625a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -132,6 +132,9 @@
sysConfig.Value = setValue;
await _sysConfigRep.UpdateAsync(sysConfig);
+ //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉
+
+
output = package.Adapt<ValidateQiTaoOutput>();
output.QiTaoReuslt = _QiTaoReuslt;
return output;
@@ -172,25 +175,6 @@
}
- /// <summary>
- /// 鏌ヨ涓嶉綈濂楀崟鎹�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "QueryNoKittingList")]
- [Description("WmsOperationTask/QueryNoKittingList")]
- public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
- {
- var list = await _mesOrderGatherRep.AsQueryable()
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
- .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
- .Where(x => x.IsKitting == false)
- .OrderBy(g => g.Id)
- .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
-
- return list; // 缁撴灉
- }
+
}
--
Gitblit v1.9.3