Просмотр исходного кода

附件绑定 查询商标 不查询生产计划

qinqi 1 год назад
Родитель
Сommit
55ea0a50b2
2 измененных файлов с 91 добавлено и 3 удалено
  1. 79 0
      wwwroot/main/Assemble/api/GetLogoDataByFJBD.ashx
  2. 12 3
      wwwroot/main/Assemble/index.html

+ 79 - 0
wwwroot/main/Assemble/api/GetLogoDataByFJBD.ashx

@@ -0,0 +1,79 @@
+<%@ WebHandler Language="C#" Class="GetLogoDataByFJBD" %>
+
+
+using System;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.SessionState;
+using System.Web.Configuration;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Curtain.DataAccess;
+using Curtain.Log;
+using DK.XuWei.WebMes;
+
+
+/// <summary>
+/// 获取 当前产品的可变商标(附件绑定)
+/// qq 2024-10-17
+/// </summary>
+public class GetLogoDataByFJBD : IHttpHandler, IReadOnlySessionState
+{
+    public void ProcessRequest(HttpContext context)
+    {
+        using (IDataAccess conn = DataAccess.Create())
+        { 
+            DataTable dtLogo = conn.ExecuteDatatable(@"
+                SELECT L.LOGOID AS ID,
+                        L.LOGONAME || '[' || T2.MATERIALCODE || ']' AS NAME,
+                        T2.MATERIALCODE,
+                        NVL(GDD.VALUEFLAG, '0') AS ISCURRENTLOGO
+                        ,0 AS ISCONTROL
+                    FROM TP_MST_LOGO L
+                    INNER JOIN (SELECT DISTINCT T.GOODSID,
+                                                T.LOGOID,
+                                                T.MATERIALCODE
+                                FROM (SELECT G.GOODSID,
+                                            G.LOGOID,
+                                            G.MATERIALCODE
+                                        FROM TP_MST_GOODS G
+                                        UNION ALL
+                                        SELECT S.GOODSID,
+                                            S.LOGOID,
+                                            S.MATERIALCODE
+                                        FROM TP_MST_GOODSLOGOSAP S) T
+                                WHERE EXISTS (SELECT 1
+                                        FROM TP_PM_GROUTINGDAILYDETAIL G
+                                        WHERE G.GOODSID = T.GOODSID
+                                        AND G.BARCODE = @BARCODE@)) T2
+                    ON T2.LOGOID = L.LOGOID
+                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD
+                    ON GDD.LOGOID = L.LOGOID
+                    AND GDD.BARCODE = @BARCODE@
+                    WHERE L.VALUEFLAG = '1'
+                    AND L.ACCOUNTID = @ACCOUNTID@
+                    ORDER BY L.DISPLAYNO ",
+                new CDAParameter("BARCODE", context.Request["barCode"]),
+                new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"])
+            );
+            context.Response.Write(new JsonResult() { success = true, message = "操作成功!", rows = dtLogo }.ToJson());
+             
+        }
+    }
+
+
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
+
+}

+ 12 - 3
wwwroot/main/Assemble/index.html

@@ -2322,7 +2322,10 @@
                                                             // 装配页面,加载BOM
                                                             if (request('modeltype') == -5) {
                                                                 var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
-                                                                var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                //暂时注释,附件绑定不查询生产计划
+                                                                //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                //暂时注释,附件绑定不查询生产计划
 
                                                                 $.when(bomData, logoData, bindIdnrkData).then(
                                                                     function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {
@@ -3629,7 +3632,10 @@
                                                         // 装配页面,加载BOM
                                                         if (request('modeltype') == -5) {
                                                             var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
-                                                            var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                            //暂时注释,附件绑定不查询生产计划
+                                                            //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                            var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                            //暂时注释,附件绑定不查询生产计划
 
                                                             $.when(bomData, logoData, bindIdnrkData).then(
                                                                 function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {
@@ -4807,7 +4813,10 @@
                                                             // 装配页面,加载BOM
                                                             if (request('modeltype') == -5) {
                                                                 var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
-                                                                var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                //暂时注释,附件绑定不查询生产计划
+                                                                //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
+                                                                //暂时注释,附件绑定不查询生产计划
 
                                                                 $.when(bomData, logoData, bindIdnrkData).then(
                                                                     function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {