更新版本

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

@@ -191,6 +191,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             {
                 input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             }
+            if (input.State!=4)
+            {
+                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
+            }
 
             input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
 
@@ -238,7 +242,10 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             {
                 input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             }
-          
+            if (input.State != 4)
+            {
+                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
+            }
             input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
             // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
@@ -250,12 +257,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [UnitOfWork(false)]
         virtual public async Task<bool> OutputAsync(WmsRequestDetailReportDto input)
         {
-            if (string.IsNullOrEmpty(input.Type))
-            {
-                throw new BusinessException("8989", "出库类型必须填写!");
-                return false;
-            }
-
+           
 
             if (!string.IsNullOrEmpty(input.Client))
             {
@@ -291,7 +293,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
             if (_count > 1)
             {
-                throw new BusinessException("8989", "记录不在同一物料组车型、出库类型、客户编码");
+                throw new BusinessException("8989", "记录中有已经完成记录!");
                 return false;
             }