手持Rfid

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));
     }
 }

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;
 	}

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);
     }