Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

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

@@ -195,11 +195,12 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
         [ImporterHeader(Name = "订单号")]
         //底盘号
         public string OrderBillNum { set; get; }
+
         [ImporterHeader(Name = "物料号")]
         //物料号
         public string MaterialCode { set; get; }
 
-      
+        public string BillNum { set; get; }
 
         [ImporterHeader(Name = "物料描述")]
         //物料描述

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

@@ -142,6 +142,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsHQHKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
         {
+            //不用传version 单号能保证唯一
+            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);