From ac5f3574affb06666b9f3a6b76a961ffa69802e4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 15:30:18 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs | 284 +++++---------------------------------------------------
1 files changed, 26 insertions(+), 258 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
index 989500d..e9266de 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
@@ -116,257 +116,7 @@
#region 瀵煎叆
- /// <summary>
- /// Excel妯℃澘瀵煎叆鏈哄櫒浜轰换鍔¤〃鍔熻兘
- /// </summary>
- /// <param name="file">Excel妯℃澘鏂囦欢</param>
- /// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "ImportExcel")]
- [Description("WmsRbLineTask/ImportExcel")]
- public async Task<int> ImportExcelAsync(IFormFile file)
- {
- int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
- int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
- DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList =await CommonImport(importDataTable, _DataStartLine);
- await _rep.InsertRangeAsync(addList);
- return addList.Count;
- }
- /// <summary>
- /// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
- /// </summary>
- /// <param name="dataTable"></param>
- /// <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
- /// <returns></returns>
- private async Task<List<WmsRbLineTask>> CommonImport(DataTable dataTable, int dataStartLine)
- {
- var details = new List<WmsRbLineTask>();
- int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
- foreach (System.Data.DataRow row in dataTable.Rows)
- {
- index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new WmsRbLineTask();
- #region 瀹氫箟鍙橀噺
- var _TaskNo = "";//浠诲姟鍙�
- var _TaskName = "";//浠诲姟鍚嶇О
- var _UPI = "";//閮ㄤ欢鏉＄爜
- var _Length = "";//闀�
- var _Width = "";//瀹�
- var _Thk = "";//鍘�
- var _PlanNo = "";//鎵规鍙�
- var _OrderId = "";//璁㈠崟鍙�
- var _PackageCode = "";//鍖呰鍙�
- var _PlaceCode = "";//搴撲綅缂栫爜
- var _RbTaskType = "";//浠诲姟绫诲瀷
- var _RbTaskTypeEnumName = "";//浠诲姟绫诲瀷鍚嶇О
- var _TaskStatus = "";//浠诲姟鐘舵��
- var _TaskStatusName = "";//浠诲姟鐘舵�佸悕绉�
- var _TaskDescribe = "";//浠诲姟鎻忚堪
- var _TaskMsg = "";//浠诲姟娑堟伅
- var _IssueTime = "";//涓嬪彂鏃堕棿
- var _FinishedTime = "";//浠诲姟瀹屾垚鏃堕棿
- var _IsFlagFinish = "";//鏄惁鏍囪寮哄埗瀹屾垚
- #endregion
-
-
- #region 鍙栧��
- _TaskNo = row["浠诲姟鍙�"]?.ToString() ;
- _TaskName = row["浠诲姟鍚嶇О"]?.ToString() ;
- _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString() ;
- _Length = row["闀�"]?.ToString() ;
- _Width = row["瀹�"]?.ToString() ;
- _Thk = row["鍘�"]?.ToString() ;
- _PlanNo = row["鎵规鍙�"]?.ToString() ;
- _OrderId = row["璁㈠崟鍙�"]?.ToString() ;
- _PackageCode = row["鍖呰鍙�"]?.ToString() ;
- _PlaceCode = row["搴撲綅缂栫爜"]?.ToString() ;
- _RbTaskType = row["浠诲姟绫诲瀷"]?.ToString() ;
- _RbTaskTypeEnumName = row["浠诲姟绫诲瀷鍚嶇О"]?.ToString() ;
- _TaskStatus = row["浠诲姟鐘舵��"]?.ToString() ;
- _TaskStatusName = row["浠诲姟鐘舵�佸悕绉�"]?.ToString() ;
- _TaskDescribe = row["浠诲姟鎻忚堪"]?.ToString() ;
- _TaskMsg = row["浠诲姟娑堟伅"]?.ToString() ;
- _IssueTime = row["涓嬪彂鏃堕棿"]?.ToString() ;
- _FinishedTime = row["浠诲姟瀹屾垚鏃堕棿"]?.ToString() ;
- _IsFlagFinish = row["鏄惁鏍囪寮哄埗瀹屾垚"]?.ToString() ;
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_TaskNo))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鍙穄{_TaskNo}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_TaskNo))
- {
- addItem.TaskNo = (string)(_TaskNo.Trim());
- }
- if(!string.IsNullOrEmpty(_TaskName))
- {
- addItem.TaskName = (string)(_TaskName.Trim());
- }
-
- if (string.IsNullOrEmpty(_UPI))
- {
- throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_UPI))
- {
- addItem.UPI = (string)(_UPI.Trim());
- }
-
- if (string.IsNullOrEmpty(_Length))
- {
- throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
- }
-
-
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
-
-
- if (string.IsNullOrEmpty(_PlanNo))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵规鍙穄{_PlanNo}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_PlanNo))
- {
- addItem.PlanNo = (string)(_PlanNo.Trim());
- }
-
- if (string.IsNullOrEmpty(_OrderId))
- {
- throw Oops.Oh($"绗瑊index}琛孾璁㈠崟鍙穄{_OrderId}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_OrderId))
- {
- addItem.OrderId = (string)(_OrderId.Trim());
- }
-
- if (string.IsNullOrEmpty(_PackageCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍖呰鍙穄{_PackageCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_PackageCode))
- {
- addItem.PackageCode = (string)(_PackageCode.Trim());
- }
-
- if (string.IsNullOrEmpty(_PlaceCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅缂栫爜]{_PlaceCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_PlaceCode))
- {
- addItem.PlaceCode = (string)(_PlaceCode.Trim());
- }
- if(!string.IsNullOrEmpty(_RbTaskType))
- {
- Admin.NET.Application.RbTaskTypeEnum enumRbTaskType = default(Admin.NET.Application.RbTaskTypeEnum);
-
- if(!Enum.TryParse<Admin.NET.Application.RbTaskTypeEnum>(_RbTaskType, out enumRbTaskType)&&!string.IsNullOrEmpty(_RbTaskType))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟绫诲瀷]{_RbTaskType}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.RbTaskType = enumRbTaskType;
- }
-
- }
- if(!string.IsNullOrEmpty(_RbTaskTypeEnumName))
- {
- addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
- }
-
- if (string.IsNullOrEmpty(_TaskStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_TaskStatus))
- {
- Admin.NET.Application.TaskStatusEnum enumTaskStatus = default(Admin.NET.Application.TaskStatusEnum);
-
- if(!Enum.TryParse<Admin.NET.Application.TaskStatusEnum>(_TaskStatus, out enumTaskStatus)&&!string.IsNullOrEmpty(_TaskStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.TaskStatus = enumTaskStatus;
- }
-
- }
-
- if (string.IsNullOrEmpty(_TaskStatusName))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�佸悕绉癩{_TaskStatusName}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_TaskStatusName))
- {
- addItem.TaskStatusName = (string)(_TaskStatusName.Trim());
- }
- if(!string.IsNullOrEmpty(_TaskDescribe))
- {
- addItem.TaskDescribe = (string)(_TaskDescribe.Trim());
- }
- if(!string.IsNullOrEmpty(_TaskMsg))
- {
- addItem.TaskMsg = (string)(_TaskMsg.Trim());
- }
- if(!string.IsNullOrEmpty(_IssueTime))
- {
- addItem.IssueTime = Convert.ToDateTime(_IssueTime.Trim());
- }
- if(!string.IsNullOrEmpty(_FinishedTime))
- {
- addItem.FinishedTime = Convert.ToDateTime(_FinishedTime.Trim());
- }
-
- if (string.IsNullOrEmpty(_IsFlagFinish))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_IsFlagFinish))
- {
- if(!_IsFlagFinish.Equals("鏄�") && !_IsFlagFinish.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsFlagFinish = _IsFlagFinish.Equals("鏄�") ? true : false;
- addItem.IsFlagFinish = outIsFlagFinish;
- }
- }
-
- #endregion
-
-
- details.Add(addItem);
- }
- //楠岄噸
- await CheckExisitForImport(details);
- return details;
- }
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鏈哄櫒浜轰换鍔¤〃鐨凟xcel瀵煎叆妯℃澘
@@ -396,33 +146,31 @@
var query = _rep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
u.TaskNo.Contains(input.SearchKey.Trim())
- || u.TaskName.Contains(input.SearchKey.Trim())
- || u.UPI.Contains(input.SearchKey.Trim())
+ || u.Upi.Contains(input.SearchKey.Trim())
|| u.PlanNo.Contains(input.SearchKey.Trim())
|| u.OrderId.Contains(input.SearchKey.Trim())
|| u.PackageCode.Contains(input.SearchKey.Trim())
|| u.PlaceCode.Contains(input.SearchKey.Trim())
- || u.RbTaskTypeEnumName.Contains(input.SearchKey.Trim())
- || u.TaskStatusName.Contains(input.SearchKey.Trim())
|| u.TaskDescribe.Contains(input.SearchKey.Trim())
|| u.TaskMsg.Contains(input.SearchKey.Trim())
+ || u.Info17.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.TaskName), u => u.TaskName.Contains(input.TaskName.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Upi), u => u.Upi.Contains(input.Upi.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PlaceCode), u => u.PlaceCode.Contains(input.PlaceCode.Trim()))
.WhereIF(input.RbTaskType.HasValue, u => u.RbTaskType == input.RbTaskType)
- .WhereIF(!string.IsNullOrWhiteSpace(input.RbTaskTypeEnumName), u => u.RbTaskTypeEnumName.Contains(input.RbTaskTypeEnumName.Trim()))
.WhereIF(input.TaskStatus.HasValue, u => u.TaskStatus == input.TaskStatus)
- .WhereIF(!string.IsNullOrWhiteSpace(input.TaskStatusName), u => u.TaskStatusName.Contains(input.TaskStatusName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskDescribe), u => u.TaskDescribe.Contains(input.TaskDescribe.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskMsg), u => u.TaskMsg.Contains(input.TaskMsg.Trim()))
.WhereIF(input.IsFlagFinish.HasValue, u => u.IsFlagFinish == input.IsFlagFinish)
+ .WhereIF(input.LastNum>0, u => u.LastNum == input.LastNum)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
+ .WhereIF(input.Sequence>0, u => u.Sequence == input.Sequence)
.Select<WmsRbLineTaskOutput>();
if(input.IssueTimeRange != null && input.IssueTimeRange.Count >0)
{
@@ -444,6 +192,26 @@
query = query.Where(u => u.FinishedTime <= end);
}
}
+ if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+ {
+ DateTime? start= input.CreateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+ if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
+ {
+ var end = input.CreateTimeRange[1].Value;
+ query = query.Where(u => u.CreateTime <= end);
+ }
+ }
+ if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
+ {
+ DateTime? start= input.UpdateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
+ if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
+ {
+ var end = input.UpdateTimeRange[1].Value;
+ query = query.Where(u => u.UpdateTime <= end);
+ }
+ }
return query;
}
--
Gitblit v1.9.3