12/31 灯组修改

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

@@ -15,6 +15,7 @@ import com.glxp.api.entity.basic.SysWorkplaceLayer;
 import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
+import com.glxp.api.entity.collect.IoCollectLedGroup;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
@@ -287,5 +288,37 @@ public class SysWorkplaceQueueController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 绑定灯组
+     */
+    @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("绑定成功");
+    }
+
+    @PostMapping("/udiwms/sysWorkplaceQueue/removeLed")
+    public BaseResponse removeLed(@RequestBody SysWorkplaceQueueRequest request) {
+        //绑定
+        sysWorkplaceQueueService.removeLed(request);
+        return ResultVOUtils.success("解绑成功");
+    }
+
+
+    @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){
+            //提示已经被绑定是否需要更改到当前槽位
+            return ResultVOUtils.error(503,"该灯组已绑定在" + queue.getCode() + "槽位");
+        }
+        //绑定
+        sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
+        return ResultVOUtils.success("绑定成功");
+    }
 }
 

src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java

@@ -56,11 +56,7 @@ public class IoCollectLedGroupController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @PostMapping("/udiwms/basic/collect/ledGroup/binding")
-    public BaseResponse binding(@RequestBody IoCollectLedGroup ioCollectLedGroup) {
-        ioCollectLedGroupService.updateById(ioCollectLedGroup);
-        return ResultVOUtils.success();
-    }
+
 
 //    /**
 //     * 取货确认

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

@@ -24,4 +24,6 @@ public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
     SysWorkplaceQueue selectByLayerCode(String layerCode);
 
     void updateByRelId(SysWorkplaceQueueRequest request);
+    void removeQueueMac(SysWorkplaceQueueRequest request);
+
 }

src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java

@@ -119,6 +119,13 @@ public class SysWorkplaceQueue implements Serializable {
     @ApiModelProperty(value = "")
     private String relId;
 
+    /**
+     * 灯组标签
+     */
+    @TableField(value = "mac")
+    @ApiModelProperty(value = "")
+    private String mac;
+
 
 
 

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

@@ -50,6 +50,8 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
     private String cpmctymc;
 
 
+    private String mac;
+
 
 
 

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

@@ -216,4 +216,10 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
         sysWorkplaceLayerService.updateById(one);
         removeById(byId);
     }
+
+    public void removeLed(SysWorkplaceQueueRequest request) {
+        SysWorkplaceQueue sysWorkplaceQueue = sysWorkplaceQueueMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, request.getCode()).eq(SysWorkplaceQueue::getMac, request.getMac()));
+        sysWorkplaceQueue.setMac(null);
+        sysWorkplaceQueueMapper.removeQueueMac(request);
+    }
 }

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

@@ -41,8 +41,7 @@
         select swq.*,
                bp.nameCode,
                COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
-               bp.cpmctymc,sys_workplace.workplaceName,
-               io_collect_led_group.mac
+               bp.cpmctymc,sys_workplace.workplaceName
         from sys_workplace_queue swq
                  left join
              (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg
@@ -189,4 +188,12 @@
         </set>
         WHERE code = #{code}
     </update>
+
+    <update id="removeQueueMac">
+        UPDATE sys_workplace_queue
+        <set>
+            mac = null
+        </set>
+        WHERE code = #{code}
+    </update>
 </mapper>

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

@@ -4,11 +4,12 @@
     <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectLedGroupResponse">
         SELECT *
         from io_collect_led_group
+        left join sys_workplace_queue on sys_workplace_queue.mac = io_collect_led_group.mac
         <where>
             <if test="mac != '' and mac != null">
-                AND mac LIKE concat('%', #{mac}, '%')
+                AND io_collect_led_group.mac LIKE concat('%', #{mac}, '%')
             </if>
-             and relId is null
+            and sys_workplace_queue.mac is null
         </where>
     </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -5099,3 +5099,7 @@ CREATE TABLE IF NOT EXISTS `io_collect_led_group`
   COLLATE = utf8mb4_0900_ai_ci
   ROW_FORMAT = Dynamic;
 
+
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'mac',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''灯组标签''',
+                         1);