From 9e77c204cb9d11f6b2ec08d0a20287a6f5fcd05c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 11 Feb 2025 11:44:04 +0800
Subject: [PATCH] =?UTF-8?q?2/11=20=E5=8F=96=E8=B4=A7=E6=9E=B6=20=E6=A7=BD?=
 =?UTF-8?q?=E4=BD=8D=E7=BC=96=E5=8F=B7bug=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/basic/SysWorkplaceFreightMapper.java  |  2 ++
 .../basic/SysWorkplaceFreightService.java     |  2 +-
 .../basic/SysWorkplaceFreightMapper.xml       |  6 ++++++
 .../mapper/basic/SysWorkplaceQueueMapper.xml  |  4 ++--
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  | 19 +++++++++++--------
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java
index 1fa99afa2..275db722d 100644
--- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java
+++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java
@@ -17,4 +17,6 @@ public interface SysWorkplaceFreightMapper extends BaseMapper<SysWorkplaceFreigh
     List<SysWorkplaceFreightResponse> filterList(SysWorkplaceFreightRequest request);
 
     List<SysWorkplaceFreightPrintResponse> getList(SysWorkplaceFreightRequest sysWorkplaceFreightRequest);
+
+    SysWorkplaceFreight selectMaxCode();
 }
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
index 3c83f7309..1a3ccfbd6 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
@@ -72,7 +72,7 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
 
     public String createQueueCode() {
         String code;
-        SysWorkplaceFreight sysWorkplaceQueue = sysWorkplaceFreightMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceFreight>().orderByDesc(SysWorkplaceFreight::getCode).last("LIMIT 1"));
+        SysWorkplaceFreight sysWorkplaceQueue = sysWorkplaceFreightMapper.selectMaxCode();
         if (sysWorkplaceQueue == null){
             //没有数据 新增
             code = "DMQ00" + 1;
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
index 7b408d612..55a1864ea 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
@@ -66,4 +66,10 @@
         </where>
         order by swf.code,swl.code, swq.code
     </select>
+    <select id="selectMaxCode" resultType="com.glxp.api.entity.basic.SysWorkplaceFreight">
+        SELECT *
+        from sys_workplace_freight
+        ORDER BY CAST(SUBSTRING(code, 6) AS UNSIGNED) DESC
+        LIMIT 1
+    </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 215fbca26..dc7fd247a 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -171,7 +171,7 @@
         </where>
     </select>
     <select id="selectMaxCode" resultType="java.lang.String">
-        select max(code) as code
+        SELECT MAX(CAST(SUBSTRING_INDEX(code, '-', -1) AS UNSIGNED)) AS code
         from sys_workplace_queue
         <where>
             <if test="layerCode != null and layerCode != ''">
@@ -187,7 +187,7 @@
                 AND layerCode = #{layerCode}
             </if>
         </where>
-        ORDER BY code DESC
+        ORDER BY CAST(SUBSTRING_INDEX(code, '-', -1) AS UNSIGNED) DESC
         LIMIT 1
     </select>
 
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index fd42be5f1..9f2936cd4 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -675,22 +675,25 @@
             </if>
             <if test="filterType != null and filterType == 1 and productsType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
-                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 1 and productsType == 2">
-                AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
-                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
-                and mainId <![CDATA[<>]]> ''
+                AND (thirdId is not null or thirdId1 is not null)
+            </if>
+            <if test="filterType != null and filterType == 1 and productsType == 2">
+                AND  basic_products.nameCode is not null
             </if>
             <if test="filterType != null and filterType == 2  and productsType == 1">
                 AND basic_products.originUuid is NULL
             </if>
             <if test="filterType != null and filterType == 2 and productsType == 2">
-                AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null)
-                    or (thirdId2 = '' or thirdId2 is null) or (thirdId3 = '' or thirdId3 is null)
-                    or (thirdId4 = '' or thirdId4 is null))
-                AND (mainId = '' or mainId is null)
+                AND  ((thirdId = '' or thirdId is null)  or  (thirdId1 = '' or thirdId1 is null)
+                )
+            </if>
+            <if test="filterType != null and filterType == 2 and productsType == 2">
+                AND  ( (mainId = '' or mainId is null)  or  (basic_products.nameCode = '' or basic_products.nameCode is null)
+                )
             </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')