商标

wwwroot/mes/mst/CommonModelGood/commonmodel_add.html

@@ -37,8 +37,8 @@
                     <input class="easyui-combobox" id="GOODS" name="GOODS" data-options="required:true,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSID',textField:'GOODSCODE',panelHeight:'300px',editable:true,onChange:GETOUTLETDISTANCE" style="width:100%;height:32px;">
                 </div>
                 <div class="w-div">
-                    <div class="w-fieldname">商标：</div>
-                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:true,prompt:'',tipPosition:'top',method:'get',valueField:'LOGOID',textField:'LOGONAME',panelHeight:'300px',editable:true,onChange:GETOUTLETDISTANCE" style="width:100%;height:32px;">
+                    <div class="w-fieldname">商标：</div>  
+                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1', method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',editable:false" style="width:100%;height:32px;">
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">坑距：</div>
@@ -106,8 +106,8 @@
             $('#LOGONAME').textbox('setValue', '');
             //获取产品对应商标
 
-            //$('#LOGONAME').combobox('reload', 'goodscommonmodel.ashx?m=lo&&goodsid='+ goods[0].toString());
-            //$('#LOGONAME').combobox('setValue', 0);
+            $('#LOGONAME').combobox('reload', '../../rpt/rpt.ashx?m=getLogoByGoods&select=1&goodsid='+ goods[0].toString());
+            $('#LOGONAME').combobox('setValue', 0);
 
                 //$.get("goodscommonmodel.ashx?m=lo&&goodsid=" + goods[0].toString(), function (data) {
                 //    var json = JSON.parse(data);

wwwroot/mes/rpt/rpt.ashx

@@ -1075,7 +1075,7 @@ order by tt.stype, tt.displayno, tt.ssid
                     }
                     break;
                 case "getFQCITEMS"://获取FQC检验项目
-                    { 
+                    {
                         using (IDataAccess conn = DataAccess.Create())
                         {
                             string sql2 = "SELECT ITEMSID,INSPECTTYPE,INSPECTNAME FROM TP_PM_FQCITEMS  WHERE VALUEFLAG=1 and ACCOUNTID=@AccountID@";
@@ -1086,6 +1086,70 @@ order by tt.stype, tt.displayno, tt.ssid
                         }
                     }
                     break;
+                case "getLogoByGoods"://获取商标根据产品
+                    {
+                        using (IDataAccess conn = DataAccess.Create())
+                        {
+                            DataTable result = new DataTable();
+                            if (context.Request["goodsid"] is object)
+                            {
+                                result = conn.ExecuteDatatable(@"
+                                SELECT
+                                DISTINCT
+                                T.LOGOID ID,
+                                T.LOGONAME TEXT
+                                FROM(
+                                SELECT
+	                                G.LOGOID,
+	                                TML.LOGONAME 
+                                FROM
+	                                TP_MST_GOODS G
+	                                LEFT JOIN TP_MST_LOGO TML ON G.LOGOID = TML.LOGOID 
+                                WHERE
+	                                G.GOODSID = @GOODSID@ UNION ALL
+                                SELECT
+	                                GLS.LOGOID,
+	                                L.LOGONAME 
+                                FROM
+	                                TP_MST_GOODSLOGOSAP GLS
+	                                INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID 
+                                WHERE
+	                                GLS.GOODSID = @GOODSID@ 
+	                                ) T
+                                ",
+                                    new CDAParameter("GOODSID", context.Request["goodsid"])
+                                );
+                            }
+                            else
+                            {
+                                result = conn.ExecuteDatatable(@"
+                                    SELECT
+                                    DISTINCT
+                                    T.LOGOID ID,
+                                    T.LOGONAME TEXT
+                                    FROM(
+                                    SELECT
+	                                    G.LOGOID,
+	                                    TML.LOGONAME 
+                                    FROM
+	                                    TP_MST_GOODS G
+	                                    LEFT JOIN TP_MST_LOGO TML ON G.LOGOID = TML.LOGOID 
+                                      UNION ALL
+                                    SELECT
+	                                    GLS.LOGOID,
+	                                    L.LOGONAME 
+                                    FROM
+	                                    TP_MST_GOODSLOGOSAP GLS
+	                                    INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID  
+	                                    ) T
+                                    "
+                                    );
+                            } 
+
+                            context.Response.Write(result.ToJson());
+                        }
+                    }
+                    break;
                 default:
                     {
                         break;