Pārlūkot izejas kodu

fix:修改定时任务启动及定时执行时间,修改nc文件上传所需的拦截

wang.sq@aliyun.com 11 mēneši atpakaļ
vecāks
revīzija
eb3ddb5e15

+ 5 - 5
IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -583,8 +583,8 @@ namespace IMCS.CCS.Services
                 actionQuery.OperateType = ActionTypeEnum.StartNCProgram.ToString();
                 actionQuery.Ip = req.url;
                 CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault();
-
-                SiemensS7Net s7 = DevicePlcS7.SiemensS7(actionInfo.PlcIp);
+// 成航发没有允许上传nc的状态的db块,隐藏此代码
+/*                SiemensS7Net s7 = DevicePlcS7.SiemensS7(actionInfo.PlcIp);
                 OperateResult ConnectionResult = s7.ConnectServer();
                 if (!ConnectionResult.IsSuccess)
                 {
@@ -603,7 +603,7 @@ namespace IMCS.CCS.Services
                     if (db != null)
                     {
                         string getResult = s7.ReadInt16(db).Content.ToString();
-          /*              if (getResult != "2")
+          *//*              if (getResult != "2")
                         {
                             s7.ConnectClose();
                             Log.Instance.WriteLogAdd(ActionTypeEnum.UploadFile + "异常===>>" + "url" + req.url + "上传程序条件不满足【" + getResult + "】" + JsonConvert.SerializeObject(req),
@@ -611,10 +611,10 @@ namespace IMCS.CCS.Services
                             responseData.result = "false";
                             responseData.msg = req.url + "上传程序条件不满足【" + getResult + "】";
                             return responseData;
-                        }*/
+                        }*//*
                     }
                 }
-
+*/
                 if(req.data.subFileList !=null && req.data.subFileList.Count > 0)
                 {
                     //西门子one系统子文件上传

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
IMCS_CCS/wwwroot/db/Tasks.json


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels