From 7f5ab75bfd19b0785be7adb140fb347bc9949952 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 26 Sep 2023 17:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81Rfid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/controller/PDAController.java | 1 - .../op/mes/domain/dto/BaseEquipmentDto.java | 18 ++++++++++++++++++ .../op/mes/service/impl/PDAServiceImpl.java | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java index cc7af8dc..ce17272e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java @@ -51,7 +51,6 @@ public class PDAController extends BaseController { if(StringUtils.isBlank(baseEquipmentDto.getEquipmentCode())){ return error("[equipmentCode]不能为空"); } - return toAjax(pdaService.saveRfidWithEquip(baseEquipmentDto)); } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java index dd3cda1e..ee887036 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java @@ -20,9 +20,11 @@ public class BaseEquipmentDto extends BaseEntity { /** 设备类型编码 */ @Excel(name = "设备类型编码") private String equipmentCode; + private String nextMachineCode; private String recordId; private String rfidNo; + private String rfid; /** 设备类型名称 */ @Excel(name = "设备类型名称") @@ -149,6 +151,22 @@ public class BaseEquipmentDto extends BaseEntity { @Excel(name = "端口号") private String plcPort; + public String getNextMachineCode() { + return nextMachineCode; + } + + public void setNextMachineCode(String nextMachineCode) { + this.nextMachineCode = nextMachineCode; + } + + public String getRfid() { + return rfid; + } + + public void setRfid(String rfid) { + this.rfid = rfid; + } + public String getRfidNo() { return rfidNo; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java index 71a4e331..baa43e53 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java @@ -48,6 +48,8 @@ public class PDAServiceImpl implements PDAService { baseEquipmentDto.setRecordId(IdUtils.fastSimpleUUID()); baseEquipmentDto.setCreateBy(SecurityUtils.getUsername()); baseEquipmentDto.setCreateTime(DateUtils.getNowDate()); + baseEquipmentDto.setRfid(baseEquipmentDto.getRfidNo()); + baseEquipmentDto.setNextMachineCode(baseEquipmentDto.getEquipmentCode()); return mesMapper.saveRfidWithEquip(baseEquipmentDto); }