1/18 槽位管理查询优化1.0

src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java

@@ -54,7 +54,8 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
     private String macCode;
     private String queueCode;
 
-
+    private Integer productBind;
+    private Integer macBind;
 
 
 

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.44:3306/udi_wms_cll?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml

@@ -103,6 +103,19 @@
             <if test="workPlaceIdFk != null and workPlaceIdFk != ''">
                 AND swq.workPlaceIdFk = #{workPlaceIdFk}
             </if>
+            <if test="productBind != null and productBind == 1 ">
+                AND swq.relId IS NOT NULL
+            </if>
+            <if test="productBind != null and productBind == 0 ">
+                AND swq.relId IS NULL
+            </if>
+            <if test="macBind != null and macBind == 1 ">
+                AND swq.mac IS NOT NULL
+            </if>
+            <if test="macBind != null and macBind == 0 ">
+                AND swq.mac IS NULL
+            </if>
+
             <if test="layerCodes != null and layerCodes.size() > 0">
                 and swq.layerCode in
                 <foreach collection="layerCodes" item="item" index="index" separator="," open="(" close=")">

src/main/resources/schemas/schema_v2.4.sql

@@ -5155,6 +5155,8 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow',
 
 
 
+
+
 CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount',
                          'int NULL DEFAULT NULL COMMENT ''入库码数量''',
                          1);
@@ -5167,3 +5169,10 @@ CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'outCodeCount',
 CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'reCodeCount',
                          'int NULL DEFAULT NULL COMMENT ''剩余码数量''',
                          1);
+
+INSERT IGNORE INTO `sys_custom_config_detail`  (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`, `isImport`)
+VALUES (463278, 213, '2', 1, 'productBind', '产品是否绑定', 'select', NULL, NULL, '{\"0\":\"否\",\"1\":\"是\"}', NULL, NULL, NULL, 98, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1);
+
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`, `isImport`)
+VALUES (463279, 213, '2', 1, 'macBind', '灯组是否绑定', 'select', NULL, NULL, '{\"0\":\"否\",\"1\":\"是\"}', NULL, NULL, NULL, 95, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1);
+