From f4a7c2a606f16ccde236232c0ae31c478def70a0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 18 Jan 2025 15:36:49 +0800
Subject: [PATCH] =?UTF-8?q?1/18=20=E6=A7=BD=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/basic/SysWorkplaceQueueRequest.java     |  3 ++-
 src/main/resources/application-dev.yml              |  2 +-
 .../mapper/basic/SysWorkplaceQueueMapper.xml        | 13 +++++++++++++
 src/main/resources/schemas/schema_v2.4.sql          |  9 +++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
index 43b9fc036..abab7bad9 100644
--- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java
+++ b/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;
 
 
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index d981393af..4f4a412cf 100644
--- a/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 7aabad3ba..215fbca26 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/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=")">
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index cfda30262..47aa34655 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/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);
+