From 6748b620551df2a2f6a15f3a71f7e93ad03ed7a7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 25 11月 2024 17:51:29 +0800
Subject: [PATCH] 2
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs | 180 +++++++++++++++--------------------------------------------
1 files changed, 47 insertions(+), 133 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
index 7f060eb..cc600a3 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/WmsConfigPrintService.cs
@@ -4,8 +4,6 @@
using System.Data;
using System.Web;
using System.Text;
-using NPOI.OpenXmlFormats.Dml;
-
namespace Admin.NET.Application;
/// <summary>
/// 鎵撳嵃閰嶇疆琛ㄦ湇鍔�
@@ -30,16 +28,7 @@
public async Task<SqlSugarPagedList<WmsConfigPrintOutput>> Page(WmsConfigPrintInput input)
{
var query = CommonPageFilter(input);
- var list = await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
- foreach (var item in list.Items)
- {
- //鍗曠嫭澶勭悊鎸夐挳 銆怑ditby shaocx,2024-05-27銆�
- if (!string.IsNullOrEmpty(item.PrinterList))
- {
- item.PrinterListList = item.PrinterList.Split(",").ToList();
- }
- }
- return list;
+ return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -53,16 +42,7 @@
public async Task<List<WmsConfigPrintOutput>> List([FromQuery] WmsConfigPrintInput input)
{
var query = CommonPageFilter(input);
- var list = await query.OrderBuilder(input, "", "Id").Select<WmsConfigPrintOutput>().ToListAsync();
- foreach (var item in list)
- {
- //鍗曠嫭澶勭悊鎸夐挳 銆怑ditby shaocx,2024-05-27銆�
- if (!string.IsNullOrEmpty(item.PrinterList))
- {
- item.PrinterListList = item.PrinterList.Split(",").ToList();
- }
- }
- return list;
+ return await query.OrderBuilder(input, "", "Id").Select<WmsConfigPrintOutput>().ToListAsync();
}
/// <summary>
@@ -75,10 +55,7 @@
[Description("WmsConfigPrint/Add")]
public async Task<long> Add(AddWmsConfigPrintInput input)
{
-
var entity = input.Adapt<WmsConfigPrint>();
- entity.PrintClassifyName = entity.PrintClassify.ToString();
- entity.PrinterList = string.Join(",", input.PrinterListList);
//閲嶅鎬ч獙璇�
await CheckExist(entity);
@@ -113,11 +90,9 @@
public async Task Update(UpdateWmsConfigPrintInput input)
{
var entity = input.Adapt<WmsConfigPrint>();
- entity.PrintClassifyName = entity.PrintClassify.ToString();
- entity.PrinterList = string.Join(",", input.PrinterListList);
//閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
+ await CheckExist(entity,true);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
@@ -130,15 +105,9 @@
[HttpGet]
[ApiDescriptionSettings(Name = "Detail")]
[Description("WmsConfigPrint/Detail")]
- public async Task<WmsConfigPrintOutput> Detail([FromQuery] QueryByIdWmsConfigPrintInput input)
+ public async Task<WmsConfigPrint> Detail([FromQuery] QueryByIdWmsConfigPrintInput input)
{
- var obj= await _rep.GetFirstAsync(u => u.Id == input.Id);
- var entity = obj.Adapt<WmsConfigPrintOutput>();
- if (!string.IsNullOrEmpty(entity.PrinterList))
- {
- entity.PrinterListList = entity.PrinterList.Split(",").ToList();
- }
- return entity;
+ return await _rep.GetFirstAsync(u => u.Id == input.Id);
}
@@ -172,107 +141,52 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.PrinterList), u => u.PrinterList.Contains(input.PrinterList.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Remark), u => u.Remark.Contains(input.Remark.Trim()))
.Select<WmsConfigPrintOutput>();
-
return query;
- }
+ }
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist(WmsConfigPrint input, bool isEdit = false)
- {
-
-
-
- //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
-
-
- bool isExistForSingle_PrintTemplate = false;
- if (!isEdit)//鏂板
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsConfigPrint input,bool isEdit=false)
{
- //鏁版嵁鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍚�
- isExistForSingle_PrintTemplate = await _rep.AsQueryable().AnyAsync(u =>
- u.PrintTemplate.Equals(input.PrintTemplate));
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsConfigPrint> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
}
- else//缂栬緫
- {
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍚�
- isExistForSingle_PrintTemplate = await _rep.AsQueryable().AnyAsync(u =>
- u.Id != input.Id
- && u.PrintTemplate.Equals(input.PrintTemplate));
- }
- if (isExistForSingle_PrintTemplate) throw Oops.Oh($"楠岃瘉澶辫触,鎵撳嵃妯℃澘鍚峓" + input.PrintTemplate + "]宸插瓨鍦�");
-
- bool isExistForSingle_PrintTemplateAddr = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍦板潃
- isExistForSingle_PrintTemplateAddr = await _rep.AsQueryable().AnyAsync(u =>
- u.PrintTemplateAddr.Equals(input.PrintTemplateAddr));
- }
- else//缂栬緫
- {
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁鍗曠嫭瀛樺湪閲嶅-鎵撳嵃妯℃澘鍦板潃
- isExistForSingle_PrintTemplateAddr = await _rep.AsQueryable().AnyAsync(u =>
- u.Id != input.Id
- && u.PrintTemplateAddr.Equals(input.PrintTemplateAddr));
- }
- if (isExistForSingle_PrintTemplateAddr) throw Oops.Oh($"楠岃瘉澶辫触,鎵撳嵃妯℃澘鍦板潃[" + input.PrintTemplateAddr + "]宸插瓨鍦�");
-
- }
-
- /// <summary>
- /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<WmsConfigPrint> inputs)
- {
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existExcelItemForSingle_PrintTemplate = inputs.GroupBy(g => new { g.PrintTemplate }).Where(g => g.Count() > 1).ToList();
- if (existExcelItemForSingle_PrintTemplate != null && existExcelItemForSingle_PrintTemplate.Count > 0)
- {
- var item = existExcelItemForSingle_PrintTemplate.First().ToList().First();
- throw Oops.Oh($"楠岃瘉澶辫触,瀵煎叆鐨勮〃鏍间腑,鎵撳嵃妯℃澘鍚峓" + item.PrintTemplate + "]宸查噸澶嶅瓨鍦�");
- }
- var existExcelItemForSingle_PrintTemplateAddr = inputs.GroupBy(g => new { g.PrintTemplateAddr }).Where(g => g.Count() > 1).ToList();
- if (existExcelItemForSingle_PrintTemplateAddr != null && existExcelItemForSingle_PrintTemplateAddr.Count > 0)
- {
- var item = existExcelItemForSingle_PrintTemplateAddr.First().ToList().First();
- throw Oops.Oh($"楠岃瘉澶辫触,瀵煎叆鐨勮〃鏍间腑,鎵撳嵃妯℃澘鍦板潃[" + item.PrintTemplateAddr + "]宸查噸澶嶅瓨鍦�");
- }
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItemList = await _rep.GetListAsync(w =>
- inputs.Select(s => s.PrintTemplate).ToList().Contains(w.PrintTemplate) ||
- inputs.Select(s => s.PrintTemplateAddr).ToList().Contains(w.PrintTemplateAddr)
- );
- var db_ForSingle_PrintTemplate = existDBItemList.FirstOrDefault(g => inputs.Select(s => s.PrintTemplate).ToList().Contains(g.PrintTemplate));
- if (db_ForSingle_PrintTemplate != null) throw Oops.Oh($"楠岃瘉澶辫触,绯荤粺涓�,鎵撳嵃妯℃澘鍚峓" + db_ForSingle_PrintTemplate.PrintTemplate + "]宸查噸澶嶅瓨鍦�");
-
- var db_ForSingle_PrintTemplateAddr = existDBItemList.FirstOrDefault(g => inputs.Select(s => s.PrintTemplateAddr).ToList().Contains(g.PrintTemplateAddr));
- if (db_ForSingle_PrintTemplateAddr != null) throw Oops.Oh($"楠岃瘉澶辫触,绯荤粺涓�,鎵撳嵃妯℃澘鍦板潃[" + db_ForSingle_PrintTemplateAddr.PrintTemplateAddr + "]宸查噸澶嶅瓨鍦�");
-
-
-
- }
- #endregion
+ #endregion
}
--
Gitblit v1.9.3