读取防伪码信息增加产品类型返回

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -2221,10 +2221,12 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             return sre;
         }
 
+
+
         /// <summary>
-        /// 读取旧的防伪码
+        /// 读取旧的防伪码 xuwei edit 2021-09-11 多读取一些产品信息
         /// </summary>
-        /// <param name="barcode">产品条码</param>ram>
+        /// <param name="barCode">产品条码</param>ram>
         /// 陈强 2021-08-9 新建
         /// <returns>int</returns>
         public static ServiceResultEntity GetSecurityCodeByBarcode(string barCode, SUserInfo sUser)
@@ -2239,15 +2241,22 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 //读取防伪码
                 if (sre.Status == Constant.ServiceResultStatus.Success)
                 {
-                    string sqlString = @"SELECT 
-                                            SecurityCode 
-                                     FROM  
-                                            TP_PM_GROUTINGDAILYDETAIL
-                                     WHERE
-	                                        BarCode =:BarCode 
-	                                        AND ValueFlag =1";
+                    string sqlString = @"
+                        SELECT
+	                        GD.BARCODE,
+	                        GD.SECURITYCODE,
+	                        GD.GOODSCODE,
+	                        GT.GOODSTYPECODE
+                        FROM
+	                        TP_PM_GROUTINGDAILYDETAIL GD
+	                        LEFT JOIN TP_MST_GOODS G ON GD.GOODSID = G.GOODSID
+	                        LEFT JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID 
+	                    WHERE
+                            GD.BARCODE =:BARCODE 
+	                        AND GD.VALUEFLAG =1
+                    ";
                     OracleParameter[] paras = new OracleParameter[]{
-                    new OracleParameter(":BarCode",OracleDbType.Varchar2, barCode,ParameterDirection.Input),
+                    new OracleParameter(":BARCODE",OracleDbType.Varchar2, barCode,ParameterDirection.Input),
                 };
 
                     DataTable data = conn.GetSqlResultToDt(sqlString, paras);
@@ -2285,7 +2294,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
         /// <param name="securityCode">防伪码</param>
         /// 陈强 2021-08-9 新建
         /// <returns>int</returns>
-        public static ServiceResultEntity UpdateSecurityCodeByBarcode( string barCode, string securityCode, string procedureID, SUserInfo sUser)
+        public static ServiceResultEntity UpdateSecurityCodeByBarcode(string barCode, string securityCode, string procedureID, SUserInfo sUser)
         {
             IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
             ServiceResultEntity sre = new ServiceResultEntity();
@@ -2434,7 +2443,6 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             return sre;
         }
 
-
         /// <summary>
         /// 校验防伪码
         /// </summary>
@@ -2497,11 +2505,56 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
         /// <returns></returns>
         public static ServiceResultEntity GetSecurityCodeSetting(SUserInfo sUser)
         {
+            IDBTransaction conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
             ServiceResultEntity sre = new ServiceResultEntity();
-            sre = GetSystemSetting("S_PM_030", sUser);
+            string sqlString = null;
+            try
+            {
+                conn.Connect();
+
+                #region 读系统参数
+                sqlString = @"
+                    SELECT
+	                    B.SETTINGVALUE AS BINDPROCEDUREID,
+	                    C.SETTINGVALUE AS CHECKROCEDUREID,
+	                    V.SETTINGVALUE AS GOODSTYPECODE
+                    FROM
+	                    TP_MST_SYSTEMSETTING V
+	                    LEFT JOIN TP_MST_SYSTEMSETTING B ON B.SETTINGCODE = 'S_PM_030'
+	                    LEFT JOIN TP_MST_SYSTEMSETTING C ON C.SETTINGCODE = 'S_PM_031'
+                    WHERE
+	                    V.SETTINGCODE = 'S_PM_032'
+                ";
+                DataTable dt = conn.GetSqlResultToDt(sqlString);
+                dt.TableName = "SETTING";
+                if (dt.Rows.Count > 0)
+                {
+                    sre.Data = new DataSet();
+                    sre.Data.Tables.Add(dt);
+                    sre.Status = Constant.ServiceResultStatus.Success;
+                    sre.Message = "系统参数读取成功！";
+                }
+                else
+                {
+                    sre.Status = Constant.ServiceResultStatus.SystemError;
+                    sre.Message = "系统参数不存在！";
+                }
+
+                #endregion
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                conn.Disconnect();
+            }
             return sre;
         }
 
+
+
         /// <summary>
         /// pda端注浆登记验证工号的注浆权限
         /// </summary>
@@ -2617,7 +2670,6 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             return sre;
         }
 
-
         #endregion
     }
 }