Merge branch 'master' of http://pscg.dongkesoft.com:9002/r/mes/hg5020

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -764,8 +764,13 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                         sre.Status = Constant.ServiceResultStatus.Success;
                         sre.Message = "操作成功！";
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        OutputLog.TraceLog(LogPriority.Error,
+                                        "",
+                                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                        ex.ToString(),
+                                        LocalPath.LogExePath);
                         sre.Status = Constant.ServiceResultStatus.Success;
                         sre.Message = "自动配置班次失败！";
                     }
@@ -821,6 +826,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 	                            LEFT JOIN TP_MST_USER m ON l.MONITORID = m.USERID
                             WHERE
 	                            GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}' --成型线号
+                             AND l.VALUEFLAG = '1'
+                             AND l.GMOULDSTATUS = 1
                             ;
                         ";
 
@@ -899,10 +906,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     AND d.GROUTINGMOULDCODE = '{jsonM[j]["GROUTINGMOULDCODE"].ToString()}'
                                 ;
                             ";
-
-
                             }
-
                         }
                         sqlStr += "END;";
 
@@ -910,8 +914,13 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                         sre.Status = Constant.ServiceResultStatus.Success;
                         sre.Message = "操作成功！";
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        OutputLog.TraceLog(LogPriority.Error,
+                                        "",
+                                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                        ex.ToString(),
+                                        LocalPath.LogExePath);
                         sre.Status = Constant.ServiceResultStatus.NoSearchResults;
                         sre.Message = "注浆记录写入失败！";
                     }

DK.Service/SmartDeviceService/SmartDeviceLogic.cs

@@ -178,9 +178,32 @@ namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
         /// <param name="userCode"></param>
         /// <param name="groutingData"></param>
         /// <returns></returns>
-        public static ServiceResultEntity SetGroutingLineDetail(string accountCode, string userCode, string groutingData)
+        public static ServiceResultEntity SetGroutingLineDetail(string lineCode, string groutingData, SUserInfo sUserInfo)
         {
-            return PDAModuleLogic.PDAModuleLogic.SetGroutingLineDetail(groutingData, getUserInfo(accountCode, userCode));
+            IDBConnection conn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            string sqlString = "select t.userid, u.usercode, u.username, t.groutinglineid\n" +
+            "  from tp_pc_groutingline t\n" +
+            " inner join tp_mst_user u\n" +
+            "    on u.userid = t.userid\n" +
+            " where t.groutinglinecode = :lineCode\n" +
+            " and t.valueflag='1'\n" +
+            " and t.gmouldstatus = 1";
+            OracleParameter[] paras = new OracleParameter[]
+            {
+                new OracleParameter(":lineCode", lineCode),
+            };
+            DataTable dt = conn.GetSqlResultToDt(sqlString, paras);
+            if (dt == null || dt.Rows.Count == 0)
+            {
+                ServiceResultEntity sre = new ServiceResultEntity();
+                sre.Status = Constant.ServiceResultStatus.NoSearchResults;
+                sre.Message = $"成型线{lineCode}不存在或当前状态不能注浆";
+                return sre;
+            }
+            sUserInfo.UserID = Convert.ToInt32(dt.Rows[0]["userid"]);
+            sUserInfo.UserCode = dt.Rows[0]["usercode"] + "";
+
+            return PDAModuleLogic.PDAModuleLogic.SetGroutingLineDetail(groutingData, sUserInfo);
         }
 
         /// <summary>
@@ -192,18 +215,11 @@ namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
         /// <param name="barcodeTable"></param>
         /// <param name="procedureInfo"></param>
         /// <returns></returns>
-        public static ServiceResultEntity AddWorkPieceKiln(string accountCode, string userCode, int procedureID, DataTable barcodeTable, out ProcedureEntity procedureInfo)
+        public static DataTable AddWorkPieceKiln(int procedureID, DataTable barcodeTable, SUserInfo sUserInfo)
         {
+            ProcedureEntity procedureInfo = null;
             ServiceResultEntity sre = new ServiceResultEntity();
-            DataTable dt = PMModuleLogic.PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, getUserInfo(accountCode, userCode), out procedureInfo);
-            if(dt.Rows.Count>0)
-            {
-                sre.Status = dt.Rows[0]["out_errMsg"].ToString() == "" ? Constant.ServiceResultStatus.Success : Constant.ServiceResultStatus.Other;
-                sre.Result = dt.Rows[0]["out_errMsg"].ToString();
-                dt.TableName = "result";
-                sre.Data.Tables.Add(dt);
-            }
-            return sre;
+            return PMModuleLogic.PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, sUserInfo, out procedureInfo);
         }
 
         //xuwei end

IBOSS.PRD/Program.cs

@@ -77,7 +77,6 @@ namespace Dongke.IBOSS.PRD.Client
 //            string ibossMutexName = SystemAPI.UserName + "-iboss.mes-";
 //            ibossMutex = new Mutex(true, ibossMutexName, out isCreatedNew);
 //#endif
-
             // 取得程序的版本
             _info = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
             _mainFormTitle = Constant.M_SYSTEM_NAME + " - " + Constant.M_SYSTEM_CHINESE_SERIES + " - ver " + _info.FileVersion;

WCF.Service/WCF.Contracts/ISmartDevice.cs

@@ -30,11 +30,35 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         void AddWorkPiece(string accountCode, string userCode, string userPassword,
             int procedureID, string barcode);
 
+        /// <summary>
+        /// 自动扫描计件
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="userPassword"></param>
+        /// <param name="procedureID"></param>
+        /// <param name="barcode"></param>
+        /// <param name="remarks"></param>
+        /// <returns></returns>
         [OperationContract]
         string AddWorkPieceByStatus(string accountCode, string userCode, string userPassword,
             int procedureID, string barcode, string remarks);
 
         /// <summary>
+        /// 自动扫描计件(3车间)
+        /// </summary>
+        /// <param name="accountCode"></param>
+        /// <param name="userCode"></param>
+        /// <param name="userPassword"></param>
+        /// <param name="procedureID"></param>
+        /// <param name="barcode"></param>
+        /// <param name="remarks"></param>
+        /// <returns></returns>
+        [OperationContract]
+        string AddWorkPieceByStatus3(string accountCode, string userCode, string userPassword,
+            int procedureID, string barcode, string remarks);
+
+        /// <summary>
         /// 注浆接口 xuwei add 2019-11-19
         /// </summary>
         /// <param name="accountCode"></param>
@@ -42,7 +66,7 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         /// <param name="groutingData"></param>
         /// <returns></returns>
         [OperationContract]
-        string SetGroutingLineDetail(string accountCode, string userCode, string groutingData);
+        string SetGroutingLineDetail(string accountCode, string userCode, string lineCode, string groutingData, string remarks);
 
         /// <summary>
         /// 登窑、入窑、出窑 接口 xuwei add 2019-11-19
@@ -54,6 +78,7 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         /// <param name="barCodeAndPosition"></param>
         /// <returns></returns>
         [OperationContract]
-        string AddWorkPieceKiln(string accountCode, string userCode, int procedureID, string kilnCarCode, string barCodeAndPosition = "");
+        string AddWorkPieceKiln(string accountCode, string userCode, int procedureID,
+            string kilnCarCode, string barCodeAndPosition, string remarks);
     }
 }

WCF.Service/WCF.Services/SmartDeviceService.cs

@@ -12,6 +12,7 @@ using System;
 using System.Data;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.Service.PMModuleLogic;
@@ -57,7 +58,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     OutputLog.TraceLog(LogPriority.Warning,
                             this.ToString(),
                             System.Reflection.MethodBase.GetCurrentMethod().Name,
-                            " userInfo is null " + userPassword + System.Environment.NewLine + 
+                            " userInfo is null " + userPassword + System.Environment.NewLine +
                             " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID + " barcode:" + barcode,
                             LocalPath.LogExePath + "SmartDevice\\");
                     return;
@@ -98,7 +99,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                             userPassword + System.Environment.NewLine +
                             " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID + " barcode:" + barcode,
                             JsonHelper.ToJson(dt),
-                            LocalPath.LogExePath+ "SmartDevice\\");
+                            LocalPath.LogExePath + "SmartDevice\\");
                 }
             }
             catch (Exception ex)
@@ -139,20 +140,6 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 sUserInfo.UserID = Convert.ToInt32(userInfo.Rows[0]["userid"]);
                 sUserInfo.UserCode = userCode;
 
-                //DataTable barcodeTable = new DataTable();
-                //barcodeTable.TableName = "barcodeTable";
-                //barcodeTable.Columns.Add("BarCode");
-                //barcodeTable.Columns.Add("UserID");
-                //barcodeTable.Columns.Add("UserCode");
-                //barcodeTable.Columns.Add("UserName");
-                //barcodeTable.Columns.Add("LogoID");
-
-                //DataRow drCollectType = barcodeTable.NewRow();
-                //drCollectType["BarCode"] = barcode;
-                //drCollectType["UserID"] = sUserInfo.UserID;
-                //drCollectType["UserCode"] = sUserInfo.UserCode;
-                //drCollectType["UserName"] = userInfo.Rows[0]["UserName"].ToString();
-                //barcodeTable.Rows.Add(drCollectType);
                 DataTable barcodeTable = userInfo;
                 barcodeTable.Columns.Add("LogoID");
                 barcodeTable.Columns.Add("BarCode");
@@ -164,25 +151,28 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 ProcedureEntity procedureInfo = null;
                 DataTable dt = PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, sUserInfo, out procedureInfo);
 
-                string out_msg = dt.Rows[0]["out_errMsg"].ToString();
-                if (dt != null && dt.Rows.Count > 0 && !string.IsNullOrWhiteSpace(out_msg))
+                if (dt != null && dt.Rows.Count > 0)
                 {
-                    OutputLog.TraceLog(LogPriority.Warning,
-                            this.ToString(),
-                            System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
-                            userPassword + System.Environment.NewLine +
-                            " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID + " barcode:" + barcode,
-                            JsonHelper.ToJson(dt),
-                            LocalPath.LogExePath + "SmartDevice\\");
-                    if (out_msg.StartsWith("无效条码"))
-                    {
-                        return "EP-01";
-                    }
-                    if (out_msg.Contains("不能到达该工序"))
+                    string out_msg = dt.Rows[0]["out_errMsg"].ToString();
+                    if (!string.IsNullOrWhiteSpace(out_msg))
                     {
-                        return "EP-02";
+                        OutputLog.TraceLog(LogPriority.Warning,
+                                this.ToString(),
+                                System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
+                                userPassword + System.Environment.NewLine +
+                                " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID + " barcode:" + barcode,
+                                JsonHelper.ToJson(dt),
+                                LocalPath.LogExePath + "SmartDevice\\");
+                        if (out_msg.StartsWith("无效条码"))
+                        {
+                            return "EP-01";
+                        }
+                        if (out_msg.Contains("不能到达该工序"))
+                        {
+                            return "EP-02";
+                        }
+                        return "EP-00";
                     }
-                    return "EP-00";
                 }
                 return "OK";
             }
@@ -200,33 +190,133 @@ namespace Dongke.IBOSS.PRD.WCF.Services
         }
 
         /// <summary>
+        /// 自动扫描计件(3车间)
+        /// </summary>
+        /// <returns></returns>
+        public string AddWorkPieceByStatus3(string accountCode, string userCode, string userPassword,
+            int procedureID, string barcode, string remarks)
+        {
+            string inputCode = $" accountCode:{accountCode} userCode:{userCode} userPassword:{userPassword} procedureID:{procedureID} barcode:{barcode} remarks:{remarks}";
+            try
+            {
+                DataTable userInfo = SmartDeviceLogic.CheckUserCode(accountCode, userCode);
+                if (userInfo == null)
+                {
+                    OutputLog.TraceLog(LogPriority.Warning,
+                            this.ToString(),
+                            System.Reflection.MethodBase.GetCurrentMethod().Name,
+                            " userInfo is null " + inputCode,
+                            LocalPath.LogExePath + "SmartDevice\\");
+                    return "EU-01";
+                }
+                SUserInfo sUserInfo = new SUserInfo();
+                sUserInfo.AccountID = Convert.ToInt32(userInfo.Rows[0]["AccountID"]);
+                sUserInfo.AccountCode = accountCode;
+                sUserInfo.UserID = Convert.ToInt32(userInfo.Rows[0]["userid"]);
+                sUserInfo.UserCode = userCode;
+
+                DataTable barcodeTable = userInfo;
+                barcodeTable.Columns.Add("LogoID");
+                barcodeTable.Columns.Add("BarCode");
+                barcodeTable.Columns.Add("Remarks");
+
+                barcodeTable.Rows[0]["BarCode"] = barcode;
+                barcodeTable.Rows[0]["Remarks"] = remarks;
+
+                ProcedureEntity procedureInfo = null;
+                DataTable dt = PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, sUserInfo, out procedureInfo);
+
+                if (dt != null && dt.Rows.Count > 0)
+                {
+                    string out_msg = dt.Rows[0]["out_errMsg"].ToString();
+                    if (!string.IsNullOrWhiteSpace(out_msg))
+                    {
+                        OutputLog.TraceLog(LogPriority.Warning,
+                                this.ToString(),
+                                System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                inputCode + JsonHelper.ToJson(dt),
+                                LocalPath.LogExePath + "SmartDevice\\");
+                        //if (out_msg.StartsWith("无效条码"))
+                        //{
+                        //    return "EP-01=" + out_msg;
+                        //}
+                        //if (out_msg.Contains("不能到达该工序"))
+                        //{
+                        //    return "EP-02=" + out_msg;
+                        //}
+                        return "EP-00=" + out_msg;
+                    }
+                }
+                return "OK";
+            }
+            catch (Exception ex)
+            {
+                OutputLog.TraceLog(LogPriority.Error,
+                        this.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                        inputCode+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 SetGroutingLineDetail(string accountCode, string userCode, string groutingData)
+        public string SetGroutingLineDetail(string accountCode, string userCode, string lineCode,
+            string groutingData, string remarks)
         {
+            string inputCode = $" accountCode:{accountCode} userCode:{userCode} lineCode:{lineCode} groutingData:{groutingData} remarks:{remarks}";
             try
             {
-                ServiceResultEntity sre = SmartDeviceLogic.SetGroutingLineDetail(accountCode, userCode, groutingData);
-                DataTable dt = sre.Data.Tables[0];
-                return dt.Rows[0]["out_errMsg"].ToString();
+                #region 验证用户 并配置参数 sUserInfo
+                DataTable userInfo = SmartDeviceLogic.CheckUserCode(accountCode, userCode);
+                if (userInfo == null)
+                {
+                    OutputLog.TraceLog(LogPriority.Warning,
+                            this.ToString(),
+                            System.Reflection.MethodBase.GetCurrentMethod().Name,
+                            " userInfo is null " + inputCode,
+                            LocalPath.LogExePath + "SmartDevice\\");
+                    return "EU-01";
+                }
+                SUserInfo sUserInfo = new SUserInfo();
+                sUserInfo.AccountID = Convert.ToInt32(userInfo.Rows[0]["AccountID"]);
+                sUserInfo.AccountCode = accountCode;
+                sUserInfo.UserID = Convert.ToInt32(userInfo.Rows[0]["userid"]);
+                sUserInfo.UserCode = userCode;
+                #endregion
+
+                ServiceResultEntity sre = SmartDeviceLogic.SetGroutingLineDetail(lineCode, groutingData, sUserInfo);
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    return "OK";
+                }
+                else
+                {
+                    OutputLog.TraceLog(LogPriority.Warning,
+                            this.ToString(),
+                            System.Reflection.MethodBase.GetCurrentMethod().Name,
+                            inputCode + sre.Message,
+                            LocalPath.LogExePath + "SmartDevice\\");
+                    return $"EG={sre.Message}";
+                }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 OutputLog.TraceLog(LogPriority.Error,
                         this.ToString(),
-                        System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
-                        " accountCode:" + accountCode + " userCode:" + userCode ,
-                        ex.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                        inputCode+ex.ToString(),
                         LocalPath.LogExePath);
                 return "EE";
             }
         }
 
-
         /// <summary>
         /// 登窑、入窑、出窑 接口 xuwei add 2019-11-19
         /// </summary>
@@ -234,8 +324,10 @@ namespace Dongke.IBOSS.PRD.WCF.Services
         /// <param name="userCode"></param>
         /// <param name="groutingData"></param>
         /// <returns></returns>
-        public string AddWorkPieceKiln(string accountCode, string userCode, int procedureID,string kilnCarCode, string barCodeAndPosition="")
+        public string AddWorkPieceKiln(string accountCode, string userCode, int procedureID,
+            string kilnCarCode, string barCodeAndPosition, string remarks)
         {
+            string inputCode = $" accountCode:{accountCode} userCode:{userCode} procedureID:{procedureID} kilnCarCode:{kilnCarCode} barCodeAndPosition:{barCodeAndPosition} remarks:{remarks}";
             try
             {
                 #region 验证用户 并配置参数 sUserInfo
@@ -245,7 +337,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     OutputLog.TraceLog(LogPriority.Warning,
                             this.ToString(),
                             System.Reflection.MethodBase.GetCurrentMethod().Name,
-                            " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID ,
+                            " userInfo is null " + inputCode,
                             LocalPath.LogExePath + "SmartDevice\\");
                     return "EU-01";
                 }
@@ -258,6 +350,15 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 
                 #region 按窑车号取窑车信息
                 DataTable carInfo = SmartDeviceLogic.getKilnCarByCode(kilnCarCode);
+                if (carInfo == null || carInfo.Rows.Count == 0)
+                {
+                    OutputLog.TraceLog(LogPriority.Warning,
+                               this.ToString(),
+                               System.Reflection.MethodBase.GetCurrentMethod().Name,
+                               "窑车不存在" + inputCode,
+                               LocalPath.LogExePath + "SmartDevice\\");
+                    return "EP-01";
+                }
                 #endregion
 
                 #region 配置参数 barcodeTable
@@ -277,24 +378,35 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 DataTable barcodeTable = new DataTable();
 
                 //入窑 卸窑 配置参数 barcodeTable
-                if (barCodeAndPosition == "")
+                if (string.IsNullOrWhiteSpace(barCodeAndPosition))
                 {
                     barcodeTable.TableName = "barcodeTable";
                     barcodeTable.Columns.Add("UserID");
                     barcodeTable.Columns.Add("UserCode");
                     barcodeTable.Columns.Add("UserName");
+                    barcodeTable.Columns.Add("KilnID");
                     barcodeTable.Columns.Add("KilnCode");
+                    barcodeTable.Columns.Add("KilnName");
+                    barcodeTable.Columns.Add("KilnCarCode");
+                    barcodeTable.Columns.Add("KilnCarID");
+                    barcodeTable.Columns.Add("KilnCarName");
+                    barcodeTable.Columns.Add("Remarks");
                     DataRow drCollectType = barcodeTable.NewRow();
                     drCollectType["UserID"] = userInfo.Rows[0]["UserID"].ToString();
                     drCollectType["UserCode"] = userInfo.Rows[0]["UserCode"].ToString();
                     drCollectType["UserName"] = userInfo.Rows[0]["UserName"].ToString();
+                    drCollectType["KilnID"] = carInfo.Rows[0]["KilnID"].ToString();
                     drCollectType["KilnCode"] = carInfo.Rows[0]["KilnCode"].ToString();
+                    drCollectType["KilnName"] = carInfo.Rows[0]["KilnName"].ToString();
+                    drCollectType["KilnCarID"] = carInfo.Rows[0]["KilnCarID"].ToString();
+                    drCollectType["KilnCarCode"] = carInfo.Rows[0]["KilnCarCode"].ToString();
+                    drCollectType["KilnCarName"] = carInfo.Rows[0]["KilnCarName"].ToString();
+                    drCollectType["Remarks"] = remarks;
                     barcodeTable.Rows.Add(drCollectType);
                 }
-
-                //登窑 添加数据 配置参数 barcodeTable
-                if (barCodeAndPosition != "")
+                else
                 {
+                    //登窑 添加数据 配置参数 barcodeTable
                     barcodeTable.TableName = "barcodeTable";
                     barcodeTable.Columns.Add("UserID");
                     barcodeTable.Columns.Add("UserCode");
@@ -303,12 +415,13 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     barcodeTable.Columns.Add("KilnID");
                     barcodeTable.Columns.Add("KilnCode");
                     barcodeTable.Columns.Add("KilnName");
-                    barcodeTable.Columns.Add("KilnCarCode");
                     barcodeTable.Columns.Add("KilnCarID");
+                    barcodeTable.Columns.Add("KilnCarCode");
                     barcodeTable.Columns.Add("KilnCarName");
                     barcodeTable.Columns.Add("KilnCarPosition");
+                    barcodeTable.Columns.Add("Remarks");
                     JArray barCodeArray = JArray.Parse(barCodeAndPosition);
-                    for(int i=0;i< barCodeArray.Count;i++)
+                    for (int i = 0; i < barCodeArray.Count; i++)
                     {
                         DataRow drCollectType = barcodeTable.NewRow();
                         drCollectType["BarCode"] = barCodeArray[i]["barCode"].ToString();
@@ -319,39 +432,40 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         drCollectType["KilnCode"] = carInfo.Rows[0]["KilnCode"].ToString();
                         drCollectType["KilnName"] = carInfo.Rows[0]["KilnName"].ToString();
                         drCollectType["KilnCarID"] = carInfo.Rows[0]["KilnCarID"].ToString();
+                        drCollectType["KilnCarCode"] = carInfo.Rows[0]["KilnCarCode"].ToString();
                         drCollectType["KilnCarName"] = carInfo.Rows[0]["KilnCarName"].ToString();
                         drCollectType["KilnCarPosition"] = barCodeArray[i]["kilnCarPosition"].ToString();
+                        drCollectType["Remarks"] = remarks;
                         barcodeTable.Rows.Add(drCollectType);
                     }
                 }
-
                 #endregion
 
                 #region 调用原始业务逻辑
-                ProcedureEntity procedureInfo = null;
-                ServiceResultEntity sre = SmartDeviceLogic.AddWorkPieceKiln(accountCode, userCode, procedureID, barcodeTable, out procedureInfo);
-                DataTable dt = sre.Data.Tables[0];
+                DataTable dt = SmartDeviceLogic.AddWorkPieceKiln(procedureID, barcodeTable, sUserInfo);
                 #endregion
 
                 #region 输出结果
-                string out_msg = dt.Rows[0]["out_errMsg"].ToString();
-                if (dt != null && dt.Rows.Count > 0 && !string.IsNullOrWhiteSpace(out_msg))
+                if (dt != null && dt.Rows.Count > 0)
                 {
-                    OutputLog.TraceLog(LogPriority.Warning,
+                    string out_msg = dt.Rows[0]["out_errMsg"].ToString();
+                    if (!string.IsNullOrWhiteSpace(out_msg))
+                    {
+                        OutputLog.TraceLog(LogPriority.Warning,
                             this.ToString(),
-                            System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
-                            " accountCode:" + accountCode + " userCode:" + userCode + " procedureID:" + procedureID ,
-                            JsonHelper.ToJson(dt),
+                            System.Reflection.MethodBase.GetCurrentMethod().Name,
+                            inputCode + JsonHelper.ToJson(dt),
                             LocalPath.LogExePath + "SmartDevice\\");
-                    if (out_msg.StartsWith("无效条码"))
-                    {
-                        return "EP-01";
+                        //if (out_msg.StartsWith("无效条码"))
+                        //{
+                        //    return "EP-01";
+                        //}
+                        //if (out_msg.Contains("不能到达该工序"))
+                        //{
+                        //    return "EP-02=" + out_msg;
+                        //}
+                        return "EP-00=" + out_msg;
                     }
-                    if (out_msg.Contains("不能到达该工序"))
-                    {
-                        return "EP-02";
-                    }
-                    return "EP-00";
                 }
                 return "OK";
                 #endregion
@@ -360,9 +474,8 @@ namespace Dongke.IBOSS.PRD.WCF.Services
             {
                 OutputLog.TraceLog(LogPriority.Error,
                         this.ToString(),
-                        System.Reflection.MethodBase.GetCurrentMethod().Name + System.Environment.NewLine +
-                        " accountCode:" + accountCode + " userCode:" + userCode + "procedureID:"+ procedureID ,
-                        ex.ToString(),
+                        System.Reflection.MethodBase.GetCurrentMethod().Name,
+                        inputCode + ex.ToString(),
                         LocalPath.LogExePath);
                 return "EE";
             }