手持Rfid

highway
A0010407 1 year ago
parent f283217265
commit 7f5ab75bfd

@ -51,7 +51,6 @@ public class PDAController extends BaseController {
if(StringUtils.isBlank(baseEquipmentDto.getEquipmentCode())){ if(StringUtils.isBlank(baseEquipmentDto.getEquipmentCode())){
return error("[equipmentCode]不能为空"); return error("[equipmentCode]不能为空");
} }
return toAjax(pdaService.saveRfidWithEquip(baseEquipmentDto)); return toAjax(pdaService.saveRfidWithEquip(baseEquipmentDto));
} }
} }

@ -20,9 +20,11 @@ public class BaseEquipmentDto extends BaseEntity {
/** 设备类型编码 */ /** 设备类型编码 */
@Excel(name = "设备类型编码") @Excel(name = "设备类型编码")
private String equipmentCode; private String equipmentCode;
private String nextMachineCode;
private String recordId; private String recordId;
private String rfidNo; private String rfidNo;
private String rfid;
/** 设备类型名称 */ /** 设备类型名称 */
@Excel(name = "设备类型名称") @Excel(name = "设备类型名称")
@ -149,6 +151,22 @@ public class BaseEquipmentDto extends BaseEntity {
@Excel(name = "端口号") @Excel(name = "端口号")
private String plcPort; 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() { public String getRfidNo() {
return rfidNo; return rfidNo;
} }

@ -48,6 +48,8 @@ public class PDAServiceImpl implements PDAService {
baseEquipmentDto.setRecordId(IdUtils.fastSimpleUUID()); baseEquipmentDto.setRecordId(IdUtils.fastSimpleUUID());
baseEquipmentDto.setCreateBy(SecurityUtils.getUsername()); baseEquipmentDto.setCreateBy(SecurityUtils.getUsername());
baseEquipmentDto.setCreateTime(DateUtils.getNowDate()); baseEquipmentDto.setCreateTime(DateUtils.getNowDate());
baseEquipmentDto.setRfid(baseEquipmentDto.getRfidNo());
baseEquipmentDto.setNextMachineCode(baseEquipmentDto.getEquipmentCode());
return mesMapper.saveRfidWithEquip(baseEquipmentDto); return mesMapper.saveRfidWithEquip(baseEquipmentDto);
} }

Loading…
Cancel
Save