From de04aec9646c29f3995965fcc0ae7f0e4dfe960b Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周二, 10 12月 2024 14:18:14 +0800
Subject: [PATCH] 首页
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs | 597 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 298 insertions(+), 299 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 a007bc2..59a9c05 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
@@ -92,7 +92,7 @@
var entity = input.Adapt<WmsRbLineTask>();
//閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
+ await CheckExist(entity,true);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
@@ -115,7 +115,7 @@
#region 瀵煎叆
-
+
/// <summary>
/// Excel妯℃澘瀵煎叆鏈哄櫒浜轰换鍔¤〃鍔熻兘
/// </summary>
@@ -125,15 +125,15 @@
[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);
+ var addList =await CommonImport(importDataTable, _DataStartLine);
await _rep.InsertRangeAsync(addList);
return addList.Count;
}
-
+
/// <summary>
/// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
/// </summary>
@@ -148,234 +148,235 @@
{
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(_Length))
- //{
- // addItem.Length = (float)(_Length.Trim());
- // }
-
- //if (string.IsNullOrEmpty(_Width))
- //{
- // throw Oops.Oh($"绗瑊index}琛孾瀹絔{_Width}涓嶈兘涓虹┖锛�");
- //}
-
- //if(!string.IsNullOrEmpty(_Width))
- //{
- // addItem.Width = (float)(_Width.Trim());
- // }
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
- //if(!string.IsNullOrEmpty(_Thk))
- //{
- // addItem.Thk = (float)(_Thk.Trim());
- // }
-
- 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(Convert.ToDateTime(_IssueTime.Trim()).ToShortDateString());
- }
- if (!string.IsNullOrEmpty(_FinishedTime))
- {
- addItem.FinishedTime = Convert.ToDateTime(Convert.ToDateTime(_FinishedTime.Trim()).ToShortDateString());
- }
-
- 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
-
+
+ var addItem = new WmsRbLineTask();
+ #region 瀹氫箟鍙橀噺
+ var _TaskNo = "";//浠诲姟鍙�
+ var _Upi = "";//閮ㄤ欢鏉＄爜
+ var _Length = "";//闀�
+ var _Width = "";//瀹�
+ var _Thk = "";//鍘�
+ var _PlanNo = "";//鎵规鍙�
+ var _OrderId = "";//璁㈠崟鍙�
+ var _PackageCode = "";//鍖呰鍙�
+ var _PlaceCode = "";//搴撲綅缂栫爜
+ var _RbTaskType = "";//浠诲姟绫诲瀷
+ var _TaskStatus = "";//浠诲姟鐘舵��
+ var _TaskDescribe = "";//浠诲姟鎻忚堪
+ var _TaskMsg = "";//浠诲姟娑堟伅
+ var _IssueTime = "";//涓嬪彂鏃堕棿
+ var _FinishedTime = "";//浠诲姟瀹屾垚鏃堕棿
+ var _IsFlagFinish = "";//鏄惁鏍囪寮哄埗瀹屾垚
+ var _LastNum = "";//鏄惁鏈澘
+ var _Info17 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ var _MachineXCenter = "";//鍖呰X鍧愭爣
+ var _MachineYCenter = "";//鍖呰Y鍧愭爣
+ var _MachineZCenter = "";//鍖呰Z鍧愭爣
+ var _Sequence = "";//灞傛暟
+ #endregion
+
+
+ #region 鍙栧��
+ _TaskNo = 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() ;
+ _TaskStatus = row["浠诲姟鐘舵��"]?.ToString() ;
+ _TaskDescribe = row["浠诲姟鎻忚堪"]?.ToString() ;
+ _TaskMsg = row["浠诲姟娑堟伅"]?.ToString() ;
+ _IssueTime = row["涓嬪彂鏃堕棿"]?.ToString() ;
+ _FinishedTime = row["浠诲姟瀹屾垚鏃堕棿"]?.ToString() ;
+ _IsFlagFinish = row["鏄惁鏍囪寮哄埗瀹屾垚"]?.ToString() ;
+ _LastNum = row["鏄惁鏈澘"]?.ToString() ;
+ _Info17 = row["鏈烘鑷傛槸鍚︽棆杞�"]?.ToString() ;
+ _MachineXCenter = row["鍖呰X鍧愭爣"]?.ToString() ;
+ _MachineYCenter = row["鍖呰Y鍧愭爣"]?.ToString() ;
+ _MachineZCenter = row["鍖呰Z鍧愭爣"]?.ToString() ;
+ _Sequence = 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(_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(_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(_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(_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;
+ }
+ }
+
+ if(!string.IsNullOrEmpty(_LastNum))
+ {
+ if (!int.TryParse(_LastNum, out int outLastNum)&&!string.IsNullOrEmpty(_LastNum))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁鏈澘]{_LastNum}鍊间笉姝ｇ‘锛�");
+ }
+ if (outLastNum <= 0&&!string.IsNullOrEmpty(_LastNum))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁鏈澘]{_LastNum}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.LastNum = outLastNum;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_Info17))
+ {
+ addItem.Info17 = (string)(_Info17.Trim());
+ }
+
+ if(!string.IsNullOrEmpty(_Sequence))
+ {
+ if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾灞傛暟]{_Sequence}鍊间笉姝ｇ‘锛�");
+ }
+ if (outSequence <= 0&&!string.IsNullOrEmpty(_Sequence))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾灞傛暟]{_Sequence}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.Sequence = outSequence;
+ }
+
+ }
+ #endregion
+
details.Add(addItem);
}
@@ -383,7 +384,7 @@
await CheckExisitForImport(details);
return details;
}
-
+
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鏈哄櫒浜轰换鍔¤〃鐨凟xcel瀵煎叆妯℃澘
/// </summary>
@@ -397,7 +398,7 @@
var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鏈哄櫒浜轰换鍔¤〃).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
-
+
#endregion
#region 绉佹湁鏂规硶
@@ -412,100 +413,98 @@
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)
+ if(input.IssueTimeRange != null && input.IssueTimeRange.Count >0)
{
- DateTime? start = input.IssueTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.IssueTime > start);
- if (input.IssueTimeRange.Count > 1 && input.IssueTimeRange[1].HasValue)
+ DateTime? start= input.IssueTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.IssueTime >= start);
+ if (input.IssueTimeRange.Count >1 && input.IssueTimeRange[1].HasValue)
{
- var end = input.IssueTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.IssueTime < end);
+ var end = input.IssueTimeRange[1].Value;
+ query = query.Where(u => u.IssueTime <= end);
}
- }
- if (input.FinishedTimeRange != null && input.FinishedTimeRange.Count > 0)
+ }
+ if(input.FinishedTimeRange != null && input.FinishedTimeRange.Count >0)
{
- DateTime? start = input.FinishedTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.FinishedTime > start);
- if (input.FinishedTimeRange.Count > 1 && input.FinishedTimeRange[1].HasValue)
+ DateTime? start= input.FinishedTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.FinishedTime >= start);
+ if (input.FinishedTimeRange.Count >1 && input.FinishedTimeRange[1].HasValue)
{
- var end = input.FinishedTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.FinishedTime < end);
+ var end = input.FinishedTimeRange[1].Value;
+ query = query.Where(u => u.FinishedTime <= end);
}
- }
+ }
return query;
- }
+ }
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist(WmsRbLineTask input, bool isEdit = false)
- {
-
-
-
- //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
-
-
- //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
- }
-
- /// <summary>
- /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
- {
- if (inputs?.Count <= 0)
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsRbLineTask input,bool isEdit=false)
{
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
}
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
- }
- #endregion
+ #endregion
}
--
Gitblit v1.9.3