Просмотр исходного кода

PLC接口补充,但还没有最小化参数。

xuwei 6 лет назад
Родитель
Сommit
92bcbf12bd

+ 2 - 2
DK.Service/SmartDeviceService/SmartDeviceLogic.cs

@@ -159,7 +159,7 @@ namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
         }
 
         /// <summary>
-        /// 登窑 入窑 卸窑
+        /// 登窑 入窑 卸窑 
         /// </summary>
         /// <param name="accountCode"></param>
         /// <param name="userCode"></param>
@@ -167,7 +167,7 @@ namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
         /// <param name="barcodeTable"></param>
         /// <param name="procedureInfo"></param>
         /// <returns></returns>
-        public static ServiceResultEntity AddWorkPiece(string accountCode, string userCode, int procedureID, DataTable barcodeTable, out ProcedureEntity procedureInfo)
+        public static ServiceResultEntity AddWorkPieceKiln(string accountCode, string userCode, int procedureID, DataTable barcodeTable, out ProcedureEntity procedureInfo)
         {
             ServiceResultEntity sre = new ServiceResultEntity();
             DataTable dt = PMModuleLogic.PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, getUserInfo(accountCode, userCode), out procedureInfo);

+ 24 - 0
WCF.Service/WCF.Contracts/ISmartDevice.cs

@@ -1,4 +1,6 @@
 
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using System.Data;
 using System.ServiceModel;
 
 namespace Dongke.IBOSS.PRD.WCF.Contracts
@@ -30,5 +32,27 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         [OperationContract]
         string AddWorkPieceByStatus(string accountCode, string userCode, string userPassword,
             int procedureID, string barcode, string remarks);
+
+        /// <summary>
+        /// 注浆接口 xuwei add 2019-11-19
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="groutingData"></param>
+        /// <returns></returns>
+        [OperationContract]
+        string SetGroutingLineDetail(string accountCode, string userCode, string groutingData);
+
+        /// <summary>
+        /// 登窑、入窑、出窑 接口 xuwei add 2019-11-19
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="procedureID"></param>
+        /// <param name="barcodeTable"></param>
+        /// <param name="procedureInfo"></param>
+        /// <returns></returns>
+        [OperationContract]
+        string AddWorkPieceKiln(string accountCode, string userCode, int procedureID, DataTable barcodeTable, out ProcedureEntity procedureInfo);
     }
 }

+ 57 - 0
WCF.Service/WCF.Services/SmartDeviceService.cs

@@ -197,5 +197,62 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 return "EE";
             }
         }
+
+        /// <summary>
+        /// 注浆接口 xuwei add 2019-11-19
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="groutingData"></param>
+        /// <returns></returns>
+        public string SetGroutingLineDetail(string accountCode, string userCode, string groutingData)
+        {
+            try
+            {
+                ServiceResultEntity sre = SmartDeviceLogic.SetGroutingLineDetail(accountCode, userCode, groutingData);
+                DataTable dt = sre.Data.Tables[0];
+                return dt.Rows[0]["out_errMsg"].ToString();
+            }
+            catch(Exception ex)
+            {
+                OutputLog.TraceLog(LogPriority.Error,
+                        this.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
+                        " accountCode:" + accountCode + " userCode:" + userCode ,
+                        ex.ToString(),
+                        LocalPath.LogExePath);
+                return "EE";
+            }
+        }
+
+
+        /// <summary>
+        /// 登窑、入窑、出窑 接口 xuwei add 2019-11-19
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="groutingData"></param>
+        /// <returns></returns>
+        public string AddWorkPieceKiln(string accountCode, string userCode, int procedureID, DataTable barcodeTable, out ProcedureEntity procedureInfo)
+        {
+            procedureInfo = null;
+            try
+            {
+                ServiceResultEntity sre = SmartDeviceLogic.AddWorkPieceKiln(accountCode, userCode, procedureID, barcodeTable, out procedureInfo);
+                DataTable dt = sre.Data.Tables[0];
+                return dt.Rows[0]["out_errMsg"].ToString();
+            }
+            catch (Exception ex)
+            {
+                OutputLog.TraceLog(LogPriority.Error,
+                        this.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
+                        " accountCode:" + accountCode + " userCode:" + userCode + "procedureID:"+procedureID,
+                        ex.ToString(),
+                        LocalPath.LogExePath);
+                return "EE";
+            }
+        }
+
     }
 }

+ 1 - 1
WCF.Service/WCF.Services/WCF.Services.csproj

@@ -195,7 +195,7 @@
       <Name>Service.DataModels</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\DK.Service\SmartDeviceService\SmartDeviceService.csproj">
-      <Project>{0B637813-6AE3-4AEE-8317-0FF1EC7C0584}</Project>
+      <Project>{0b637813-6ae3-4aee-8317-0ff1ec7c0584}</Project>
       <Name>SmartDeviceService</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\DK.Service\SystemModuleLogic\SystemModuleLogic.csproj">