Merge branch 'master' of http://119.3.29.177:3000/xusc/IcsFromERPJob

ICSSoft.FromERP/SyncMoHour_Rhyton.cs

@@ -146,7 +146,7 @@ and a.MoStatus='mostatus_close'
 and a.Default6='0'
 and a.TenantId='{0}'
 and e.OpControl='10000000'
-and (h2.AlterTime is null  or h2.Id is null )
+and ((h2.AlterTime is null and h2.Status='No' ) or h2.Id is null )
 ) a
 where 1=1
 ) a
@@ -216,6 +216,8 @@ from #tempSyncMoHour_Rhyton  a
  join IcsMoHourData b on a.MoCode=b.MoCode and a.OpCode=b.OpCode
  where 1=1
  and b.AlterTime is null
+ and b.Status='No'
+