新增文件上传路径处理

IMCS_CCS/IMCS.CCS.xml

@@ -289,7 +289,7 @@
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:IMCS.CCS.Controllers.CcsController.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Controllers.CcsController.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.LabelData})">
             <summary>
             启动打标机： POST: api/StartLabelMachine
             </summary> 
@@ -315,17 +315,17 @@
         </member>
         <member name="M:IMCS.CCS.Controllers.CcsController.SendServoStacker(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.LocationData})">
             <summary>
-            伺服舵机放物品： POST: api/SendServoStacker
+            伺服舵机取和放物品： POST: api/SendServoStacker
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:IMCS.CCS.Controllers.CcsController.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Controllers.CcsController.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             读RFID： POST: api/ReadRFID
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:IMCS.CCS.Controllers.CcsController.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Controllers.CcsController.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             写RFID： POST: api/WriteRFID
             </summary> 
@@ -465,6 +465,12 @@
             </summary> 
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Controllers.JobTasksController.RemoveRedis">
+            <summary>
+            删除redis
+            </summary> 
+            <returns></returns> 
+        </member>
         <member name="T:IMCS.CCS.Controllers.ProjectController">
             <summary>
             项目控制器
@@ -842,7 +848,7 @@
             工件程序名
             </summary>
         </member>
-        <member name="P:IMCS.CCS.Models.WorkData.location">
+        <member name="P:IMCS.CCS.Models.WorkData.Location">
             <summary>
             放定位
             </summary>
@@ -852,6 +858,41 @@
             工位
             </summary>
         </member>
+        <member name="P:IMCS.CCS.Models.LabelData.TypeNo">
+            <summary>
+            大类
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.LabelData.SmallTypeNo">
+            <summary>
+            小类:配方号
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.LabelData.OrderNo">
+            <summary>
+            订单号
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.LabelData.TaskNo">
+            <summary>
+            任务
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.LabelData.BatchNo">
+            <summary>
+            工位
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.RFIData.content">
+            <summary>
+            写入内容
+            </summary>
+        </member>
+        <member name="P:IMCS.CCS.Models.RFIData.positionIndex">
+            <summary>
+            写入位置
+            </summary>
+        </member>
         <member name="P:IMCS.CCS.Models.RequestToolData.url">
             <summary>
             设备url
@@ -1453,6 +1494,12 @@
             </summary> 
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Service.Impl.TaskJobService.removeRedis">
+            <summary>
+            删除redis
+            </summary> 
+            <returns></returns>
+        </member>
         <member name="M:IMCS.CCS.Service.Impl.TaskJobService.GetFanucValue(IMCS_CCS.Model.vo.ResponseFanucData,System.String)">
             <summary>
             fanuc根据类型获取值
@@ -1466,6 +1513,13 @@
             <param name="strData"></param>
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Service.Impl.TaskJobService.getDeviceList">
+            <summary>
+            获取redis 设备列表
+            </summary>
+            <param name="strData"></param>
+            <returns></returns>
+        </member>
         <member name="T:IMCS.CCS.Service.Impl.TaskService">
             <summary>
             任务服务
@@ -1784,7 +1838,7 @@
             启动清洗机
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.IHttpRequestService.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.IHttpRequestService.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.LabelData})">
             <summary>
             启动打标机
             </summary> 
@@ -1806,7 +1860,7 @@
         </member>
         <member name="M:IMCS.CCS.Services.IHttpRequestService.SendServoStacker(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.LocationData})">
             <summary>
-            伺服舵机放物品
+            伺服舵机取和放物品
             </summary> 
         </member>
         <member name="M:IMCS.CCS.Services.IHttpRequestService.GetTools(IMCS.CCS.Models.RequestToolData)">
@@ -1814,12 +1868,12 @@
             刀具接口列表
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.IHttpRequestService.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.IHttpRequestService.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             读RFID
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.IHttpRequestService.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.IHttpRequestService.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             写RFID
             </summary> 
@@ -1899,7 +1953,7 @@
             启动清洗机
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.HttpRequestService.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.HttpRequestService.StartLabelMachine(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.LabelData})">
             <summary>
             启动打标机
             </summary> 
@@ -1929,12 +1983,12 @@
             刀具接口列表
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.HttpRequestService.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.HttpRequestService.ReadRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             读RFID
             </summary> 
         </member>
-        <member name="M:IMCS.CCS.Services.HttpRequestService.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.WorkData})">
+        <member name="M:IMCS.CCS.Services.HttpRequestService.WriteRFID(IMCS.CCS.Models.RequestData{IMCS.CCS.Models.RFIData})">
             <summary>
             写RFID
             </summary> 

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -17,6 +17,7 @@ using IMCS.CCS.Service;
 using IMCS_CCS.Model.vo;
 using FTP;
 using HslCommunication;
+using System.Text.RegularExpressions;
 
 namespace IMCS.CCS.Services
 {
@@ -835,8 +836,12 @@ namespace IMCS.CCS.Services
                     }
                 }
                 else if (deviceFanuc != null)
-                {
-                    string Url = fanucUrlContext + "?ip=" + deviceFanuc.Ip + "&port=" + deviceFanuc.Port + "&prgname=" + req.data.fileName;
+                {                    
+                    Regex regex = new Regex(@"^(?<fpath>([a-zA-Z]:\\)([\s\.\-\w]+\\)*)(?<fname>[\w]+)(?<namext>(\.[\w]+)*)(?<suffix>\.[\w]+)");
+                    Match result = regex.Match(req.data.fileName);                     
+                    string strResult = result.Success ? result.Result("${fname}") + result.Result("${suffix}"): req.data.fileName;
+                    
+                    string Url = fanucUrlContext + "?ip=" + deviceFanuc.Ip + "&port=" + deviceFanuc.Port + "&prgname=" + strResult;
                     //调用发那科上传接口
                     var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=" + ActionTypeEnum.UploadFile.ToString(), null, null);
                     if (!Result.IsSuccess)