Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

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

@@ -29,11 +29,13 @@ import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.SysWorkplaceQueueService;
 import com.glxp.api.service.basic.UdiProductService;
+import com.glxp.api.service.collect.IoCollectLedGroupService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.bcel.generic.IF_ACMPEQ;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,9 @@ public class SysWorkplaceQueueController extends BaseController {
     @Resource
     SysWorkplaceService sysWorkplaceService;
 
+    @Resource
+    IoCollectLedGroupService ioCollectLedGroupService;
+
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getQueueList")
     public BaseResponse getQueueList(SysWorkplaceQueueRequest request) {
@@ -293,8 +298,6 @@ public class SysWorkplaceQueueController extends BaseController {
      */
     @PostMapping("/udiwms/sysWorkplaceQueue/bindingLed")
     public BaseResponse binding(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
-        //该灯组有没有被其他槽位绑定
-        SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, sysWorkplaceQueue.getMac()));
         //绑定
         sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
         return ResultVOUtils.success("绑定成功");
@@ -310,7 +313,7 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplaceQueue/reloadBindingLed")
     public BaseResponse reloadBindingLed(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
-        //该灯组有没有被其他槽位绑定
+
         SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, sysWorkplaceQueue.getMac()));
         if (queue != null){
             //提示已经被绑定是否需要更改到当前槽位
@@ -320,5 +323,26 @@ public class SysWorkplaceQueueController extends BaseController {
         sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
         return ResultVOUtils.success("绑定成功");
     }
+
+    /**
+     * 根据货位槽号 获取 货位槽信息
+     */
+    @PostMapping("/udiwms/sysWorkplaceQueue/getLedDataByCode")
+    public BaseResponse getLedDataByCode(@RequestBody SysWorkplaceQueueRequest request) {
+        String macCode = request.getMacCode();
+        if (StrUtil.isEmpty(macCode)) {
+            return ResultVOUtils.error("灯组标签不能为空");
+        }
+
+        IoCollectLedGroup ledGroupServiceOne = ioCollectLedGroupService.getOne(new LambdaQueryWrapper<IoCollectLedGroup>().eq(IoCollectLedGroup::getMac, macCode));
+        if (ledGroupServiceOne == null){
+            return ResultVOUtils.error(500,"当前灯组标签不存在");
+        }
+        SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, macCode));
+        if (queue != null && !queue.getCode().equals(request.getCode())){
+
+        }
+        return ResultVOUtils.success(ledGroupServiceOne);
+    }
 }
 

src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java

@@ -51,6 +51,8 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
 
 
     private String mac;
+    private String macCode;
+    private String queueCode;
 
 
 

src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java

@@ -17,4 +17,5 @@ public class CollectLedGroupRequest extends ListPageRequest {
     private Integer lednum;
     private Integer timeout;
     private Integer ledmode;
+    private Integer isBind;
 }

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

@@ -51,7 +51,7 @@
 
 
                  left join sys_workplace on swq.workPlaceIdFk = sys_workplace.workplaceId
-        left join io_collect_led_group on swq.relId = io_collect_led_group.relId
+        left join io_collect_led_group on swq.mac = io_collect_led_group.mac
         <where>
             <if test="key != null and key != ''">
                 AND (
@@ -111,7 +111,9 @@
                 or bp.ggxh like concat('%', #{keyWords}, '%')
                 or bp.bzgg like concat('%', #{keyWords}, '%')
                 or layerCode like concat('%', #{keyWords}, '%')
-                or freightCode like concat('%', #{keyWords}, '%'))
+                or freightCode like concat('%', #{keyWords}, '%')
+                or swq.code like concat('%', #{keyWords}, '%')
+                or io_collect_led_group.mac like concat('%', #{keyWords}, '%'))
             </if>
         </where>
         GROUP BY swq.code

src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml

@@ -9,7 +9,9 @@
             <if test="mac != '' and mac != null">
                 AND io_collect_led_group.mac LIKE concat('%', #{mac}, '%')
             </if>
-            and sys_workplace_queue.mac is null
+            <if test="isBind == 1">
+                and sys_workplace_queue.mac is null
+            </if>
         </where>
     </select>
 </mapper>