소스 검색

商品档案新增压力等级、蝶板驱动、连接形式、筏板材质、阀体材质、执行器类型、执行器品牌、是否中线蝶阀字段。商品查询界面中也相应增加字段返回

沈静伟 3 년 전
부모
커밋
efaa0c1be4

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/工具档案列表查询.sql

@@ -24,7 +24,15 @@ select t1.fitemno,
        t1.fmaterial,
        t1.fmaterial,
        t1.fistool,
        t1.fistool,
        t1.fislimitborrow,
        t1.fislimitborrow,
-       t1.fproductstandard
+       t1.fproductstandard,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
        left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
        left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
        left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
        left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/工具档案列表查询_业务员.sql

@@ -25,7 +25,15 @@ select t1.fitemno,
        t1.fmaterial,
        t1.fmaterial,
        t1.fistool,
        t1.fistool,
        t1.fislimitborrow,
        t1.fislimitborrow,
-       t1.fproductstandard
+       t1.fproductstandard,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
        left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
        left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
        left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
        left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/简单货品档案列表查询.sql

@@ -9,7 +9,15 @@ select t1.fitemno,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
        t1.fmaterial,
        t1.fmaterial,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/货品档案列表查询.sql

@@ -28,7 +28,15 @@ select t1.fitemno,
        t1.fproductstandard,
        t1.fproductstandard,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/货品档案列表查询2.sql

@@ -28,7 +28,15 @@ select t1.fitemno,
        t1.fproductstandard,
        t1.fproductstandard,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/货品档案列表查询_业务员.sql

@@ -28,7 +28,15 @@ select t1.fitemno,
        t1.fissaleday,
        t1.fissaleday,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/货品档案列表查询_订单.sql

@@ -14,7 +14,15 @@ select t1.fitemno,
        t1.fissaleday,
        t1.fissaleday,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 9 - 1
src/rest/openapi/restcontroller/wechatapp/titem/SQL/项目订单货品档案列表查询.sql

@@ -8,7 +8,15 @@ select t1.fitemno,
        t1.fissaleday,
        t1.fissaleday,
        t1.fdevice,
        t1.fdevice,
        t1.fprodline,
        t1.fprodline,
-       t1.fspecalnote
+       t1.fspecalnote,
+       t1.fvalue1,
+       t1.fvalue2,
+       t1.fvalue3,
+       t1.fvalue4,
+       t1.fvalue5,
+       t1.fvalue6,
+       t1.fvalue7,
+       t1.fvalue8
 from titem t1
 from titem t1
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join tunit t2 on t1.funitid = t2.funitid and t1.siteid = t2.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid
          left join titemclass t3 on t1.fsaleclsnum = t3.fitemclsnum and t3.fclasstype = 'ÓªÏúÀà±ð' and t1.siteid = t3.siteid

+ 21 - 0
src/rest/openapi/restcontroller/wechatapp/titem/Titem.java

@@ -91,6 +91,27 @@ public class Titem extends Controller {
             if (whereObject.containsKey("fistool") && !"".equals(whereObject.getString("fistool"))) {
             if (whereObject.containsKey("fistool") && !"".equals(whereObject.getString("fistool"))) {
                 where = where + " and t1.fistool ='" + whereObject.getString("fistool") + "'";
                 where = where + " and t1.fistool ='" + whereObject.getString("fistool") + "'";
             }
             }
+//            if (whereObject.containsKey("fvalue8") && whereObject.getBoolean("fvalue8")) {
+//                where = where + " and t1.fvalue8 =1";
+//            }
+//            if (whereObject.containsKey("fvalue7") && !"".equals(whereObject.getString("fvalue7"))) {
+//                where = where + " and t1.fvalue7 ='" + whereObject.getString("fvalue7") + "'";
+//            }
+//            if (whereObject.containsKey("fvalue6") && !"".equals(whereObject.getString("fvalue6"))) {
+//                where = where + " and t1.fvalue6 ='" + whereObject.getString("fvalue6") + "'";
+//            }
+//            if (whereObject.containsKey("fvalue5") && !"".equals(whereObject.getString("fvalue5"))) {
+//                where = where + " and t1.fvalue5 ='" + whereObject.getString("fvalue5") + "'";
+//            }
+//            if (whereObject.containsKey("fvalue4") && !"".equals(whereObject.getString("fvalue4"))) {
+//                where = where + " and t1.fvalue4 ='" + whereObject.getString("fvalue4") + "'";
+//            }
+//            if (whereObject.containsKey("fvalue3") && !"".equals(whereObject.getString("fvalue3"))) {
+//                where = where + " and t1.fvalue3 ='" + whereObject.getString("fvalue3") + "'";
+//            }
+//            if (whereObject.containsKey("fvalue2") && !"".equals(whereObject.getString("fvalue2"))) {
+//                where = where + " and t1.fvalue2 ='" + whereObject.getString("fvalue2") + "'";
+//            }
         }
         }
         /**
         /**
          * SQL货品档案查询参数设置并查询
          * SQL货品档案查询参数设置并查询