修改德玛吉

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -893,8 +893,13 @@ namespace IMCS.CCS.Services
                          EnumHelper.GetDescription(ActionTypeEnum.UploadFile));
                     }
                     else
-                    { //写入程序编号  
-                        CcsAction actionQuery = new CcsAction();
+                    {
+                        if (deviceHeidenhain.Description.Contains("哈默"))
+                        {
+
+                        
+                            //写入程序编号  
+                            CcsAction actionQuery = new CcsAction();
                         actionQuery.OperateType = ActionTypeEnum.StartNCProgram.ToString();
                         actionQuery.Ip = req.url;
                         CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault();
@@ -927,9 +932,28 @@ namespace IMCS.CCS.Services
 
                         string prgNo = !string.IsNullOrEmpty(req.data.fileName) ? System.IO.Path.GetFileNameWithoutExtension(req.data.fileName) : CcsActionAddressWrites[0].Value;
                         s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16(prgNo));
-
-                        Log.Instance.WriteLogAdd("写入编号成功===>>编号位:" + prgNo + ",写入地址==" + CcsActionAddressWrites[0].Address,
-                         EnumHelper.GetDescription(ActionTypeEnum.UploadFile));
+                        s7.ConnectClose();
+                            Log.Instance.WriteLogAdd("写入编号成功===>>编号位:" + prgNo + ",写入地址==" + CcsActionAddressWrites[0].Address,
+                           EnumHelper.GetDescription(ActionTypeEnum.UploadFile)); 
+                        }
+                        else if (deviceHeidenhain.Description.Contains("德玛吉"))
+                        {
+                            RequestHeidhData hdhReq = new RequestHeidhData();
+                            hdhReq.ServerUrl = deviceHeidenhain.ServerUrl;
+                            hdhReq.MachineName = deviceHeidenhain.UserName;
+                            hdhReq.Path = req.data.fileName;
+                            hdhReq.Type = OpcUaActionTypeEnum.Upload.ToString();
+                            var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, hdhUrlContext, hdhReq, null);
+                            ResponseHeidhData responseHeidhData = JsonConvert.DeserializeObject<ResponseHeidhData>(Result.Message);
+                            if (!Result.IsSuccess || !responseHeidhData.result)
+                            {
+                                Log.Instance.WriteLogAdd(ActionTypeEnum.UploadFile + "预上传异常===>>" + JsonConvert.SerializeObject(req),
+                               EnumHelper.GetDescription(ActionTypeEnum.UploadFile));
+                                responseData.result = "false";
+                                return responseData;
+                            }  
+                        } 
+                        return responseData;
                     }