新增多种查询方法和枚举列表，优化代码格式

添加了 `using` 引用，调整了 `namespace` 和注释格式，删除多余空行和字符。新增 `GetPageList2`、`GetList`、`GetQueryable`、`GetQueryable2` 等方法，修改 `IsTimeOut` 查询条件逻辑。新增多个获取枚举列表的方法。

WMS.BZModels/Models/SX/BillInvnow.cs

@@ -1,537 +1,534 @@
-using System; 
+using System;
 using System.Collections.Generic;
 using SqlSugar;
 using WMS.BZModels;
 
-namespace  wms.sqlsugar.model.sx
-{    
-	[Tenant("sx")]
+namespace wms.sqlsugar.model.sx
+{
+    [Tenant("sx")]
     [SugarTable("Bill_InvNow")]
-    public  class BillInvnow  : BaseModel
+    public class BillInvnow : BaseModel
     {
-        /// <summary> 
+        /// <summary>
         /// WarehouseId
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long WarehouseId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ContGrpId
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long ContGrpId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ContGrpBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ContGrpBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ContGrpType
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = true)]
         public int? ContGrpType { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BoxBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BoxBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BomDocsNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BomDocsNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BomMatId
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long BomMatId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BomMatCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BomMatCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BomMatName
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 100, IsNullable = true)]
         public string BomMatName { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BomSetId
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long BomSetId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SetGrpCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 100, IsNullable = true)]
         public string SetGrpCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecStateCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecStateCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecDocsNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecDocsNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecDocsRowNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecDocsRowNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecDocsTypeCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecDocsTypeCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// InvInOut
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int InvInOut { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecWho
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecWho { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecTime
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "datetime", IsNullable = false)]
         public DateTime ExecTime { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// PutRow
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int PutRow { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// PutCol
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int PutCol { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// PutLayer
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int PutLayer { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// InvBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string InvBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// InvStateCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string InvStateCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// InDocsNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string InDocsNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// InDocsRowNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string InDocsRowNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SuppCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string SuppCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SuppName
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string SuppName { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// CustCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string CustCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// CustName
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string CustName { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// MatId
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long MatId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// MatCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string MatCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// MatName
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 100, IsNullable = true)]
         public string MatName { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TolWQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal TolWQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// NetWQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal NetWQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TareWQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal TareWQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// LengthQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal LengthQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// CaQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal CaQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SolderQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = false)]
         public decimal SolderQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ContUsageQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int ContUsageQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BatchNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BatchNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ProductTime
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "datetime", IsNullable = false)]
         public DateTime ProductTime { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// OneInTime
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "datetime", IsNullable = false)]
         public DateTime OneInTime { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// RodBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string RodBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// HWBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string HWBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// RFIDBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string RFIDBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// CLBarCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string CLBarCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// HWTypeCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string HWTypeCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BoilerNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BoilerNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// PackNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string PackNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BrandNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string BrandNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ExecStd
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ExecStd { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// LicenceCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string LicenceCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsSurplus
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsSurplus { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsRework
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsRework { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsBlack
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsBlack { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsCore
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsCore { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsFast
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsFast { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsFail
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsFail { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// FailReason
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 200, IsNullable = true)]
         public string FailReason { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SilkTypeCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string SilkTypeCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// Grade
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string Grade { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsBack
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsBack { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// BackReason
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 200, IsNullable = true)]
         public string BackReason { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsTorsChk
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = false)]
         public bool IsTorsChk { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkQty
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int TorsChkQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkTime
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "datetime", IsNullable = false)]
         public DateTime TorsChkTime { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// 正反面
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = true, ColumnDescription = "正反面")]
         public int? SideNum { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkValue
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = true)]
         public decimal? TorsChkValue { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkMachCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string TorsChkMachCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ProcessDocsCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ProcessDocsCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ProductMachCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ProductMachCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ProductLineNo
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string ProductLineNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// Size
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int Size { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// WbGroupCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string WbGroupCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkChord
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = true)]
         public decimal? TorsChkChord { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkFlatness
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = true)]
         public decimal? TorsChkFlatness { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SkuCode
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 100, IsNullable = true)]
         public string SkuCode { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// HoldTime
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = true)]
         public decimal? HoldTime { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// PreStock
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string PreStock { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkStation
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string TorsChkStation { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// IsControlpanel
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "bit", IsNullable = true)]
         public bool? IsControlpanel { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkChordIsGood
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string TorsChkChordIsGood { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkFlatnessIsGood
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string TorsChkFlatnessIsGood { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// TorsChkValueIsGood
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string TorsChkValueIsGood { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// SolderCount
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "decimal", Length = 18, IsNullable = true)]
         public decimal? SolderCount { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// Wind
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = true)]
         public string Wind { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// 接收数据时是否已经有扭转值
-        /// </summary> 
+        /// </summary>
         [SugarColumn(ColumnDataType = "int", IsNullable = true, ColumnDescription = "接收数据时是否已经有扭转值")]
         public int? Ovced { get; set; }
-
-
     }
-}
-
+}

WMS.BZServices/SX/BaseInvService.cs

@@ -23,18 +23,21 @@ namespace WMS.BZServices.SX
             var list = sugarQueryable.ToPage(pagination);
             return list;
         }
+
         public PagedInfo<BillInvNowDto> GetPageList2(Pagination pagination, BillInvNowQueryDto2 billInvNowQueryDto)
         {
             ISugarQueryable<BillInvNowDto> sugarQueryable = GetQueryable2(billInvNowQueryDto);
             var list = sugarQueryable.ToPage(pagination);
             return list;
         }
+
         public IList<BillInvNowDto> GetList(BillInvNowQueryDto billInvNowQueryDto)
         {
             ISugarQueryable<BillInvNowDto> sugarQueryable = GetQueryable(billInvNowQueryDto);
             var list = sugarQueryable.ToList();
             return list;
         }
+
         private ISugarQueryable<BillInvNowDto> GetQueryable(BillInvNowQueryDto billInvNowQueryDto)
         {
             var predicate = Expressionable.Create<BillInvnow, BaseWarecell, BaseWarehouse>();
@@ -84,12 +87,11 @@ namespace WMS.BZServices.SX
             //    predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut), (billInvnow, warecell, warehouse) => (DateTime.Now - billInvnow.ProductTime).TotalHours <= 72 && billInvnow.InDocsNo.ToLower().Contains("cha"));
             //}
             //else
-            if ( !string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut) && billInvNowQueryDto?.IsTimeOut == "1")
+            if (!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut) && billInvNowQueryDto?.IsTimeOut == "1")
             {
-                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut), (billInvnow, warecell, warehouse) => (DateTime.Now - billInvnow.ProductTime).TotalHours >= 72 && !billInvnow.InDocsNo.ToLower().Contains("cha"));
+                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut), (billInvnow, warecell, warehouse) => (billInvnow.ProductMachCode.Contains("R") && billInvnow.OneInTime < DateTime.Now.AddHours(-72)) || (!billInvnow.ProductMachCode.Contains("R") && billInvnow.ProductTime < DateTime.Now.AddHours(-72)));
             }
 
-
             predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ExecStateCode), (billInvnow, warecell, warehouse) => billInvnow.ExecStateCode.Equals(billInvNowQueryDto.ExecStateCode));
 
             predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ContGrpType), (billInvnow, warecell, warehouse) => billInvnow.ContGrpType.Equals(billInvNowQueryDto.ContGrpType));
@@ -100,13 +102,13 @@ namespace WMS.BZServices.SX
             }
 
             var sugarQueryable = _billInvnowrepository.Context.Queryable<BillInvnow, BaseWarecell, BaseWarehouse>((billInvnow, warecell, warehouse) => new object[] {
-                JoinType.Left,billInvnow.ContGrpId == warecell.ContGrpId && billInvnow.WarehouseId ==warecell.WarehouseId  ,  
+                JoinType.Left,billInvnow.ContGrpId == warecell.ContGrpId && billInvnow.WarehouseId ==warecell.WarehouseId  ,
                 JoinType.Left, billInvnow.WarehouseId==warehouse.Id,  JoinType.Left, warecell.WarehouseId==warehouse.Id}).Where(predicate.ToExpression())
               .Select((billInvnow, warecell, warehouse) => new BillInvNowDto
               {
                   Id = billInvnow.Id.ToString(),
                   WarehouseId = billInvnow.WarehouseId.ToString(),
-                  WarehouseName= warehouse.Name,
+                  WarehouseName = warehouse.Name,
                   ContGrpId = billInvnow.ContGrpId.ToString(),
                   ContGrpBarCode = billInvnow.ContGrpBarCode,
                   ContGrpType = (int)billInvnow.ContGrpType,
@@ -176,7 +178,7 @@ namespace WMS.BZServices.SX
                   ProcessDocsCode = billInvnow.ProcessDocsCode,
                   ProductMachCode = billInvnow.ProductMachCode,
                   ProductLineNo = billInvnow.ProductLineNo,
-                   Wind= billInvnow.Wind,
+                  Wind = billInvnow.Wind,
                   AddWho = billInvnow.AddWho,
                   AddTime = billInvnow.AddTime,
                   EditWho = billInvnow.EditWho,
@@ -187,10 +189,10 @@ namespace WMS.BZServices.SX
                   Code = warecell.Code,
                   CellState = warecell.IsStop,
                   SolderCount = billInvnow.SolderCount,
-                  HoldTime = billInvnow.HoldTime,                
+                  HoldTime = billInvnow.HoldTime,
                   IsControlpanel = billInvnow.IsControlpanel,
                   WbGroupCode = billInvnow.WbGroupCode,
-                  SkuCode= billInvnow.SkuCode,
+                  SkuCode = billInvnow.SkuCode,
 
                   PreStock = billInvnow.PreStock,
                   TorsChkChord = billInvnow.TorsChkChord,
@@ -202,11 +204,12 @@ namespace WMS.BZServices.SX
               }).MergeTable();
             return sugarQueryable;
         }
+
         private ISugarQueryable<BillInvNowDto> GetQueryable2(BillInvNowQueryDto2 billInvNowQueryDto)
         {
             var predicate = Expressionable.Create<BillInvnow, VPBoxDocSku>();
 
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.KeyWord), (billInvnow,pbox) => billInvnow.RFIDBarCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.ContGrpBarCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.MatCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.MatName.Contains(billInvNowQueryDto.KeyWord) || billInvnow.InvBarCode.Contains(billInvNowQueryDto.KeyWord));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.KeyWord), (billInvnow, pbox) => billInvnow.RFIDBarCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.ContGrpBarCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.MatCode.Contains(billInvNowQueryDto.KeyWord) || billInvnow.MatName.Contains(billInvNowQueryDto.KeyWord) || billInvnow.InvBarCode.Contains(billInvNowQueryDto.KeyWord));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.Id), (billInvnow,pbox) => billInvnow.Id.ToString().Contains(billInvNowQueryDto.Id));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.WarehouseId), (billInvnow,pbox) => billInvnow.WarehouseId.ToString().Contains(billInvNowQueryDto.WarehouseId));
 
@@ -239,13 +242,13 @@ namespace WMS.BZServices.SX
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsControlpanel), (billInvnow,pbox) => billInvnow.IsControlpanel.Equals(billInvNowQueryDto.IsControlpanel));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTorsChk), (billInvnow,pbox) => billInvnow.IsTorsChk.Equals(billInvNowQueryDto.IsTorsChk));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsCore), (billInvnow,pbox) => billInvnow.IsCore.Equals(billInvNowQueryDto.IsCore));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.WbGroupCode), (billInvnow,pbox) => billInvnow.WbGroupCode == billInvNowQueryDto.WbGroupCode);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.WbGroupCode), (billInvnow, pbox) => billInvnow.WbGroupCode == billInvNowQueryDto.WbGroupCode);
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.SolderCount), (billInvnow,pbox) => billInvnow.SolderCount.ToString().Contains(billInvNowQueryDto.SolderCount));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.HoldTime), (billInvnow,pbox) => billInvnow.HoldTime.ToString().Contains(billInvNowQueryDto.HoldTime));
 
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.Wind), (billInvnow,pbox) => billInvnow.Wind.ToString() == billInvNowQueryDto.Wind);
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.SkuCode), (billInvnow,pbox) => pbox.SkuCode.ToString().Contains(billInvNowQueryDto.SkuCode));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.HwTypeCode), (billInvnow,pbox) => billInvnow.HWTypeCode.ToString().Contains(billInvNowQueryDto.HwTypeCode));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.Wind), (billInvnow, pbox) => billInvnow.Wind.ToString() == billInvNowQueryDto.Wind);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.SkuCode), (billInvnow, pbox) => pbox.SkuCode.ToString().Contains(billInvNowQueryDto.SkuCode));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.HwTypeCode), (billInvnow, pbox) => billInvnow.HWTypeCode.ToString().Contains(billInvNowQueryDto.HwTypeCode));
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.TorsChkQty), (billInvnow,pbox) => billInvnow.TorsChkQty.Equals(billInvNowQueryDto.TorsChkQty));
 
             //if (!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut) && billInvNowQueryDto?.IsTimeOut == "0")
@@ -255,23 +258,22 @@ namespace WMS.BZServices.SX
             //else
             if (!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut) && billInvNowQueryDto?.IsTimeOut == "1")
             {
-                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut), (billInvnow,pbox) => (DateTime.Now - billInvnow.ProductTime).TotalHours >= 72 && !billInvnow.InDocsNo.ToLower().Contains("cha"));
+                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.IsTimeOut), (billInvnow, pbox) => (billInvnow.ProductMachCode.Contains("R") && billInvnow.OneInTime < DateTime.Now.AddHours(-72)) || (!billInvnow.ProductMachCode.Contains("R") && billInvnow.ProductTime < DateTime.Now.AddHours(-72)));
             }
 
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ExecStateCode), (billInvnow, pbox) => billInvnow.ExecStateCode.Equals(billInvNowQueryDto.ExecStateCode));
 
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ExecStateCode), (billInvnow,pbox) => billInvnow.ExecStateCode.Equals(billInvNowQueryDto.ExecStateCode));
-
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ContGrpType), (billInvnow,pbox) => billInvnow.ContGrpType.Equals(billInvNowQueryDto.ContGrpType));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.ContGrpType), (billInvnow, pbox) => billInvnow.ContGrpType.Equals(billInvNowQueryDto.ContGrpType));
             if (!string.IsNullOrEmpty(billInvNowQueryDto?.InvStateCode))
             {
                 var enums = (InvState)Enum.ToObject(typeof(InvState), Convert.ToInt32(billInvNowQueryDto?.InvStateCode));
-                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.InvStateCode), (billInvnow,pbox) => billInvnow.InvStateCode.Equals(enums.ToString()));
+                predicate = predicate.AndIF(!string.IsNullOrEmpty(billInvNowQueryDto?.InvStateCode), (billInvnow, pbox) => billInvnow.InvStateCode.Equals(enums.ToString()));
             }
 
-            var sugarQueryable = _billInvnowrepository.Context.Queryable<BillInvnow, VPBoxDocSku>((billInvnow,pbox) => new object[] {
+            var sugarQueryable = _billInvnowrepository.Context.Queryable<BillInvnow, VPBoxDocSku>((billInvnow, pbox) => new object[] {
                 JoinType.Inner, billInvnow.InDocsNo.StartsWith(pbox.DocsNo)
             }).Where(predicate.ToExpression()).Where((billInvnow, pbox) => billInvnow.InvStateCode == "InvEcecState_In")
-              .Select((billInvnow,pbox) => new BillInvNowDto
+              .Select((billInvnow, pbox) => new BillInvNowDto
               {
                   Id = billInvnow.Id.ToString(),
                   WarehouseId = billInvnow.WarehouseId.ToString(),
@@ -369,9 +371,10 @@ namespace WMS.BZServices.SX
                   TorsChkStation = billInvnow.TorsChkStation,
                   TorsChkValueIsGood = billInvnow.TorsChkValueIsGood,
               });
- 
+
             return sugarQueryable;
         }
+
         public List<EnumEntity> InvStateList()
         {
             return BZModels.Extensions.EnumToList<InvState>();
@@ -386,22 +389,27 @@ namespace WMS.BZServices.SX
         {
             return BZModels.Extensions.EnumToList<TaskType>();
         }
+
         public List<EnumEntity2> TaskBusTypeList()
         {
             return BZModels.Extensions.EnumToListDesc<SxTaskBusType>();
         }
+
         public List<EnumEntity> AGVTaskTypeList()
         {
             return BZModels.Extensions.EnumToList<AGVTaskType>();
         }
+
         public List<EnumEntity> FackbeekTypeList()
         {
             return BZModels.Extensions.EnumToList<FackbeekType>();
         }
+
         public List<EnumEntity> AGVTaskStatus()
         {
             return BZModels.Extensions.EnumToList<AGVTaskStatus>();
         }
+
         public List<EnumEntity> ContGrpTypeList()
         {
             return BZModels.Extensions.EnumToList<ContGrpType>();
@@ -416,17 +424,15 @@ namespace WMS.BZServices.SX
         {
             return BZModels.Extensions.EnumToList<DocState>();
         }
+
         public List<EnumEntity> LocationStateList()
         {
             return BZModels.Extensions.EnumToList<LocationState>();
         }
+
         public List<EnumEntity> AutoManualOutTypeList()
         {
             return BZModels.Extensions.EnumToList<AutoManualOutType>();
         }
-
-       
     }
-
-
-}
+}