Commit f4ffbf32b6a95ce09467bbd9ba235faf7020f37a

Authored by 芯火源
1 parent 46362264

fix(DEFECT-1228): 编辑时切换功能码异常问题修复

寄存器数量为空时,默认值为1
... ... @@ -307,15 +307,16 @@ public class TkDeviceScriptServiceImpl
307 307 result.append(addrStr.substring(addrStr.length()-4));
308 308
309 309 List<Integer> values = config.getRegisterVales();
  310 + Integer registerNum = config.getRegisterNum()==null?1:config.getRegisterNum();
310 311 if(values ==null || values.isEmpty()){
311 312 //读寄存器数据
312   - result.append(modelHex(config.getRegisterNum()));
  313 + result.append(modelHex(registerNum));
313 314 }else if(values.size() == 1){
314 315 //单个写入
315 316 result.append(modelHex(values.get(0)));
316 317 }else{
317 318 //多个写入
318   - result.append(modelHex(config.getRegisterNum()));
  319 + result.append(modelHex(registerNum));
319 320 result.append(multData(functionCode,values));
320 321 }
321 322 result.append(CrcUtils.getSendBuf(config.getCrc(),result.toString()));
... ...