更新版本

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs

@@ -190,7 +190,8 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
         [ImporterHeader(Name = "交货单号")]
         public string WmsBillNum { set; get; }
 
-      
+        [ImporterHeader(Name = "单号",IsIgnore =true)]
+        public string BillNum { set; get; }
         [ImporterHeader(Name = "订单号")]
         //底盘号
         public string OrderBillNum { set; get; }
@@ -300,8 +301,7 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
         //物料组(车型)  
         public string Version { set; get; }
 
-
-
+        public string BillNum { set; get; }
 
 
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs

@@ -122,7 +122,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
         {
-     
+
+
+
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs

@@ -137,6 +137,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
         {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
 

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs

@@ -31,10 +31,10 @@ namespace Win.Sfs.SettleAccount.Repository
         public virtual async Task<List<Job>> GetTaskJobsAsync(Job p_task)
         {
             string str = string.Empty;
-            str += "SELECT b.Id, a.StateId,b.Type, a.StateName, a.InvocationData, a.Arguments, a.CreatedAt, a.ExpireAt, b.TaskId, b.Name,isnull(b.remark,'') remark, \n";
+            str += " SELECT b.Id, a.StateId,b.Type, a.StateName, a.InvocationData, a.Arguments, a.CreatedAt, a.ExpireAt, b.TaskId, b.Name,isnull(b.remark,'') remark, \n ";
             str += " b.ActionName, b.Error, b.Creator, b.Email, b.FileName, b.DownFileName, b.ServiceName,b.RealDownFileName,b.RealFileName \n";
-            str += " FROM      HangFire.Job AS a INNER JOIN \n";
-            str += " Set_TaskJob AS b ON a.Id = b.TaskId \n";
+            str += " FROM      HangFire.Job AS a INNER JOIN  \n";
+            str += " Set_TaskJob AS b ON a.Id = b.TaskId     \n";
 
             str += "where 1=1 ";