From 2ea9f50dd9343af2e54f8814c5517cdda2f4fba1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 27 11月 2024 09:56:04 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 149 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 28 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 b366b3e..d3bcc88 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
@@ -4,6 +4,9 @@
using System.Data;
using System.Web;
using System.Text;
+using Furion.DatabaseAccessor;
+using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto;
+
namespace Admin.NET.Application;
/// <summary>
/// 鎵规鏁版嵁鏈嶅姟
@@ -175,6 +178,19 @@
var _Info1 = "";//绾哥闀�
var _Info2 = "";//绾哥瀹�
var _Info3 = "";//绾哥楂�
+ var _Info4 = "";//閿�鍞悎鍚屽崟鍙�
+ var _Info5 = "";//鐢熶骇鍗曞彿
+ var _Info6 = "";//绗嚑鍖�
+ var _Info7 = "";//缁忛攢搴楀悕绉�
+ var _Info8 = "";//浜у搧鍚嶇О
+ var _Info10 = "";//瀹㈡埛鍚嶇О
+ var _Info9 = "";//鍖呰缂栫爜
+ var _Info11 = "";//鑷彁or鍙戣揣
+ var _Info12 = "";//鍖呰閮ㄤ欢鎬绘暟閲�
+ var _Info13 = "";//鍖呰闈㈢Н
+ var _Info14 = "";//閮ㄤ欢鍚嶇О
+ var _Info15 = "";//閮ㄤ欢鏁伴噺
+ var _Info16 = "";//閮ㄤ欢灏哄
#endregion
@@ -203,6 +219,19 @@
_Info1 = row["绾哥闀�"]?.ToString();
_Info2 = row["绾哥瀹�"]?.ToString();
_Info3 = row["绾哥楂�"]?.ToString();
+ _Info4 = row["閿�鍞悎鍚屽崟鍙�"]?.ToString();
+ _Info5 = row["鐢熶骇鍗曞彿"]?.ToString();
+ _Info6 = row["绗嚑鍖�"]?.ToString();
+ _Info7 = row["缁忛攢搴楀悕绉�"]?.ToString();
+ _Info8 = row["浜у搧鍚嶇О"]?.ToString();
+ _Info10 = row["瀹㈡埛鍚嶇О"]?.ToString();
+ _Info9 = row["鍖呰缂栫爜"]?.ToString();
+ _Info11 = row["鑷彁or鍙戣揣"]?.ToString();
+ _Info12 = row["鍖呰閮ㄤ欢鎬绘暟閲�"]?.ToString();
+ _Info13 = row["鍖呰闈㈢Н"]?.ToString();
+ _Info14 = row["閮ㄤ欢鍚嶇О"]?.ToString();
+ _Info15 = row["閮ㄤ欢鏁伴噺"]?.ToString();
+ _Info16 = row["閮ㄤ欢灏哄"]?.ToString();
#endregion
@@ -389,18 +418,7 @@
{
addItem.PackageCode = (string)(_PackageCode.Trim());
}
- //if(!string.IsNullOrEmpty(_MachineXCenter))
- //{
- // addItem.MachineXCenter = (float)(_MachineXCenter.Trim());
- // }
- //if(!string.IsNullOrEmpty(_MachineYCenter))
- //{
- // addItem.MachineYCenter = (float)(_MachineYCenter.Trim());
- // }
- //if(!string.IsNullOrEmpty(_MachineZCenter))
- //{
- // addItem.MachineZCenter = (float)(_MachineZCenter.Trim());
- // }
+
if (!string.IsNullOrEmpty(_Sequence))
{
if (!int.TryParse(_Sequence, out int outSequence) && !string.IsNullOrEmpty(_Sequence))
@@ -433,22 +451,71 @@
}
}
- //if(!string.IsNullOrEmpty(_Rotation))
- //{
- // addItem.Rotation = (float)(_Rotation.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info1))
- //{
- // addItem.Info1 = (float)(_Info1.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info2))
- //{
- // addItem.Info2 = (float)(_Info2.Trim());
- // }
- //if(!string.IsNullOrEmpty(_Info3))
- //{
- // addItem.Info3 = (float)(_Info3.Trim());
- // }
+
+ if (!string.IsNullOrEmpty(_Info4))
+ {
+ addItem.Info4 = (string)(_Info4.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info5))
+ {
+ addItem.Info5 = (string)(_Info5.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info6))
+ {
+ addItem.Info6 = (string)(_Info6.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info7))
+ {
+ addItem.Info7 = (string)(_Info7.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info8))
+ {
+ addItem.Info8 = (string)(_Info8.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info10))
+ {
+ addItem.Info10 = (string)(_Info10.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info9))
+ {
+ addItem.Info9 = (string)(_Info9.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info11))
+ {
+ addItem.Info11 = (string)(_Info11.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info12))
+ {
+ addItem.Info12 = (string)(_Info12.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info13))
+ {
+ addItem.Info13 = (string)(_Info13.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info14))
+ {
+ addItem.Info14 = (string)(_Info14.Trim());
+ }
+ if (!string.IsNullOrEmpty(_Info15))
+ {
+ if (!int.TryParse(_Info15, out int outInfo15) && !string.IsNullOrEmpty(_Info15))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏁伴噺]{_Info15}鍊间笉姝ｇ‘锛�");
+ }
+ if (outInfo15 <= 0 && !string.IsNullOrEmpty(_Info15))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏁伴噺]{_Info15}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.Info15 = outInfo15;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_Info16))
+ {
+ addItem.Info16 = (string)(_Info16.Trim());
+ }
#endregion
@@ -492,6 +559,18 @@
|| u.DetailName.Contains(input.SearchKey.Trim())
|| u.Matgrid.Contains(input.SearchKey.Trim())
|| u.PackageCode.Contains(input.SearchKey.Trim())
+ || u.Info4.Contains(input.SearchKey.Trim())
+ || u.Info5.Contains(input.SearchKey.Trim())
+ || u.Info6.Contains(input.SearchKey.Trim())
+ || u.Info7.Contains(input.SearchKey.Trim())
+ || u.Info8.Contains(input.SearchKey.Trim())
+ || u.Info10.Contains(input.SearchKey.Trim())
+ || u.Info9.Contains(input.SearchKey.Trim())
+ || u.Info11.Contains(input.SearchKey.Trim())
+ || u.Info12.Contains(input.SearchKey.Trim())
+ || u.Info13.Contains(input.SearchKey.Trim())
+ || u.Info14.Contains(input.SearchKey.Trim())
+ || u.Info16.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
@@ -509,6 +588,19 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
.WhereIF(input.Sequence > 0, u => u.Sequence == input.Sequence)
.WhereIF(input.Shelf > 0, u => u.Shelf == input.Shelf)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
+ .WhereIF(input.Info15 > 0, u => u.Info15 == input.Info15)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.Select<Mes_BatchOrderUPI_NewOutput>();
return query;
}
@@ -557,5 +649,6 @@
}
#endregion
+
}
--
Gitblit v1.9.3