商标设定pda匹配料号

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -3399,29 +3399,27 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             try
             {
                 string sqlString = null;
-                //if (sUserInfo.AccountCode == "imex")
+                sqlString = "SELECT L.LOGOID\n" +
+                "      ,L.LOGOCODE\n" +
+                "      ,L.LOGONAME\n" +
+                "      ,L.LOGONAME || '[' || L.LOGOCODE || ']' AS LOGONAMECODE\n" +
+                "  FROM TP_MST_GOODSLOGOSAP T\n" +
+                " INNER JOIN TP_MST_LOGO L\n" +
+                "    ON L.LOGOID = T.LOGOID\n" +
+                " WHERE T.GOODSID = :GOODSID\n" +
+				"   AND L.VALUEFLAG = '1'\n" +
+				"ORDER BY L.ISDEFAULT DESC, L.DISPLAYNO";
+
+                OracleParameter[] pLogoSAP = new OracleParameter[]
                 {
-                    sqlString = "SELECT l.LogoID\n" +
-                    "      ,l.LogoCode\n" +
-                    "      ,l.LogoName\n" +
-                    "      ,l.LogoName || '[' || l.LogoCode || ']' AS LogoNameCode\n" +
-                    "  FROM tp_mst_goodslogosap t\n" +
-                    " INNER JOIN tp_mst_logo l\n" +
-                    "    ON l.logoid = t.logoid\n" +
-                    " WHERE t.goodsid = :goodsid\n" +
-                    "   AND l.valueflag = '1'";
-
-                    OracleParameter[] pImex = new OracleParameter[]
-                    {
-                        new OracleParameter(":goodsid", goodsid)
-                    };
-                    oracleConn.Open();
-                    DataSet resultImex = oracleConn.GetSqlResultToDs(sqlString, pImex);
-                    if (resultImex != null && resultImex.Tables.Count > 0 && resultImex.Tables[0].Rows.Count > 0)
-                    {
-                        oracleConn.Close();
-                        return resultImex;
-                    }
+                    new OracleParameter(":goodsid", goodsid)
+                };
+                oracleConn.Open();
+                DataSet resultLogoSAP = oracleConn.GetSqlResultToDs(sqlString, pLogoSAP);
+                if (resultLogoSAP != null && resultLogoSAP.Tables.Count > 0 && resultLogoSAP.Tables[0].Rows.Count > 0)
+                {
+                    oracleConn.Close();
+                    return resultLogoSAP;
                 }
 
                 sqlString = "Select LogoID,LogoCode,LogoName,LogoName||'['||LogoCode||']' as LogoNameCode "