商标后物料编码调整为物料描述（去掉智能一体机陶瓷体）

wwwroot/main/Assemble/api/GetLogoData.ashx

@@ -144,21 +144,26 @@ public class GetLogoData : IHttpHandler, IReadOnlySessionState
                                   SELECT l.logoid AS id
                                           ,CASE
                                                WHEN linshi.residuequantity IS NOT NULL AND linshi.quantity IS NOT NULL  THEN
-                                                 l.logoname || '[' || t2.materialcode || ']' || ' 剩余[' || linshi.residuequantity || ']'
+                                                 l.logoname || '[' || t2.materialremark || ']' || ' 剩余[' || linshi.residuequantity || ']'
                                                 WHEN linshi.residuequantity IS  NULL AND linshi.quantity IS NOT NULL THEN
-                                                 l.logoname || '[' || t2.materialcode || ']' || ' 剩余[' || linshi.quantity || ']'
+                                                 l.logoname || '[' || t2.materialremark || ']' || ' 剩余[' || linshi.quantity || ']'
                                                ELSE
-                                                l.logoname || '[' || t2.materialcode || ']'
+                                                l.logoname || '[' || t2.materialremark || ']'
                                            END AS NAME
                                           ,t2.materialcode
                                           ,nvl(gdd.valueflag, '0') AS iscurrentlogo
                                           ,1 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
+                                     INNER JOIN (SELECT DISTINCT t.goodsid,t.logoid,t.materialcode,
+                                     case when instr( t.materialremark ,'智能一体机陶瓷体')= 1 then substr(t.materialremark,9,length(t.materialremark))
+                          when instr( t.materialremark ,'落地式坐便器')= 1 then substr(t.materialremark,7,length(t.materialremark))
+                            when instr( t.materialremark ,'智能一体机')= 1 then substr(t.materialremark,6,length(t.materialremark))
+                              when instr( t.materialremark ,'电控一体机')= 1 then substr(t.materialremark,6,length(t.materialremark))
+                            else t.materialremark   end  as materialremark
+                                                   FROM (SELECT g.goodsid,g.logoid,g.materialcode,g.materialremark
                                                            FROM tp_mst_goods g
                                                          UNION ALL
-                                                         SELECT s.goodsid,s.logoid,s.materialcode
+                                                         SELECT s.goodsid,s.logoid,s.materialcode,s.materialremark
                                                            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
@@ -253,21 +258,26 @@ public class GetLogoData : IHttpHandler, IReadOnlySessionState
                                 SELECT l.logoid AS id
                                           ,CASE 
                                                WHEN linshi.residuequantity IS NOT NULL AND linshi.quantity IS NOT NULL  THEN
-                                                 l.logoname || '[' || t2.materialcode || ']' || ' 剩余[' || linshi.residuequantity || ']'
+                                                 l.logoname || '[' || t2.materialremark || ']' || ' 剩余[' || linshi.residuequantity || ']'
                                                 WHEN linshi.residuequantity IS  NULL AND linshi.quantity IS NOT NULL THEN
-                                                 l.logoname || '[' || t2.materialcode || ']' || ' 剩余[' || linshi.quantity || ']'
+                                                 l.logoname || '[' || t2.materialremark || ']' || ' 剩余[' || linshi.quantity || ']'
                                                ELSE
-                                                l.logoname || '[' || t2.materialcode || ']'
+                                                l.logoname || '[' || t2.materialremark || ']'
                                            END 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
+                                     INNER JOIN (SELECT DISTINCT t.goodsid,t.logoid,t.materialcode,
+                                     case when instr( t.materialremark ,'智能一体机陶瓷体')= 1 then substr(t.materialremark,9,length(t.materialremark))
+                          when instr( t.materialremark ,'落地式坐便器')= 1 then substr(t.materialremark,7,length(t.materialremark))
+                            when instr( t.materialremark ,'智能一体机')= 1 then substr(t.materialremark,6,length(t.materialremark))
+                              when instr( t.materialremark ,'电控一体机')= 1 then substr(t.materialremark,6,length(t.materialremark))
+                            else t.materialremark   end  as materialremark
+                                                   FROM (SELECT g.goodsid,g.logoid,g.materialcode,g.materialremark
                                                            FROM tp_mst_goods g
                                                          UNION ALL
-                                                         SELECT s.goodsid,s.logoid,s.materialcode
+                                                         SELECT s.goodsid,s.logoid,s.materialcode,s.materialremark
                                                            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
@@ -357,22 +367,29 @@ public class GetLogoData : IHttpHandler, IReadOnlySessionState
             {
                 DataTable dtLogo = conn.ExecuteDatatable(@"
                     SELECT L.LOGOID AS ID,
-                           L.LOGONAME || '[' || T2.MATERIALCODE || ']' AS NAME,
+                           L.LOGONAME || '[' || case when instr( T2.materialremark ,'智能一体机陶瓷体')= 1 then substr(T2.materialremark,9,length(T2.materialremark))
+                          when instr( T2.materialremark ,'落地式坐便器')= 1 then substr(T2.materialremark,7,length(T2.materialremark))
+                            when instr( T2.materialremark ,'智能一体机')= 1 then substr(T2.materialremark,6,length(T2.materialremark))
+                              when instr( T2.materialremark ,'电控一体机')= 1 then substr(T2.materialremark,6,length(T2.materialremark))
+                            else T2.materialremark   end || ']' 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
+                                                 T.MATERIALCODE,
+                                                 T.materialremark
                                    FROM (SELECT G.GOODSID,
                                                 G.LOGOID,
-                                                G.MATERIALCODE
+                                                G.MATERIALCODE,
+                                                G.materialremark
                                            FROM TP_MST_GOODS G
                                          UNION ALL
                                          SELECT S.GOODSID,
                                                 S.LOGOID,
-                                                S.MATERIALCODE
+                                                S.MATERIALCODE,
+                                                S.materialremark
                                            FROM TP_MST_GOODSLOGOSAP S) T
                                   WHERE EXISTS (SELECT 1
                                            FROM TP_PM_GROUTINGDAILYDETAIL G

wwwroot/main/Assemble/api/GetLogoDataByFJBD.ashx

@@ -31,22 +31,29 @@ public class GetLogoDataByFJBD : IHttpHandler, IReadOnlySessionState
         { 
             DataTable dtLogo = conn.ExecuteDatatable(@"
                 SELECT L.LOGOID AS ID,
-                        L.LOGONAME || '[' || T2.MATERIALCODE || ']' AS NAME,
+                        L.LOGONAME || '[' || case when instr( T2.materialremark ,'智能一体机陶瓷体')= 1 then substr(T2.materialremark,9,length(T2.materialremark))
+                          when instr( T2.materialremark ,'落地式坐便器')= 1 then substr(T2.materialremark,7,length(T2.materialremark))
+                            when instr( T2.materialremark ,'智能一体机')= 1 then substr(T2.materialremark,6,length(T2.materialremark))
+                              when instr( T2.materialremark ,'电控一体机')= 1 then substr(T2.materialremark,6,length(T2.materialremark))
+                            else T2.materialremark   end || ']' 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
+                                                T.MATERIALCODE,
+                                                T.materialremark
                                 FROM (SELECT G.GOODSID,
                                             G.LOGOID,
-                                            G.MATERIALCODE
+                                            G.MATERIALCODE,
+                                            G.materialremark
                                         FROM TP_MST_GOODS G
                                         UNION ALL
                                         SELECT S.GOODSID,
                                             S.LOGOID,
-                                            S.MATERIALCODE
+                                            S.MATERIALCODE,
+                                            S.materialremark
                                         FROM TP_MST_GOODSLOGOSAP S) T
                                 WHERE EXISTS (SELECT 1
                                         FROM TP_PM_GROUTINGDAILYDETAIL G