提交 ec365bb2 authored 作者: zhoushaopan's avatar zhoushaopan

fix(盘存模块): 过滤其他的标签

过滤其他的标签
上级 2b70f401
...@@ -192,6 +192,8 @@ public class ReadMachineBillController { ...@@ -192,6 +192,8 @@ public class ReadMachineBillController {
while (localFlag){ while (localFlag){
//开始盘存 //开始盘存
List<String> rfids = readUtils.testinventory1(); List<String> rfids = readUtils.testinventory1();
//自己过滤
rfids = rfids.stream().filter(s -> !s.startsWith("E280")).collect(Collectors.toList());
log.info("rfid's:{}",rfids); log.info("rfid's:{}",rfids);
RFIDS.clear(); RFIDS.clear();
RFIDS.addAll(rfids); RFIDS.addAll(rfids);
......
...@@ -107,7 +107,7 @@ public class WarehouseInspectionServiceImpl implements WarehouseInspectionServic ...@@ -107,7 +107,7 @@ public class WarehouseInspectionServiceImpl implements WarehouseInspectionServic
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and(); PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
// predicateBuilder.eq("ownUnit",currentUserUnitName); // predicateBuilder.eq("ownUnit",currentUserUnitName);
predicateBuilder.eq("locationUnit",currentUserUnitName); predicateBuilder.eq("locationUnit",currentUserUnitName);
List<Integer> statusList = new ArrayList<>(Arrays.asList(5,11,12)); List<Integer> statusList = new ArrayList<>(Arrays.asList(5,10,11,12));
List<DeviceLibrary> allDevices = deviceLibraryService.findAllDevices().stream() List<DeviceLibrary> allDevices = deviceLibraryService.findAllDevices().stream()
.filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(currentUserUnitName) .filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(currentUserUnitName)
&& !statusList.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList()); && !statusList.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
......
...@@ -456,8 +456,10 @@ public class ReadUtils { ...@@ -456,8 +456,10 @@ public class ReadUtils {
{ {
AntPower jaap=Jreader.new AntPower(); AntPower jaap=Jreader.new AntPower();
jaap.antid=i+1; jaap.antid=i+1;
jaap.readPower=2800; // jaap.readPower=2800;
jaap.writePower=2750; jaap.readPower=2000;
// jaap.writePower=2750;
jaap.writePower=1500;
apcf.Powers[i]=jaap; apcf.Powers[i]=jaap;
} }
AntPowerConf apcf2=Jreader.new AntPowerConf(); AntPowerConf apcf2=Jreader.new AntPowerConf();
...@@ -528,7 +530,9 @@ public class ReadUtils { ...@@ -528,7 +530,9 @@ public class ReadUtils {
//flen 0 为取消过滤 //flen 0 为取消过滤
tfst.flen=2; tfst.flen=2;
tfst.isInvert=0; tfst.isInvert=0;
tfst.startaddr=2; //修改起始地址
// tfst.startaddr=2;
tfst.startaddr=32;
TagFilter_ST tfst2=Jreader.new TagFilter_ST(); TagFilter_ST tfst2=Jreader.new TagFilter_ST();
er=Jreader.ParamSet(Mtr_Param.MTR_PARAM_TAG_FILTER, tfst); er=Jreader.ParamSet(Mtr_Param.MTR_PARAM_TAG_FILTER, tfst);
...@@ -609,7 +613,7 @@ public class ReadUtils { ...@@ -609,7 +613,7 @@ public class ReadUtils {
//测试gpio //测试gpio
//mt.testgpio(); //mt.testgpio();
//测试参数 //测试参数
//mt.testrparams(); mt.testrparams();
//测试块操作 //测试块操作
//mt.testblockop(); //mt.testblockop();
//测试特殊指令 //测试特殊指令
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论