From 09d0a68dcc8a48a79e472b87c4aa3c90e9770154 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 08 12月 2024 10:43:35 +0800
Subject: [PATCH] 2
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 47 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..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
@@ -152,8 +152,7 @@
var addItem = new WmsRbLineTask();
#region 瀹氫箟鍙橀噺
var _TaskNo = "";//浠诲姟鍙�
- var _TaskName = "";//浠诲姟鍚嶇О
- var _UPI = "";//閮ㄤ欢鏉＄爜
+ var _Upi = "";//閮ㄤ欢鏉＄爜
var _Length = "";//闀�
var _Width = "";//瀹�
var _Thk = "";//鍘�
@@ -162,21 +161,24 @@
var _PackageCode = "";//鍖呰鍙�
var _PlaceCode = "";//搴撲綅缂栫爜
var _RbTaskType = "";//浠诲姟绫诲瀷
- var _RbTaskTypeEnumName = "";//浠诲姟绫诲瀷鍚嶇О
var _TaskStatus = "";//浠诲姟鐘舵��
- var _TaskStatusName = "";//浠诲姟鐘舵�佸悕绉�
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() ;
- _TaskName = row["浠诲姟鍚嶇О"]?.ToString() ;
- _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString() ;
+ _Upi = row["閮ㄤ欢鏉＄爜"]?.ToString() ;
_Length = row["闀�"]?.ToString() ;
_Width = row["瀹�"]?.ToString() ;
_Thk = row["鍘�"]?.ToString() ;
@@ -185,14 +187,18 @@
_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() ;
+ _LastNum = row["鏄惁鏈澘"]?.ToString() ;
+ _Info17 = row["鏈烘鑷傛槸鍚︽棆杞�"]?.ToString() ;
+ _MachineXCenter = row["鍖呰X鍧愭爣"]?.ToString() ;
+ _MachineYCenter = row["鍖呰Y鍧愭爣"]?.ToString() ;
+ _MachineZCenter = row["鍖呰Z鍧愭爣"]?.ToString() ;
+ _Sequence = row["灞傛暟"]?.ToString() ;
#endregion
@@ -207,19 +213,15 @@
{
addItem.TaskNo = (string)(_TaskNo.Trim());
}
- if(!string.IsNullOrEmpty(_TaskName))
- {
- addItem.TaskName = (string)(_TaskName.Trim());
- }
- if (string.IsNullOrEmpty(_UPI))
+ if (string.IsNullOrEmpty(_Upi))
{
- throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
+ throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_Upi}涓嶈兘涓虹┖锛�");
}
- if(!string.IsNullOrEmpty(_UPI))
+ if(!string.IsNullOrEmpty(_Upi))
{
- addItem.UPI = (string)(_UPI.Trim());
+ addItem.Upi = (string)(_Upi.Trim());
}
if (string.IsNullOrEmpty(_Length))
@@ -227,15 +229,7 @@
throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
}
-
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
-
-
+
if (string.IsNullOrEmpty(_PlanNo))
{
throw Oops.Oh($"绗瑊index}琛孾鎵规鍙穄{_PlanNo}涓嶈兘涓虹┖锛�");
@@ -289,10 +283,6 @@
}
}
- if(!string.IsNullOrEmpty(_RbTaskTypeEnumName))
- {
- addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
- }
if (string.IsNullOrEmpty(_TaskStatus))
{
@@ -312,16 +302,6 @@
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))
{
@@ -358,6 +338,43 @@
}
}
+ 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
@@ -396,33 +413,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)
{
--
Gitblit v1.9.3