Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs

@@ -170,6 +170,10 @@ namespace Myshipping.Application
                 var shipList = _taskRollingNominationShipInfoRepository.AsQueryable()
                     .Where(a => a.NOM_ID == rollModel.PK_ID && a.GROUP_INDX == 1 && !a.IsDeleted).ToList();
 
+                if(shipList.Count == 0)
+                    shipList = _taskRollingNominationShipInfoRepository.AsQueryable()
+                    .Where(a => a.NOM_ID == rollModel.PK_ID && a.GROUP_INDX == 0 && !a.IsDeleted).ToList();
+
                 var fromEntity = shipList.FirstOrDefault(a =>
                     a.SHIP_TYPE.Equals("From", StringComparison.OrdinalIgnoreCase));