From 6143bf1429551edd4d71f45b120bc99689031e40 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 15:32:02 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
index 130f7d3..aca858e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
@@ -184,6 +184,7 @@
var _Info15 = "";//閮ㄤ欢鏁伴噺
var _Info16 = "";//閮ㄤ欢灏哄
var _Info17 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ var _UpiFlag = "";//鏍囪
#endregion
@@ -221,6 +222,7 @@
_Info15 = row["閮ㄤ欢鏁伴噺"]?.ToString() ;
_Info16 = row["閮ㄤ欢灏哄"]?.ToString() ;
_Info17 = row["鏈烘鑷傛槸鍚︽棆杞�"]?.ToString() ;
+ _UpiFlag = row["鏍囪"]?.ToString() ;
#endregion
@@ -309,12 +311,6 @@
throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
}
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsPA))
{
@@ -342,7 +338,7 @@
{
addItem.PackageCode = (string)(_PackageCode.Trim());
}
-
+
if(!string.IsNullOrEmpty(_Sequence))
{
if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
@@ -375,7 +371,15 @@
}
}
-
+
+ if(!string.IsNullOrEmpty(_Info4))
+ {
+ addItem.Info4 = (string)(_Info4.Trim());
+ }
+ if(!string.IsNullOrEmpty(_Info6))
+ {
+ addItem.Info6 = (string)(_Info6.Trim());
+ }
if(!string.IsNullOrEmpty(_Info7))
{
addItem.Info7 = (string)(_Info7.Trim());
@@ -431,6 +435,20 @@
if(!string.IsNullOrEmpty(_Info17))
{
addItem.Info17 = (string)(_Info17.Trim());
+ }
+ if(!string.IsNullOrEmpty(_UpiFlag))
+ {
+ Admin.NET.Application.UpiFlagEnum enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
+
+ if(!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag)&&!string.IsNullOrEmpty(_UpiFlag))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囪]{_UpiFlag}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.UpiFlag = enumUpiFlag;
+ }
+
}
#endregion
@@ -514,6 +532,7 @@
.WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
+ .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.Select<Mes_BatchOrderUPI_NewOutput>();
return query;
}
--
Gitblit v1.9.3