From 8c35a2be714fe72fef35facd8408f7fd6142c463 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 9 Nov 2024 15:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=A7=BD=20=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysWorkplaceQueueController.java     | 16 +++---------
 .../dao/basic/SysWorkplaceQueueMapper.java    |  4 +--
 .../basic/SysWorkplaceLayerService.java       |  1 +
 .../basic/SysWorkplaceQueueService.java       | 14 +++--------
 .../mapper/basic/SysWorkplaceQueueMapper.xml  | 25 +------------------
 5 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
index 205470278..6507c8ed1 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
@@ -62,8 +62,9 @@ public class SysWorkplaceQueueController extends BaseController {
     @Resource
     SysWorkplaceService sysWorkplaceService;
 
-    @GetMapping("/udiwms/sysWorkplaceQueue/page")
-    public BaseResponse page(SysWorkplaceQueueRequest request) {
+
+    @GetMapping("/udiwms/sysWorkplaceQueue/getQueueList")
+    public BaseResponse getQueueList(SysWorkplaceQueueRequest request) {
         List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterList(request);
         PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -167,15 +168,6 @@ public class SysWorkplaceQueueController extends BaseController {
     }
 
 
-    //后面做的搜索可能就得在这个接口进行修改了
-    @GetMapping("/udiwms/sysWorkplaceQueue/getQueueList")
-    public BaseResponse getQueueListByFreightCode(SysWorkplaceQueueRequest request) {
-        List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterListFreightCode(request);
-        PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
-        PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(page);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
+
 }
 
diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
index fe65d3641..53dd2064a 100644
--- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
+++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java
@@ -12,11 +12,9 @@ import java.util.List;
 @Mapper
 public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
 
-    List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request);
-
     Integer selectMaxLayer(String freightCode);
 
-    List<SysWorkplaceQueueResponse> filterListFreightCode(SysWorkplaceQueueRequest request);
+    List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request);
 
     Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer);
 
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
index 54b599f63..45a2f62fe 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
@@ -72,6 +72,7 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
         SysWorkplaceQueueRequest sysWorkplaceQueueRequest = new SysWorkplaceQueueRequest();
         sysWorkplaceQueueRequest.setLayerCode(request.getCode());
         sysWorkplaceQueueRequest.setWorkPlaceIdFk(request.getWorkPlaceIdFk());
+        sysWorkplaceQueueRequest.setFreightCode(request.getFreightCode());
         Integer num = 0;
         if (workplaceLayer != null) {
             //已经有该编码的摆货层 可能根据原来的增加 也可能是根据原来的删减出货槽
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
index 86e016518..1cd50e09c 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
@@ -32,15 +32,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     private SysWorkplaceQueueMapper sysWorkplaceQueueMapper;
 
 
-    public List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request) {
-        if (null == request) {
-            return Collections.emptyList();
-        }
-        if (null != request.getPage() && null != request.getLimit()) {
-            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
-        }
-        return sysWorkplaceQueueMapper.filterList(request);
-    }
 
     public String createQueueCode() {
         String code;
@@ -86,6 +77,7 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
             sysWorkplaceQueue.setUpdateTime(new Date());
             sysWorkplaceQueue.setUpdateUser(userId + "");
             sysWorkplaceQueue.setWorkPlaceIdFk(request.getWorkPlaceIdFk());
+            sysWorkplaceQueue.setFreightCode(request.getFreightCode());
 //            sysWorkplaceQueues.add(sysWorkplaceQueue);
             sysWorkplaceQueueMapper.insert(sysWorkplaceQueue);
         }
@@ -146,14 +138,14 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     }
 
 
-    public List<SysWorkplaceQueueResponse> filterListFreightCode(SysWorkplaceQueueRequest request) {
+    public List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request) {
         if (null == request) {
             return Collections.emptyList();
         }
         if (null != request.getPage() && null != request.getLimit()) {
             PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
         }
-        List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterListFreightCode(request);
+        List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterList(request);
 //        for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
 //            sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
 //        }
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index d1ed470d6..f6fbb3993 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -18,29 +18,6 @@
         <!--@mbg.generated-->
         id, code, `name`, workPlaceIdFk, remark, createTime, updateTime, `createUser`, updateUser
     </sql>
-
-    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
-        select sq.*,
-               basic_products.cpmctymc  productName,
-               COALESCE(basic_products.bzgg, basic_products.ggxh) as productSpec
-        from sys_workplace_queue sq
-        left join io_split_fifo_code isfc on isfc.workPlaceQueueCode = sq.code
-        left join basic_udirel bu on isfc.relId = bu.id
-        left join basic_products ON basic_products.uuid = bu.uuid
-        <where>
-            <if test="key != null and key != ''">
-                AND (
-                sq.code like concat('%', #{key}, '%')
-                or sq.name like concat('%', #{key}, '%')
-                )
-            </if>
-            <if test=" workPlaceIdFk != null and workPlaceIdFk != ''">
-                AND workPlaceIdFk = #{workPlaceIdFk}
-            </if>
-        </where>
-        GROUP BY sq.code
-        ORDER BY sq.code
-    </select>
     <select id="selectMaxLayer" resultType="java.lang.Integer">
         select max(layer) as layer from sys_workplace_queue
         <where>
@@ -50,7 +27,7 @@
         </where>
     </select>
 
-    <select id="filterListFreightCode" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
+    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
         select swq.*
         from sys_workplace_queue swq
         <where>