fix

wms.service/Service/CPService.cs

@@ -5390,9 +5390,10 @@ namespace wms.service.Service
         /// <returns></returns>
         public SRes TriggerAutoCalibration()
         {
-            const string deviceId = ""; //TODO:根据实际情况设置设备ID
+            const string deviceId = "8058"; //TODO:根据实际情况设置设备ID
             const string matCode = "FaMa";
             var result = new SRes() { ResCode = ResponseStatusCodeEnum.Sucess.GetHashCode(), ResMsg = ResponseStatusCodeEnum.Sucess.GetDescription() };
+            var sysconfig = _sysconfigrepository.GetFirst(p => p.Code == "AutomaticCalibration");
             var config = _sysconfigrepository.GetFirst(p => p.Code == "AutomaticCalibration").SContent;
 
             if (!ShouldTriggerScaleTask(config))
@@ -5401,14 +5402,18 @@ namespace wms.service.Service
                 result.ResMsg = "不在可执行范围内";
                 return result;
             }
-
+            var hour = 10;
+            if (sysconfig != null && string.IsNullOrEmpty(sysconfig.Default1))
+            {
+                hour = Convert.ToInt16(sysconfig.Default1);
+            }
             //检查今天早上十点-十点五十九之间是否执行过
             DateTime now = DateTime.Now;
             // 当天 10:00 开始
-            DateTime startTime = new DateTime(now.Year, now.Month, now.Day, 10, 0, 0);
+            DateTime startTime = new DateTime(now.Year, now.Month, now.Day, hour, 0, 0);
             // 当天 10:59 结束
-            DateTime endTime = new DateTime(now.Year, now.Month, now.Day, 10, 59, 59);
-            if (_wcstaskinfo.IsAny(p => p.AddrTo == deviceId && p.AddTime > startTime && p.AddTime < endTime))
+            DateTime endTime = new DateTime(now.Year, now.Month, now.Day, hour, 59, 59);
+            if (_wcstaskinfo.IsAny(p => p.AddrTo == deviceId && p.AddTime > startTime && p.AddTime < endTime && p.BusType == CpTaskBusType.TaskBusType_CP_WeightOut.GetDescription()))
             {
                 result.ResCode = ResponseStatusCodeEnum.EquipInfoNotExist.GetHashCode();
                 result.ResMsg = "本周期内已执行过";
@@ -5483,7 +5488,7 @@ namespace wms.service.Service
                     Status = TaskStatus.NewBuild,
                     Priority = 0,
                     Device = "SRM" + location.Tunnel,
-                    SrmStation = "",//TODO:输入五巷道原间隔版出库放货点设备号
+                    SrmStation = "8045",//TODO:输入五巷道原间隔版出库放货点设备号
                     AddrFrom = location.Code,
                     AddrTo = deviceId,
                     BarCode = location.ContGrpBarCode,