海运出口修改

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -522,11 +522,11 @@ public partial class SeaExportService : ISeaExportService
             }
             info = req.Adapt(info);
             //TODO  会计期间不允许小于已结转期间
-            if (info.CloseDocDate.IsNotNull() && info.CloseDocDate < info.ETD)
+            if (info.CloseDocDate.IsNotNull() && info.CloseDocDate > info.ETD)
             {
                 return await Task.FromResult(DataResult.Failed("截单日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit));
             }
-            if (info.ClosingDate.IsNotNull() && info.ClosingDate < info.ETD)
+            if (info.ClosingDate.IsNotNull() && info.ClosingDate > info.ETD)
             {
                 return await Task.FromResult(DataResult.Failed("截港日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit));
             }

ds-wms-service/DS.WMS.Core/Sys/Method/SysRoleService.cs

@@ -218,8 +218,8 @@ public class SysRoleService : ISysRoleService
         IEnumerable<long?> delPermissions = existPermissions.AsQueryable().Except(model.PermissionIds);
         if (delPermissions.Count() > 0)
         {
-            db.Updateable<SysRolePermission>()
+            db.Deleteable<SysRolePermission>()
-                .SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值
+                //.SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值
                 .Where(it => it.RoleId == model.RoleId && delPermissions.Contains(it.PermissionId))
                 .ExecuteCommand();
         }
@@ -258,8 +258,8 @@ public class SysRoleService : ISysRoleService
         IEnumerable<long?> delPermissions = existPermissions.AsQueryable().Except(model.PermissionIds);
         if (delPermissions.Count() > 0)
         {
-            db.Updateable<SysRolePermission>()
+            db.Deleteable<SysRolePermission>()
-                .SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值
+                 //.SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值
                  .Where(it => it.RoleId == model.RoleId && delPermissions.Contains(it.PermissionId))
                  .ExecuteCommand();
         }