From bbdc772231bf5f4017f7718cbb972fe104c28139 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 16 Jan 2025 18:14:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           |  1 +
 .../basic/SysWorkplaceQueueViewResponse.java  |  9 +++++++++
 .../basic/SysWorkplaceQueueService.java       | 19 ++++++++++++++-----
 .../mapper/basic/SysWorkplaceQueueMapper.xml  |  9 ++++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 4925b23b6..ba8977aaa 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -177,6 +177,7 @@ public class IoCodeTempController extends BaseController {
         if (collectOrder == null) {
             //查询原始单据查到为异常提示
             IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code);
+
             if (ioCollectOrigin != null) {
                 //进行删除 重新匹配
                 collectOrderOriginService.remove(new LambdaQueryWrapper<IoCollectOrderOrigin>().eq(IoCollectOrderOrigin::getBillNo, ioCollectOrigin.getBillNo()));
diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java
index de58f0f55..0116c9523 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java
@@ -70,5 +70,14 @@ public class SysWorkplaceQueueViewResponse {
     private Integer height;
     private List<SysWorkplaceQueueViewResponse> sysWorkplaceQueues;
 
+    //产品名称
+    private String cpmctymc;
+    //当前库存
+    private Integer reCount;
+    //最大库存
+    private Integer maxDrugCount;
+    //预警数量
+    private Integer remindCount;
+
 
 }
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 a7fc54274..811f44c0c 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
@@ -229,23 +229,32 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
 
     public List<SysWorkplaceQueueViewResponse> getListByFreightCodeView(String freightCode) {
         List<SysWorkplaceQueueViewResponse>  respList = new ArrayList<>();
+        List<SysWorkplaceQueueViewResponse>  sortedRespList = new ArrayList<>();
         List<SysWorkplaceQueueViewResponse>  list = sysWorkplaceQueueMapper.getListByFreightCodeView(freightCode);
         if (CollUtil.isNotEmpty(list)){
 
             // 使用Stream API根据layerCode字段进行分组
             Map<String, List<SysWorkplaceQueueViewResponse>> groupedByLayerCode = list.stream()
                     .collect(Collectors.groupingBy(SysWorkplaceQueueViewResponse::getLayerCode));
-            final int[] i = {1};
+
             groupedByLayerCode.forEach((layerCode, responseList) -> {
                 SysWorkplaceQueueViewResponse sysWorkplaceQueueViewResponse = new SysWorkplaceQueueViewResponse();
                 sysWorkplaceQueueViewResponse.setSysWorkplaceQueues(responseList);
-                sysWorkplaceQueueViewResponse.setHeight(80);
-                sysWorkplaceQueueViewResponse.setRow(i[0]);
+                sysWorkplaceQueueViewResponse.setHeight(140);
+                sysWorkplaceQueueViewResponse.setRow(Integer.parseInt(layerCode.split("-")[1]));
+                sysWorkplaceQueueViewResponse.setLayerCode(layerCode);
                 respList.add(sysWorkplaceQueueViewResponse);
-                i[0]++;
             });
         }
-        return respList;
+
+        if (CollUtil.isNotEmpty(respList)) {
+            // 使用 Stream API 对列表进行排序
+            sortedRespList = respList.stream()
+                    .sorted(Comparator.comparing(SysWorkplaceQueueViewResponse::getRow).reversed())
+                    .collect(Collectors.toList());
+        }
+
+        return sortedRespList;
     }
 
 }
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index cad81cf95..7a293f43d 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -206,9 +206,16 @@
 
 
         <select id="getListByFreightCodeView" resultType="com.glxp.api.res.basic.SysWorkplaceQueueViewResponse">
-        select swq.id,swq.code,swq.name,swq.layerCode ,lg.`red` , lg.`orange` , lg.`blue` , lg.`green`
+        select swq.id,swq.code,swq.name,swq.layerCode ,lg.`red` , lg.`orange` , lg.`blue` , lg.`green`,bp.cpmctymc,swq.maxDrugCount
+        ,swq.remindCount,ifnull(a.reCount,0) as reCount
         from sys_workplace_queue swq
         LEFT JOIn io_collect_led_group lg ON lg.mac = swq.mac
+        LEFT JOIn basic_udirel bu ON bu.id = swq.relId
+        LEFT JOIn basic_products bp on bu.uuid = bp.uuid and diType= 1
+        LEFT JOIn (
+        select  sum(reCount) as reCount,workPlaceQueueCode from io_split_fifo_inv isfi
+        group by workPlaceQueueCode
+        ) as  a on a.workPlaceQueueCode = swq.code
         <where>
             <if test="freightCode != null and freightCode != ''">
                 AND swq.freightCode = #{freightCode}