1.釉料更改

2.条码打印显示位置错误

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -889,7 +889,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 	                                GROUTINGDATE,GROUTINGMOULDCODE,MOULDCODE,GOODSID,GOODSCODE,GOODSNAME,GMOULDSTATUS,
 	                                GROUTINGCOUNT,GROUTINGFLAG,NOGROUTINGRREASON,ACCOUNTID,VALUEFLAG,CREATEUSERID,
 	                                UPDATEUSERID,USERID,USERCODE,SCRAPFLAG,SPECIALREPAIRFLAG,BARCODE,CLASSESSETTINGID,
-	                                ISPUBLICBODY,DELIVERFLAG,GMOULDTYPEID,CANMANYTIMES,GROUTINGBATCHNO,LOGOID,
+	                                ISPUBLICBODY,DELIVERFLAG,GMOULDTYPEID,CANMANYTIMES,GROUTINGBATCHNO,LOGOID,glazetypeid,
 	                                SCRAPTIME,SCRAPUSER,SCRAPREASONID,SCRAPREASON,MOULDID,SREASONID,SCRAPTYPE,BEGINNINGFLAG 
                                 ) SELECT
                                     {groutingDailyId},--GROUTINGDAILYID
@@ -923,6 +923,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     t.CANMANYTIMES,--CANMANYTIMES
                                     {groutingBatchNoBegin} + {i} + 1, --LASTGROUTINGBATCHNO 批次号 每注一次加1
                                     o.LOGOID,--LOGOID
+                                    g.glazetypeid,
                                     NULL,--SCRAPTIME
                                     NULL,--SCRAPUSER
                                     NULL,--SCRAPREASONID

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -2869,10 +2869,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 };
                 barcode = con.GetSqlResultToStr(sqlString, paras1);
 
-                sqlString = @"select tp_pm_groutingdailydetail.LogoID,tp_mst_logo.logocode,tp_mst_logo.logoname from tp_pm_groutingdailydetail
-                                     left join tp_mst_logo
-                                     on tp_pm_groutingdailydetail.logoid=tp_mst_logo.logoid
-                                        where tp_pm_groutingdailydetail.barcode=:barcode";
+                sqlString = @"select g.LogoID,l.logocode,l.logoname, g.glazetypeid, d.DICTIONARYVALUE glazetypename
+                                from tp_pm_groutingdailydetail g
+                                     left join tp_mst_logo l
+                                     on g.logoid=l.logoid
+                                     left join TP_MST_DataDictionary d on d.DICTIONARYID = g.glazetypeid
+                                        where g.barcode=:barcode";
                 OracleParameter[] paras = new OracleParameter[]{
                     new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
                 };

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -45,6 +45,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
         public static DataTable AddWorkPiece(int procedureID, DataTable barcodeTable, SUserInfo sUserInfo, out ProcedureEntity procedureInfo)
         {
             procedureInfo = null;
+            if (barcodeTable == null || barcodeTable.Rows.Count == 0)
+            {
+                return null;
+            }
             // 实例返回的Talbe
             DataTable dtBarCode = PMModuleLogic.CreateBarCodeResultTable();
             DataRow dr = dtBarCode.NewRow();
@@ -16529,6 +16533,56 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             return returnRows;
         }
 
+
+        /// <summary>
+        /// 设置条码商标 
+        /// </summary>
+        /// <returns></returns>
+        public static int SaveBarCodeLogoAndGlazetypeid(string barcode, int logoid, int glazetypeid, SUserInfo sUserInfo)
+        {
+            int returnRows = 0;
+            IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+            try
+            {
+                // 转换条码
+                //string sqlString = @"select FUN_CMN_GetBarCode(:barcode,null,:accountid) From DUAL";
+                //OracleParameter[] paras1 = new OracleParameter[]{
+                //                    new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
+                //                    new OracleParameter(":accountid",OracleDbType.Int32, sUserInfo.AccountID,ParameterDirection.Input),
+                //                };
+                //barcode = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+
+                OracleParameter[] Paras = null;
+                string sql = "";
+
+                // 1.更新注浆明细
+                sql = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
+                Paras = new OracleParameter[] {
+                    new OracleParameter(":logoid",OracleDbType.Int32,
+                        logoid,ParameterDirection.Input),
+                    new OracleParameter(":glazetypeid",OracleDbType.Int32,
+                        glazetypeid,ParameterDirection.Input),
+                    new OracleParameter(":updateuserid",OracleDbType.Int32,
+                        sUserInfo.UserID,ParameterDirection.Input),
+                    new OracleParameter(":barcode",OracleDbType.Varchar2,
+                        barcode,ParameterDirection.Input)
+                    };
+                returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
+
+                oracleTrConn.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (oracleTrConn.ConnState == System.Data.ConnectionState.Open)
+                {
+                    oracleTrConn.Rollback();
+                }
+                throw ex;
+            }
+            finally { oracleTrConn.Disconnect(); }
+            return returnRows;
+        }
+
         /// <summary>
         /// 设置产成品商标
         /// </summary>

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -1587,6 +1587,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                         "   ClassesSettingID, " +
                         "   GroutingBatchNo, " +
                         "   LogoID, " +
+                        "   glazetypeid, " +
                         "   CreateUserID, " +
                         "   GMouldTypeID, " +
                         "   CanManyTimes, " +
@@ -1620,6 +1621,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                         "         :ClassesSettingID, " +
                         "         :GroutingBatchNo, " +
                         "         :LogoID, " +
+                        "         g.glazetypeid, " +
                         "         :CUserID, " +
                         "         :GMouldTypeID, " +
                         "         :CanManyTimes, " +

WCF.Service/WCF.Contracts/IPDAModule.cs

@@ -1688,6 +1688,14 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         [OperationContract]
         ActionResult SaveBarCodeLogo(string accountCode, string userCode, string userPassword, string sessionKey, string barcode, int logoid);
 
+
+        [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
+   , ResponseFormat = WebMessageFormat.Json
+   , RequestFormat = WebMessageFormat.Json)]
+        [OperationContract]
+        ActionResult SaveBarCodeLogoAndGlazetypeid(string accountCode, string userCode, string userPassword, string sessionKey,
+            string barcode, int logoid, int glazetypeid);
+
         [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
 , ResponseFormat = WebMessageFormat.Json
 , RequestFormat = WebMessageFormat.Json)]

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -6165,7 +6165,44 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 			return actionResult;
 		}
 
-		public ActionResult GetBarCodeLogoID(string accountCode, string userCode, string userPassword, string sessionKey, string barcode)
+
+        public ActionResult SaveBarCodeLogoAndGlazetypeid(string accountCode, string userCode, string userPassword, string sessionKey,
+            string barcode, int logoid, int glazetypeid)
+        {
+            ActionResult actionResult = new ActionResult();
+            try
+            {
+                // 验证请求头信息
+                actionResult = this.DoPDACheck(accountCode, userCode, userPassword, sessionKey);
+
+                // 验证失败
+                if (actionResult.Status != (int)Constant.PDAResult.Success)
+                {
+                    return actionResult;
+                }
+
+                int returnValue = ServiceInvoker.Invoke<int>(this,
+                   () => PMModuleLogicDAL.SaveBarCodeLogoAndGlazetypeid(barcode, logoid, glazetypeid, sUserInfo));
+                actionResult.Result = JsonHelper.ToJson(returnValue);
+                actionResult.Status = (int)Constant.PDAResult.Success;
+            }
+            catch (Exception ex)
+            {
+                //LogFileOperation.Error(DataManager.LogFileName, ex.Message);
+                OutputLog.TraceLog(LogPriority.Error,
+                                this.ToString(),
+                                System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                ex.ToString(),
+                                LocalPath.LogExePath);
+                actionResult.Status = (int)Constant.PDAResult.Exception;
+                actionResult.Message = Constant.PDA_RESULT_EXCEPTION;
+            }
+            return actionResult;
+        }
+
+
+
+        public ActionResult GetBarCodeLogoID(string accountCode, string userCode, string userPassword, string sessionKey, string barcode)
 		{
 			ActionResult actionResult = new ActionResult();
 			try