From 9fe266f1956ac01a7ab446d3c84a046ac4ea90af Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 09:33:31 +0800
Subject: [PATCH] 1
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 233 ++++++++++++++++++++-------------------------------------
1 files changed, 82 insertions(+), 151 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 d3bcc88..864afe2 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,9 +4,6 @@
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>
/// 鎵规鏁版嵁鏈嶅姟
@@ -154,32 +151,27 @@
var addItem = new Mes_BatchOrderUPI_New();
#region 瀹氫箟鍙橀噺
- var _AreaCode = "";//鎵�鍦ㄥ尯鍩�
- var _UpiStatus = "";//鏉挎枡鐘舵��
+ var _UPI = "";//閮ㄤ欢鏉＄爜
var _PlanNo = "";//鎵规鍙�
var _OrderId = "";//璁㈠崟鍙�
- var _UPI = "";//閮ㄤ欢鏉＄爜
+ var _Info5 = "";//鐢熶骇鍗曞彿
+ var _AreaCode = "";//鎵�鍦ㄥ尯鍩�
+ var _UpiStatus = "";//鏉挎枡鐘舵��
var _DetailName = "";//閮ㄤ欢鍚嶇О
var _Length = "";//闀�
var _Width = "";//瀹�
var _Thk = "";//鍘�
- var _Matgrid = "";//閮ㄤ欢绾圭悊
- var _IsEB = "";//鏄惁灏佽竟
- var _DRNum = "";//鎵撳瓟璁惧缂栧彿
var _IsPA = "";//鏄惁浼樺寲鍖呰
- var _MaterialIndeX = "";//閿垏鍥惧彿
var _PackageCode = "";//鍖呰鍙�
var _MachineXCenter = "";//鍖呰X鍧愭爣
var _MachineYCenter = "";//鍖呰Y鍧愭爣
var _MachineZCenter = "";//鍖呰Z鍧愭爣
var _Sequence = "";//灞傛暟
var _Shelf = "";//娆″簭
- var _Rotation = "";//杞悜瑙掑害
var _Info1 = "";//绾哥闀�
var _Info2 = "";//绾哥瀹�
var _Info3 = "";//绾哥楂�
var _Info4 = "";//閿�鍞悎鍚屽崟鍙�
- var _Info5 = "";//鐢熶骇鍗曞彿
var _Info6 = "";//绗嚑鍖�
var _Info7 = "";//缁忛攢搴楀悕绉�
var _Info8 = "";//浜у搧鍚嶇О
@@ -188,39 +180,36 @@
var _Info11 = "";//鑷彁or鍙戣揣
var _Info12 = "";//鍖呰閮ㄤ欢鎬绘暟閲�
var _Info13 = "";//鍖呰闈㈢Н
- var _Info14 = "";//閮ㄤ欢鍚嶇О
+ //var _Info14 = "";//閮ㄤ欢鍚嶇О
var _Info15 = "";//閮ㄤ欢鏁伴噺
var _Info16 = "";//閮ㄤ欢灏哄
+ var _Info17 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ var _UpiFlag = "";//鏍囪
#endregion
#region 鍙栧��
- _AreaCode = row["鎵�鍦ㄥ尯鍩�"]?.ToString();
- _UpiStatus = row["鏉挎枡鐘舵��"]?.ToString();
+ _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString();
_PlanNo = row["鎵规鍙�"]?.ToString();
_OrderId = row["璁㈠崟鍙�"]?.ToString();
- _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString();
+ _Info5 = row["鐢熶骇鍗曞彿"]?.ToString();
+ _AreaCode = row["鎵�鍦ㄥ尯鍩�"]?.ToString();
+ _UpiStatus = row["鏉挎枡鐘舵��"]?.ToString();
_DetailName = row["閮ㄤ欢鍚嶇О"]?.ToString();
_Length = row["闀�"]?.ToString();
_Width = row["瀹�"]?.ToString();
_Thk = row["鍘�"]?.ToString();
- _Matgrid = row["閮ㄤ欢绾圭悊"]?.ToString();
- _IsEB = row["鏄惁灏佽竟"]?.ToString();
- _DRNum = row["鎵撳瓟璁惧缂栧彿"]?.ToString();
_IsPA = row["鏄惁浼樺寲鍖呰"]?.ToString();
- _MaterialIndeX = row["閿垏鍥惧彿"]?.ToString();
_PackageCode = row["鍖呰鍙�"]?.ToString();
_MachineXCenter = row["鍖呰X鍧愭爣"]?.ToString();
_MachineYCenter = row["鍖呰Y鍧愭爣"]?.ToString();
_MachineZCenter = row["鍖呰Z鍧愭爣"]?.ToString();
_Sequence = row["灞傛暟"]?.ToString();
_Shelf = row["娆″簭"]?.ToString();
- _Rotation = row["杞悜瑙掑害"]?.ToString();
_Info1 = row["绾哥闀�"]?.ToString();
_Info2 = row["绾哥瀹�"]?.ToString();
_Info3 = row["绾哥楂�"]?.ToString();
_Info4 = row["閿�鍞悎鍚屽崟鍙�"]?.ToString();
- _Info5 = row["鐢熶骇鍗曞彿"]?.ToString();
_Info6 = row["绗嚑鍖�"]?.ToString();
_Info7 = row["缁忛攢搴楀悕绉�"]?.ToString();
_Info8 = row["浜у搧鍚嶇О"]?.ToString();
@@ -229,13 +218,49 @@
_Info11 = row["鑷彁or鍙戣揣"]?.ToString();
_Info12 = row["鍖呰閮ㄤ欢鎬绘暟閲�"]?.ToString();
_Info13 = row["鍖呰闈㈢Н"]?.ToString();
- _Info14 = row["閮ㄤ欢鍚嶇О"]?.ToString();
+ //_Info14 = row["閮ㄤ欢鍚嶇О"]?.ToString() ;
_Info15 = row["閮ㄤ欢鏁伴噺"]?.ToString();
_Info16 = row["閮ㄤ欢灏哄"]?.ToString();
+ _Info17 = row["鏈烘鑷傛槸鍚︽棆杞�"]?.ToString();
+ _UpiFlag = row["鏍囪"]?.ToString();
#endregion
#region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_UPI))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
+ }
+
+ if (!string.IsNullOrEmpty(_UPI))
+ {
+ addItem.UPI = (string)(_UPI.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(_Info5))
+ {
+ addItem.Info5 = (string)(_Info5.Trim());
+ }
if (!string.IsNullOrEmpty(_AreaCode))
{
Admin.NET.Application.AreaCodeEnum enumAreaCode = default(Admin.NET.Application.AreaCodeEnum);
@@ -271,36 +296,6 @@
}
- 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(_UPI))
- {
- throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_UPI))
- {
- addItem.UPI = (string)(_UPI.Trim());
- }
-
if (string.IsNullOrEmpty(_DetailName))
{
throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鍚嶇О]{_DetailName}涓嶈兘涓虹┖锛�");
@@ -316,66 +311,7 @@
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(_Matgrid))
- {
- addItem.Matgrid = (string)(_Matgrid.Trim());
- }
- if (!string.IsNullOrEmpty(_IsEB))
- {
- if (!int.TryParse(_IsEB, out int outIsEB) && !string.IsNullOrEmpty(_IsEB))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁灏佽竟]{_IsEB}鍊间笉姝ｇ‘锛�");
- }
- if (outIsEB <= 0 && !string.IsNullOrEmpty(_IsEB))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁灏佽竟]{_IsEB}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.IsEB = outIsEB;
- }
-
- }
- if (!string.IsNullOrEmpty(_DRNum))
- {
- if (!int.TryParse(_DRNum, out int outDRNum) && !string.IsNullOrEmpty(_DRNum))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵撳瓟璁惧缂栧彿]{_DRNum}鍊间笉姝ｇ‘锛�");
- }
- if (outDRNum <= 0 && !string.IsNullOrEmpty(_DRNum))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵撳瓟璁惧缂栧彿]{_DRNum}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.DRNum = outDRNum;
- }
-
- }
if (!string.IsNullOrEmpty(_IsPA))
{
if (!int.TryParse(_IsPA, out int outIsPA) && !string.IsNullOrEmpty(_IsPA))
@@ -389,22 +325,6 @@
else
{
addItem.IsPA = outIsPA;
- }
-
- }
- if (!string.IsNullOrEmpty(_MaterialIndeX))
- {
- if (!int.TryParse(_MaterialIndeX, out int outMaterialIndeX) && !string.IsNullOrEmpty(_MaterialIndeX))
- {
- throw Oops.Oh($"绗瑊index}琛孾閿垏鍥惧彿]{_MaterialIndeX}鍊间笉姝ｇ‘锛�");
- }
- if (outMaterialIndeX <= 0 && !string.IsNullOrEmpty(_MaterialIndeX))
- {
- throw Oops.Oh($"绗瑊index}琛孾閿垏鍥惧彿]{_MaterialIndeX}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MaterialIndeX = outMaterialIndeX;
}
}
@@ -456,10 +376,6 @@
{
addItem.Info4 = (string)(_Info4.Trim());
}
- if (!string.IsNullOrEmpty(_Info5))
- {
- addItem.Info5 = (string)(_Info5.Trim());
- }
if (!string.IsNullOrEmpty(_Info6))
{
addItem.Info6 = (string)(_Info6.Trim());
@@ -492,10 +408,10 @@
{
addItem.Info13 = (string)(_Info13.Trim());
}
- if (!string.IsNullOrEmpty(_Info14))
- {
- addItem.Info14 = (string)(_Info14.Trim());
- }
+ //if(!string.IsNullOrEmpty(_Info14))
+ //{
+ // addItem.Info14 = (string)(_Info14.Trim());
+ // }
if (!string.IsNullOrEmpty(_Info15))
{
if (!int.TryParse(_Info15, out int outInfo15) && !string.IsNullOrEmpty(_Info15))
@@ -515,6 +431,24 @@
if (!string.IsNullOrEmpty(_Info16))
{
addItem.Info16 = (string)(_Info16.Trim());
+ }
+ 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
@@ -553,14 +487,13 @@
{
var query = _rep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
- u.PlanNo.Contains(input.SearchKey.Trim())
+ u.UPI.Contains(input.SearchKey.Trim())
+ || u.PlanNo.Contains(input.SearchKey.Trim())
|| u.OrderId.Contains(input.SearchKey.Trim())
- || u.UPI.Contains(input.SearchKey.Trim())
+ || u.Info5.Contains(input.SearchKey.Trim())
|| 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())
@@ -569,27 +502,24 @@
|| 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.Info14.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
+ || u.Info17.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
- .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
- .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
+ .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.UPI), u => u.UPI.Contains(input.UPI.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
+ .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
.WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName.Contains(input.DetailName.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Matgrid), u => u.Matgrid.Contains(input.Matgrid.Trim()))
- .WhereIF(input.IsEB > 0, u => u.IsEB == input.IsEB)
- .WhereIF(input.DRNum > 0, u => u.DRNum == input.DRNum)
.WhereIF(input.IsPA > 0, u => u.IsPA == input.IsPA)
- .WhereIF(input.MaterialIndeX > 0, u => u.MaterialIndeX == input.MaterialIndeX)
.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()))
@@ -598,9 +528,11 @@
.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(!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()))
+ .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;
}
@@ -648,7 +580,6 @@
}
#endregion
-
}
--
Gitblit v1.9.3