fix:槽位关联关系

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -91,6 +91,25 @@ public class SysWorkplaceQueueController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList")
+    public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) {
+
+
+        String scanCode = request.getScanCode();
+        if (StrUtil.isNotEmpty(scanCode)){
+            UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
+            if (udi != null ) request.setNameCode(udi.getUdi());
+        }
+        request.setScanCode(null);
+
+        List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterBindList(request);
+        PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
     public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
@@ -218,7 +237,7 @@ public class SysWorkplaceQueueController extends BaseController {
             return ResultVOUtils.error("货位槽码不能为空");
         }
 
-        List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterList(request);
+        List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
         if (CollUtil.isEmpty(list)){
             return ResultVOUtils.error("未找到该货位槽码的信息");
         }

src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java

@@ -15,6 +15,7 @@ public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
     Integer selectMaxLayer(String freightCode);
 
     List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request);
+    List<SysWorkplaceQueueResponse> filterBindList(SysWorkplaceQueueRequest request);
 
     Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer);
 

src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java

@@ -152,6 +152,20 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
         return sysWorkplaceQueueResponses;
     }
 
+    public List<SysWorkplaceQueueResponse> filterBindList(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.filterBindList(request);
+//        for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
+//            sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
+//        }
+        return sysWorkplaceQueueResponses;
+    }
+
     //删减卡槽
     public void deleteQueue(SysWorkplaceQueueRequest sysWorkplaceQueueRequest) {
         Integer grid = sysWorkplaceQueueRequest.getGrids();

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

@@ -27,7 +27,7 @@
         </where>
     </select>
 
-    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
+    <select id="filterBindList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
         select swq.*,bp.nameCode,bp.ggxh,bp.cpmctymc
         from sys_workplace_queue swq
         left join
@@ -65,6 +65,28 @@
             </if>
         </where>
     </select>
+
+    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
+        select swq.*
+        from sys_workplace_queue swq
+        <where>
+            <if test="key != null and key != ''">
+                AND (
+                swq.code like concat('%', #{key}, '%')
+                or swq.name like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test=" layerCode != null and layerCode != ''">
+                AND layerCode = #{layerCode}
+            </if>
+            <if test="layerCodes != null and layerCodes.size() > 0">
+                and swq.layerCode in
+                <foreach collection="layerCodes" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
     <select id="selectMaxGrid" resultType="java.lang.Integer">
         select max(grid) as grid from sys_workplace_queue
         <where>