From 76c6d5ed71c6ea1ce37ff645c07d4a8fe61af58b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 31 Dec 2024 11:14:59 +0800 Subject: [PATCH] =?UTF-8?q?12/31=20=E7=81=AF=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceQueueController.java | 33 +++++++++++++++++++ .../collect/IoCollectLedGroupController.java | 6 +--- .../dao/basic/SysWorkplaceQueueMapper.java | 2 ++ .../api/entity/basic/SysWorkplaceQueue.java | 7 ++++ .../req/basic/SysWorkplaceQueueRequest.java | 2 ++ .../basic/SysWorkplaceQueueService.java | 6 ++++ .../mapper/basic/SysWorkplaceQueueMapper.xml | 11 +++++-- .../collect/IoCollectLedGroupMapper.xml | 5 +-- src/main/resources/schemas/schema_v2.4.sql | 4 +++ 9 files changed, 67 insertions(+), 9 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 1d107944d..f302bcc5e 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java +++ b/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().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().eq(SysWorkplaceQueue::getMac, sysWorkplaceQueue.getMac())); + if (queue != null){ + //提示已经被绑定是否需要更改到当前槽位 + return ResultVOUtils.error(503,"该灯组已绑定在" + queue.getCode() + "槽位"); + } + //绑定 + sysWorkplaceQueueService.updateById(sysWorkplaceQueue); + return ResultVOUtils.success("绑定成功"); + } } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java index 188799ba5..7816f429a 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java +++ b/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(); - } + // /** // * 取货确认 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 c1cd5d708..a5380338e 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java @@ -24,4 +24,6 @@ public interface SysWorkplaceQueueMapper extends BaseMapper { SysWorkplaceQueue selectByLayerCode(String layerCode); void updateByRelId(SysWorkplaceQueueRequest request); + void removeQueueMac(SysWorkplaceQueueRequest request); + } diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java index f2f4c2056..6bf6f9b53 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java +++ b/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; + diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java index 136887635..1fd723ab6 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java +++ b/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; + 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 d1fb4fcf0..88a000a70 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java @@ -216,4 +216,10 @@ public class SysWorkplaceQueueService extends ServiceImpl().eq(SysWorkplaceQueue::getCode, request.getCode()).eq(SysWorkplaceQueue::getMac, request.getMac())); + sysWorkplaceQueue.setMac(null); + sysWorkplaceQueueMapper.removeQueueMac(request); + } } diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml index 46eae980c..5b832b718 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml +++ b/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 @@ WHERE code = #{code} + + + UPDATE sys_workplace_queue + + mac = null + + WHERE code = #{code} + diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml index fb1252d24..ec76c8663 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml @@ -4,11 +4,12 @@ diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 098b14288..4dd340d03 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/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);