From 30443483e37c7d323dca9c20d8407c3614acf542 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 25 12月 2024 11:53:26 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 535 +++++------------------------------------------------------
1 files changed, 46 insertions(+), 489 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 24dc311..d9a25e2 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,12 +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>
-/// 鎵规鏁版嵁鏈嶅姟
+/// 鏉夸欢鏁版嵁鏈嶅姟
/// </summary>
[ApiDescriptionSettings(ApplicationConst.WmsOrderGroupName, Order = 100)]
public class Mes_BatchOrderUPI_NewService : IDynamicApiController, ITransient
@@ -21,7 +18,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ鎵规鏁版嵁
+ /// 鍒嗛〉鏌ヨ鏉夸欢鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -35,7 +32,7 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈡壒娆℃暟鎹�
+ /// 涓嶅垎椤垫煡璇㈡澘浠舵暟鎹�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -49,7 +46,7 @@
}
/// <summary>
- /// 澧炲姞鎵规鏁版嵁
+ /// 澧炲姞鏉夸欢鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -68,7 +65,7 @@
}
/// <summary>
- /// 鍒犻櫎鎵规鏁版嵁
+ /// 鍒犻櫎鏉夸欢鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -83,7 +80,7 @@
}
/// <summary>
- /// 鏇存柊鎵规鏁版嵁
+ /// 鏇存柊鏉夸欢鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -101,7 +98,7 @@
}
/// <summary>
- /// 鑾峰彇鎵规鏁版嵁
+ /// 鑾峰彇鏉夸欢鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -117,435 +114,11 @@
- #region 瀵煎叆
-
- /// <summary>
- /// Excel妯℃澘瀵煎叆鎵规鏁版嵁鍔熻兘
- /// </summary>
- /// <param name="file">Excel妯℃澘鏂囦欢</param>
- /// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "ImportExcel")]
- [Description("Mes_BatchOrderUPI_New/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);
- await _rep.InsertRangeAsync(addList);
- return addList.Count;
- }
-
- /// <summary>
- /// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
- /// </summary>
- /// <param name="dataTable"></param>
- /// <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
- /// <returns></returns>
- private async Task<List<Mes_BatchOrderUPI_New>> CommonImport(DataTable dataTable, int dataStartLine)
- {
- var details = new List<Mes_BatchOrderUPI_New>();
- int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
- foreach (System.Data.DataRow row in dataTable.Rows)
- {
- index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new Mes_BatchOrderUPI_New();
- #region 瀹氫箟鍙橀噺
- var _AreaCode = "";//鎵�鍦ㄥ尯鍩�
- var _UpiStatus = "";//鏉挎枡鐘舵��
- var _PlanNo = "";//鎵规鍙�
- var _OrderId = "";//璁㈠崟鍙�
- var _UPI = "";//閮ㄤ欢鏉＄爜
- 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 = "";//浜у搧鍚嶇О
- var _Info10 = "";//瀹㈡埛鍚嶇О
- var _Info9 = "";//鍖呰缂栫爜
- var _Info11 = "";//鑷彁or鍙戣揣
- var _Info12 = "";//鍖呰閮ㄤ欢鎬绘暟閲�
- var _Info13 = "";//鍖呰闈㈢Н
- var _Info14 = "";//閮ㄤ欢鍚嶇О
- var _Info15 = "";//閮ㄤ欢鏁伴噺
- var _Info16 = "";//閮ㄤ欢灏哄
- #endregion
-
-
- #region 鍙栧��
- _AreaCode = row["鎵�鍦ㄥ尯鍩�"]?.ToString() ;
- _UpiStatus = row["鏉挎枡鐘舵��"]?.ToString() ;
- _PlanNo = row["鎵规鍙�"]?.ToString() ;
- _OrderId = row["璁㈠崟鍙�"]?.ToString() ;
- _UPI = 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() ;
- _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
-
-
- #region 楠岃瘉
- if(!string.IsNullOrEmpty(_AreaCode))
- {
- Admin.NET.Application.AreaCodeEnum enumAreaCode = default(Admin.NET.Application.AreaCodeEnum);
-
- if(!Enum.TryParse<Admin.NET.Application.AreaCodeEnum>(_AreaCode, out enumAreaCode)&&!string.IsNullOrEmpty(_AreaCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵�鍦ㄥ尯鍩焆{_AreaCode}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.AreaCode = enumAreaCode;
- }
-
- }
-
- if (string.IsNullOrEmpty(_UpiStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏉挎枡鐘舵�乚{_UpiStatus}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_UpiStatus))
- {
- Admin.NET.Application.UpiStatusEnum enumUpiStatus = default(Admin.NET.Application.UpiStatusEnum);
-
- if(!Enum.TryParse<Admin.NET.Application.UpiStatusEnum>(_UpiStatus, out enumUpiStatus)&&!string.IsNullOrEmpty(_UpiStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏉挎枡鐘舵�乚{_UpiStatus}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.UpiStatus = enumUpiStatus;
- }
-
- }
-
- 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}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_DetailName))
- {
- addItem.DetailName = (string)(_DetailName.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(_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))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁浼樺寲鍖呰]{_IsPA}鍊间笉姝ｇ‘锛�");
- }
- if (outIsPA <= 0&&!string.IsNullOrEmpty(_IsPA))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁浼樺寲鍖呰]{_IsPA}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- 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;
- }
-
- }
-
- if (string.IsNullOrEmpty(_PackageCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍖呰鍙穄{_PackageCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_PackageCode))
- {
- addItem.PackageCode = (string)(_PackageCode.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;
- }
-
- }
- if(!string.IsNullOrEmpty(_Shelf))
- {
- if (!int.TryParse(_Shelf, out int outShelf)&&!string.IsNullOrEmpty(_Shelf))
- {
- throw Oops.Oh($"绗瑊index}琛孾娆″簭]{_Shelf}鍊间笉姝ｇ‘锛�");
- }
- if (outShelf <= 0&&!string.IsNullOrEmpty(_Shelf))
- {
- throw Oops.Oh($"绗瑊index}琛孾娆″簭]{_Shelf}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.Shelf = outShelf;
- }
-
- }
-
- 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
-
-
- details.Add(addItem);
- }
- //楠岄噸
- await CheckExisitForImport(details);
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鎵规鏁版嵁鐨凟xcel瀵煎叆妯℃澘
- /// </summary>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "DownloadExcelTemplate")]
- [Description("Mes_BatchOrderUPI_New/DownloadExcelTemplate")]
- public IActionResult DownloadExcelTemplate()
- {
- string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\鎵规鏁版嵁{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鎵规鏁版嵁).xlsx", Encoding.GetEncoding("UTF-8"));
- return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
- }
-
- #endregion
#region 绉佹湁鏂规硶
/// <summary>
- /// 鍏叡鏌ヨ鎵规鏁版嵁鏉′欢
+ /// 鍏叡鏌ヨ鏉夸欢鏁版嵁鏉′欢
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -553,55 +126,58 @@
{
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.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.DetailName.Contains(input.SearchKey.Trim())
+ || u.PackageCode.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
+ || u.Info17.Contains(input.SearchKey.Trim())
+ || u.Info18.Contains(input.SearchKey.Trim())
+ || u.Info6.Contains(input.SearchKey.Trim())
+ || u.Info4.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(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.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()))
- .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()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info18), u => u.Info18.Contains(input.Info18.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
.Select<Mes_BatchOrderUPI_NewOutput>();
+ if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+ {
+ DateTime? start= input.CreateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+ if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
+ {
+ var end = input.CreateTimeRange[1].Value;
+ query = query.Where(u => u.CreateTime <= end);
+ }
+ }
+ if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
+ {
+ DateTime? start= input.UpdateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
+ if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
+ {
+ var end = input.UpdateTimeRange[1].Value;
+ query = query.Where(u => u.UpdateTime <= end);
+ }
+ }
return query;
}
@@ -647,26 +223,7 @@
}
- #endregion
-
-
- [HttpPost]
- [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input)
- {
- List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>();
- foreach (var item in input)
- {
- Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New();
- task = item.Adapt<Mes_BatchOrderUPI_New>();
- task.AreaCode = AreaCodeEnum.鏃犲尯鍩�;
- task.UpiStatus = UpiStatusEnum.鍒濆;
- list.Add(task);
- }
- await _rep.InsertRangeAsync(list);
- }
+ #endregion
}
--
Gitblit v1.9.3