Skip to content

D
device-back
提交 69a908b9 authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

feat(装备模块): 修改装备库房位置为0

修改装备库房位置为0
上级 bfb6c8f3
隐藏空白字符变更
内嵌 并排
正在显示 包含 161 行增加 和 132 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 69a908b9
...@@ -502,7 +502,7 @@ public class AllotBillController { ...@@ -502,7 +502,7 @@ public class AllotBillController {
deviceLibraryEntity.setLifeStatus(2); deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName()); deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setManageStatus(1); deviceLibraryEntity.setManageStatus(1);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
deviceIds.add(id); deviceIds.add(id);
//如果接收时填写了生产号 //如果接收时填写了生产号
...@@ -531,7 +531,7 @@ public class AllotBillController { ...@@ -531,7 +531,7 @@ public class AllotBillController {
//存装备日志 //存装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList, taskBto.getId(), taskBto.getId()); DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList, taskBto.getId(), taskBto.getId());
deviceLogService.addLog(deviceLogDto); deviceLogService.addLog(deviceLogDto);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
deviceLibraryService.update(deviceLibraryEntity); deviceLibraryService.update(deviceLibraryEntity);
deviceIds.add(id); deviceIds.add(id);
...@@ -891,7 +891,7 @@ public class AllotBillController { ...@@ -891,7 +891,7 @@ public class AllotBillController {
deviceLibrary.setLifeStatus(2); deviceLibrary.setLifeStatus(2);
deviceLibrary.setOwnUnit(allotBill.getReceiveUnit()); deviceLibrary.setOwnUnit(allotBill.getReceiveUnit());
deviceLibrary.setManageStatus(1); deviceLibrary.setManageStatus(1);
deviceLibrary.setStorageLocationId(null); deviceLibrary.setStorageLocationId(0);
deviceLibrary.setStorageLocation(null); deviceLibrary.setStorageLocation(null);
deviceLibraryService.update(deviceLibrary); deviceLibraryService.update(deviceLibrary);
}); });
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 69a908b9
...@@ -323,7 +323,7 @@ public class BackController { ...@@ -323,7 +323,7 @@ public class BackController {
deviceLibraryEntity.setLifeStatus(2); deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName()); deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setManageStatus(1); deviceLibraryEntity.setManageStatus(1);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
//判断是签字入库还是签章入库 //判断是签字入库还是签章入库
DeviceLogDto deviceLogDto = new DeviceLogDto(); DeviceLogDto deviceLogDto = new DeviceLogDto();
...@@ -345,7 +345,7 @@ public class BackController { ...@@ -345,7 +345,7 @@ public class BackController {
//改变装备状态 //改变装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id); DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(11); deviceLibraryEntity.setLifeStatus(11);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
//存装备日志 //存装备日志
// DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList,taskBto.getId(),null); // DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList,taskBto.getId(),null);
...@@ -523,7 +523,7 @@ public class BackController { ...@@ -523,7 +523,7 @@ public class BackController {
deviceLibrary.setLifeStatus(2); deviceLibrary.setLifeStatus(2);
deviceLibrary.setOwnUnit(allotBackBill.getReceiveUnit()); deviceLibrary.setOwnUnit(allotBackBill.getReceiveUnit());
deviceLibrary.setManageStatus(1); deviceLibrary.setManageStatus(1);
deviceLibrary.setStorageLocationId(null); deviceLibrary.setStorageLocationId(0);
deviceLibrary.setStorageLocation(null); deviceLibrary.setStorageLocation(null);
deviceLibraryService.update(deviceLibrary); deviceLibraryService.update(deviceLibrary);
}); });
......
dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java
浏览文件 @ 69a908b9
...@@ -14,6 +14,7 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition; ...@@ -14,6 +14,7 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
import com.tykj.dev.device.library.subject.domin.DeviceLog; import com.tykj.dev.device.library.subject.domin.DeviceLog;
import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo; import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
import com.tykj.dev.device.library.subject.vo.*; import com.tykj.dev.device.library.subject.vo.*;
import com.tykj.dev.device.user.cache.StoreCache;
import com.tykj.dev.device.user.cache.UnitsCache; import com.tykj.dev.device.user.cache.UnitsCache;
import com.tykj.dev.device.user.subject.entity.Units; import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.service.UnitStoreLocationService; import com.tykj.dev.device.user.subject.service.UnitStoreLocationService;
...@@ -91,6 +92,9 @@ public class DeviceLibraryController { ...@@ -91,6 +92,9 @@ public class DeviceLibraryController {
@Autowired @Autowired
private UnitsService unitsService; private UnitsService unitsService;
@Resource
private StoreCache storeCache;
// @Resource // @Resource
// private DeviceLibraryPositionService deviceLibraryPositionService; // private DeviceLibraryPositionService deviceLibraryPositionService;
...@@ -523,7 +527,8 @@ public class DeviceLibraryController { ...@@ -523,7 +527,8 @@ public class DeviceLibraryController {
Map<Integer,String> matchingRangeMap = configCache.getMatchingRangeMap(); Map<Integer,String> matchingRangeMap = configCache.getMatchingRangeMap();
//形态 //形态
Map<Integer, String> styleMap = configCache.getStyleMap(); Map<Integer, String> styleMap = configCache.getStyleMap();
//库房
Map<Integer, String> idMap = storeCache.getIdMap();
Set<Integer> status = new HashSet<>(); Set<Integer> status = new HashSet<>();
List<String> models = new ArrayList<>(); List<String> models = new ArrayList<>();
//排序 //排序
...@@ -533,7 +538,7 @@ public class DeviceLibraryController { ...@@ -533,7 +538,7 @@ public class DeviceLibraryController {
Set<Integer> matchingRanges = new HashSet<>(); Set<Integer> matchingRanges = new HashSet<>();
//添加装备形态 //添加装备形态
Set<Integer> types = new HashSet<>(); Set<Integer> types = new HashSet<>();
Set<String> storageLocation = new HashSet<>(); Set<Integer> storageLocationIds = new HashSet<>();
resultList.forEach(deviceVo -> { resultList.forEach(deviceVo -> {
// deviceVo.setConfigName(); // deviceVo.setConfigName();
status.add(deviceVo.getLifeStatus()); status.add(deviceVo.getLifeStatus());
...@@ -544,7 +549,8 @@ public class DeviceLibraryController { ...@@ -544,7 +549,8 @@ public class DeviceLibraryController {
matchingRanges.add(deviceVo.getMatchingRange()); matchingRanges.add(deviceVo.getMatchingRange());
//添加形态 //添加形态
types.add(deviceVo.getType()); types.add(deviceVo.getType());
storageLocation.add(deviceVo.getStorageLocation()); // storageLocation.add(deviceVo.getStorageLocation());
storageLocationIds.add(deviceVo.getStorageLocationId());
}); });
List<String> finalModels = models.stream().distinct().collect(Collectors.toList()); List<String> finalModels = models.stream().distinct().collect(Collectors.toList());
List<String> modelToSort = DeviceModelSort.modelToSort(finalModels); List<String> modelToSort = DeviceModelSort.modelToSort(finalModels);
...@@ -560,7 +566,8 @@ public class DeviceLibraryController { ...@@ -560,7 +566,8 @@ public class DeviceLibraryController {
Page<DeviceLibrary> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), containList, deviceLibrarySelectVo.getPageable()); Page<DeviceLibrary> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), containList, deviceLibrarySelectVo.getPageable());
map.put("pages",deviceLibraryEntities); map.put("pages",deviceLibraryEntities);
map.put("types",types.stream().map(integer -> new TypeVo(integer,styleMap.get(integer))).collect(Collectors.toList())); map.put("types",types.stream().map(integer -> new TypeVo(integer,styleMap.get(integer))).collect(Collectors.toList()));
map.put("storageLocation",storageLocation); map.put("storageLocation",storageLocationIds.stream().map(integer -> new StorageLocationVo(integer,idMap.getOrDefault(integer,null)))
.collect(Collectors.toList()));
return ResultUtil.success(map); return ResultUtil.success(map);
} }
......
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @ 69a908b9
...@@ -1304,16 +1304,16 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -1304,16 +1304,16 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo(); DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
BeanUtils.copyProperties(queryTheWarehouseVo,deviceLibrarySelectVo); BeanUtils.copyProperties(queryTheWarehouseVo,deviceLibrarySelectVo);
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo); PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
Specification<DeviceLibrary> or = null; // Specification<DeviceLibrary> or = null;
if (deviceLibrarySelectVo.getNonStorageLocationId()!=null){ // if (deviceLibrarySelectVo.getNonStorageLocationId()!=null){
//
or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo).build()); // or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo).build());
}else { // }else {
or = predicateBuilder.build(); // or = predicateBuilder.build();
} // }
StopWatch stopWatch = new StopWatch("条件查询结果集"); StopWatch stopWatch = new StopWatch("条件查询结果集");
stopWatch.start(); stopWatch.start();
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(or); List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
//报废 退役 销毁 //报废 退役 销毁
List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12)); List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList()); deviceLibraries = deviceLibraries.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
...@@ -1340,17 +1340,6 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -1340,17 +1340,6 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
allVO.setDeviceLibrary(deviceLibrary); allVO.setDeviceLibrary(deviceLibrary);
DeviceLibraryPosition deviceLibraryPosition = positionMap.getOrDefault(deviceLibrary.getId(),null); DeviceLibraryPosition deviceLibraryPosition = positionMap.getOrDefault(deviceLibrary.getId(),null);
if (deviceLibraryPosition != null){ if (deviceLibraryPosition != null){
//转换数据
// if (deviceLibraryPosition.getDeviceLibraryPositionMessage() != null){
// deviceLibraryPosition.setDeviceLibraryPositionMessageVo(
// JacksonUtil.readValue(deviceLibraryPosition.getDeviceLibraryPositionMessage(),
// new com.fasterxml.jackson.core.type.TypeReference<DeviceLibraryPositionMessageVo>() {}));
// }
// if (deviceLibraryPosition.getRotation() !=null){
// deviceLibraryPosition.setRotationVo(
// JacksonUtil.readValue(deviceLibraryPosition.getRotation(),
// new com.fasterxml.jackson.core.type.TypeReference<RotationVo>() {}));
// }
toJson(deviceLibraryPosition); toJson(deviceLibraryPosition);
} }
allVO.setDeviceLibraryPosition(deviceLibraryPosition); allVO.setDeviceLibraryPosition(deviceLibraryPosition);
...@@ -1563,104 +1552,109 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -1563,104 +1552,109 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
//新增装备的形态 //新增装备的形态
predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType()); predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber()); predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber());
List<Integer> storageLocationIds = deviceLibrarySelectVo.getStorageLocationIds();
predicateBuilder.ne(deviceLibrarySelectVo.getNonStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getNonStorageLocationId()); if (storageLocationIds != null && storageLocationIds.size()>0){
} predicateBuilder.in("storageLocationId",
return predicateBuilder; deviceLibrarySelectVo.getStorageLocationIds().toArray(new Integer[]{}));
}
/**
* 查询库房id为null 取反
* @param deviceLibrarySelectVo deviceLibrarySelectVo
* @return PredicateBuilder
*/
private PredicateBuilder<DeviceLibrary> getPredicateBuilder2(DeviceLibrarySelectVo deviceLibrarySelectVo) {
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
if (deviceLibrarySelectVo != null) {
List<Integer> lifeStatus = deviceLibrarySelectVo.getLifeStatus();
if (deviceLibrarySelectVo.getModel() != null) {
predicateBuilder.eq("model", deviceLibrarySelectVo.getModel());
}
if (deviceLibrarySelectVo.getName() != null) {
predicateBuilder.eq("name", deviceLibrarySelectVo.getName());
}
if (deviceLibrarySelectVo.getSecretLevel() != null) {
predicateBuilder.eq("secretLevel", deviceLibrarySelectVo.getSecretLevel());
}
if (deviceLibrarySelectVo.getMatchingRange() != null) {
predicateBuilder.eq("matchingRange", deviceLibrarySelectVo.getMatchingRange());
}
if (deviceLibrarySelectVo.getStorageType() != null) {
predicateBuilder.eq("storageType", deviceLibrarySelectVo.getStorageType());
}
if (deviceLibrarySelectVo.getManageStatus() != null) {
predicateBuilder.eq("manageStatus", deviceLibrarySelectVo.getManageStatus());
}
if (lifeStatus != null && lifeStatus.size()>0) {
predicateBuilder.in("lifeStatus", lifeStatus.toArray(new Integer[]{}));
}
if (deviceLibrarySelectVo.getType() != null) {
predicateBuilder.eq("type", deviceLibrarySelectVo.getType());
}
if (deviceLibrarySelectVo.getInvisibleRange() != null) {
predicateBuilder.eq("invisibleRange", deviceLibrarySelectVo.getInvisibleRange());
}
if (deviceLibrarySelectVo.getLocationUnit() != null) {
predicateBuilder.eq("locationUnit", deviceLibrarySelectVo.getLocationUnit());
}
if (deviceLibrarySelectVo.getOwnUnit() != null) {
predicateBuilder.eq("ownUnit", deviceLibrarySelectVo.getOwnUnit());
}
if (deviceLibrarySelectVo.getRfidCardId() != null) {
predicateBuilder.like("rfidCardId", deviceLibrarySelectVo.getRfidCardId());
}
if (deviceLibrarySelectVo.getPackingId() != null) {
predicateBuilder.eq("packingId", deviceLibrarySelectVo.getPackingId());
}
if (deviceLibrarySelectVo.getIsPart() != null) {
predicateBuilder.eq("isPart", deviceLibrarySelectVo.getIsPart());
}
if (deviceLibrarySelectVo.getIsPrint()!=null){
if (deviceLibrarySelectVo.getIsPrint()==1){
predicateBuilder.notIn("rfidCardId", "");
}
else if (deviceLibrarySelectVo.getIsPrint()==0){
predicateBuilder.in("rfidCardId", null,"");
}
}
if (deviceLibrarySelectVo.getContent() != null) {
Class<DeviceLibrary> deviceLibraryEntity = DeviceLibrary.class;
Field[] declaredFields = deviceLibraryEntity.getDeclaredFields();
PredicateBuilder<DeviceLibrary> p = Specifications.or();
for (Field field : declaredFields) {
if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
p.like(field.getName(), "%" + deviceLibrarySelectVo.getContent() + "%");
}
}
predicateBuilder.predicate(p.build());
}
if (deviceLibrarySelectVo.getStartTime() != null) {
predicateBuilder.gt("createTime", deviceLibrarySelectVo.getStartTime());
}
if (deviceLibrarySelectVo.getEndTime() != null) {
predicateBuilder.lt("updateTime", deviceLibrarySelectVo.getEndTime());
} }
if (deviceLibrarySelectVo.getSeqInterval()!=null&&DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()).size()>0){
predicateBuilder.in("seqNumber", DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()));
}
predicateBuilder.like(deviceLibrarySelectVo.getRfidCardId() != null,"rfidCardId",
"%"+deviceLibrarySelectVo.getRfidCardId()+"%");
//新增库房位置
predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getStorageLocationId());
predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber());
//新增装备的形态 // predicateBuilder.ne(deviceLibrarySelectVo.getNonStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getNonStorageLocationId());
predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
predicateBuilder.eq(deviceLibrarySelectVo.getNonStorageLocationId() != null, "storageLocationId",null);
} }
return predicateBuilder; return predicateBuilder;
} }
// /**
// * 查询库房id为null 取反
// * @param deviceLibrarySelectVo deviceLibrarySelectVo
// * @return PredicateBuilder
// */
// private PredicateBuilder<DeviceLibrary> getPredicateBuilder2(DeviceLibrarySelectVo deviceLibrarySelectVo) {
// PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
// if (deviceLibrarySelectVo != null) {
// List<Integer> lifeStatus = deviceLibrarySelectVo.getLifeStatus();
// if (deviceLibrarySelectVo.getModel() != null) {
// predicateBuilder.eq("model", deviceLibrarySelectVo.getModel());
// }
// if (deviceLibrarySelectVo.getName() != null) {
// predicateBuilder.eq("name", deviceLibrarySelectVo.getName());
// }
// if (deviceLibrarySelectVo.getSecretLevel() != null) {
// predicateBuilder.eq("secretLevel", deviceLibrarySelectVo.getSecretLevel());
// }
// if (deviceLibrarySelectVo.getMatchingRange() != null) {
// predicateBuilder.eq("matchingRange", deviceLibrarySelectVo.getMatchingRange());
// }
// if (deviceLibrarySelectVo.getStorageType() != null) {
// predicateBuilder.eq("storageType", deviceLibrarySelectVo.getStorageType());
// }
// if (deviceLibrarySelectVo.getManageStatus() != null) {
// predicateBuilder.eq("manageStatus", deviceLibrarySelectVo.getManageStatus());
// }
// if (lifeStatus != null && lifeStatus.size()>0) {
// predicateBuilder.in("lifeStatus", lifeStatus.toArray(new Integer[]{}));
// }
// if (deviceLibrarySelectVo.getType() != null) {
// predicateBuilder.eq("type", deviceLibrarySelectVo.getType());
// }
// if (deviceLibrarySelectVo.getInvisibleRange() != null) {
// predicateBuilder.eq("invisibleRange", deviceLibrarySelectVo.getInvisibleRange());
// }
// if (deviceLibrarySelectVo.getLocationUnit() != null) {
// predicateBuilder.eq("locationUnit", deviceLibrarySelectVo.getLocationUnit());
// }
// if (deviceLibrarySelectVo.getOwnUnit() != null) {
// predicateBuilder.eq("ownUnit", deviceLibrarySelectVo.getOwnUnit());
// }
// if (deviceLibrarySelectVo.getRfidCardId() != null) {
// predicateBuilder.like("rfidCardId", deviceLibrarySelectVo.getRfidCardId());
// }
// if (deviceLibrarySelectVo.getPackingId() != null) {
// predicateBuilder.eq("packingId", deviceLibrarySelectVo.getPackingId());
// }
// if (deviceLibrarySelectVo.getIsPart() != null) {
// predicateBuilder.eq("isPart", deviceLibrarySelectVo.getIsPart());
// }
// if (deviceLibrarySelectVo.getIsPrint()!=null){
// if (deviceLibrarySelectVo.getIsPrint()==1){
// predicateBuilder.notIn("rfidCardId", "");
// }
// else if (deviceLibrarySelectVo.getIsPrint()==0){
// predicateBuilder.in("rfidCardId", null,"");
// }
// }
// if (deviceLibrarySelectVo.getContent() != null) {
// Class<DeviceLibrary> deviceLibraryEntity = DeviceLibrary.class;
// Field[] declaredFields = deviceLibraryEntity.getDeclaredFields();
// PredicateBuilder<DeviceLibrary> p = Specifications.or();
// for (Field field : declaredFields) {
// if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
// p.like(field.getName(), "%" + deviceLibrarySelectVo.getContent() + "%");
// }
// }
// predicateBuilder.predicate(p.build());
// }
// if (deviceLibrarySelectVo.getStartTime() != null) {
// predicateBuilder.gt("createTime", deviceLibrarySelectVo.getStartTime());
// }
// if (deviceLibrarySelectVo.getEndTime() != null) {
// predicateBuilder.lt("updateTime", deviceLibrarySelectVo.getEndTime());
// }
// if (deviceLibrarySelectVo.getSeqInterval()!=null&&DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()).size()>0){
// predicateBuilder.in("seqNumber", DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()));
// }
// predicateBuilder.like(deviceLibrarySelectVo.getRfidCardId() != null,"rfidCardId",
// "%"+deviceLibrarySelectVo.getRfidCardId()+"%");
// //新增库房位置
// predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getStorageLocationId());
// predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber());
//
// //新增装备的形态
// predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
// predicateBuilder.eq(deviceLibrarySelectVo.getNonStorageLocationId() != null, "storageLocationId",null);
// }
// return predicateBuilder;
// }
private List<String> getAllModel() { private List<String> getAllModel() {
List<DeviceLibrary> list = deviceLibraryDao.findAll(); List<DeviceLibrary> list = deviceLibraryDao.findAll();
Set<String> s = new HashSet<>(); Set<String> s = new HashSet<>();
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/model/vo/QueryTheWarehouseVo.java
浏览文件 @ 69a908b9
...@@ -37,6 +37,9 @@ public class QueryTheWarehouseVo extends CustomPage { ...@@ -37,6 +37,9 @@ public class QueryTheWarehouseVo extends CustomPage {
@ApiModelProperty(value = "出库") @ApiModelProperty(value = "出库")
private Integer out; private Integer out;
@ApiModelProperty(value = "库房id") // @ApiModelProperty(value = "库房id")
private Integer nonStorageLocationId; // private Integer nonStorageLocationId;
@ApiModelProperty(value = "库房id的集合")
private List<Integer> StorageLocationIds;
} }
dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibrarySelectVo.java
浏览文件 @ 69a908b9
...@@ -141,8 +141,8 @@ public class DeviceLibrarySelectVo extends CustomPage { ...@@ -141,8 +141,8 @@ public class DeviceLibrarySelectVo extends CustomPage {
@ApiModelProperty(value = "库房ids") @ApiModelProperty(value = "库房ids")
private List<Integer> storageLocationIds; private List<Integer> storageLocationIds;
@ApiModelProperty(value = "库房id") // @ApiModelProperty(value = "库房id")
private Integer nonStorageLocationId; // private Integer nonStorageLocationId;
@ApiModelProperty(value = "装备序列号", example = "123-1") @ApiModelProperty(value = "装备序列号", example = "123-1")
public String seqNumber; public String seqNumber;
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/StorageLocationVo.java 0 → 100644
浏览文件 @ 69a908b9
package com.tykj.dev.device.library.subject.vo;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("库房位置的vo")
public class StorageLocationVo {
@ApiModelProperty(value = "id")
private Integer storageLocationId;
@ApiModelProperty(value = "名称")
private String storageLocation;
}
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 69a908b9
...@@ -597,7 +597,7 @@ public class RepairController { ...@@ -597,7 +597,7 @@ public class RepairController {
if (level == 1) { if (level == 1) {
deviceLibraryEntity.setLifeStatus(4); deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setLocationUnit(repairBillSaveVo.getReceiveUnit()); deviceLibraryEntity.setLocationUnit(repairBillSaveVo.getReceiveUnit());
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
} else { } else {
deviceLibraryEntity.setLifeStatus(4); deviceLibraryEntity.setLifeStatus(4);
...@@ -780,7 +780,7 @@ public class RepairController { ...@@ -780,7 +780,7 @@ public class RepairController {
deviceLibraryEntity.setLifeStatus(4); deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setLocationUnit(repairBill.getReceiveUnit()); deviceLibraryEntity.setLocationUnit(repairBill.getReceiveUnit());
deviceLibraryEntity.setManageStatus(1); deviceLibraryEntity.setManageStatus(1);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
//存装备日志 //存装备日志
// DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId()); // DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId());
...@@ -798,7 +798,7 @@ public class RepairController { ...@@ -798,7 +798,7 @@ public class RepairController {
//改变装备状态 //改变装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id); DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(11); deviceLibraryEntity.setLifeStatus(11);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
//存装备日志 //存装备日志
// DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList, taskBto.getId()); // DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收入库丢失", fileVoList, taskBto.getId());
...@@ -1358,7 +1358,7 @@ public class RepairController { ...@@ -1358,7 +1358,7 @@ public class RepairController {
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id); DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLocationUnit(repairBackBill.getReceiveUnit()); deviceLibraryEntity.setLocationUnit(repairBackBill.getReceiveUnit());
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
//如果所属和所在一致，状态改为在库 //如果所属和所在一致，状态改为在库
if (deviceLibraryEntity.getOwnUnit().equals(deviceLibraryEntity.getLocationUnit())) { if (deviceLibraryEntity.getOwnUnit().equals(deviceLibraryEntity.getLocationUnit())) {
deviceLibraryEntity.setLifeStatus(2); deviceLibraryEntity.setLifeStatus(2);
...@@ -2367,7 +2367,7 @@ public class RepairController { ...@@ -2367,7 +2367,7 @@ public class RepairController {
deviceLogService.addLog(deviceLogDto); deviceLogService.addLog(deviceLogDto);
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(integer); DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(integer);
deviceLibraryEntity.setLocationUnit(repairBackBill.getReceiveUnit()); deviceLibraryEntity.setLocationUnit(repairBackBill.getReceiveUnit());
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
if (deviceLibraryEntity.getOwnUnit().equals(repairBackBill.getReceiveUnit())){ if (deviceLibraryEntity.getOwnUnit().equals(repairBackBill.getReceiveUnit())){
...@@ -2508,7 +2508,7 @@ public class RepairController { ...@@ -2508,7 +2508,7 @@ public class RepairController {
deviceLibraryEntity.setManageStatus(1); deviceLibraryEntity.setManageStatus(1);
//设置为空 //设置为空
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
deviceLibraryService.update(deviceLibraryEntity); deviceLibraryService.update(deviceLibraryEntity);
// DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传维修单", fileVoList, taskBto.getId()); // DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传维修单", fileVoList, taskBto.getId());
DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传维修单", fileVoList, taskBto.getId(),taskBto.getId()); DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传维修单", fileVoList, taskBto.getId(),taskBto.getId());
...@@ -3059,7 +3059,7 @@ public class RepairController { ...@@ -3059,7 +3059,7 @@ public class RepairController {
deviceLibraryEntity.setLifeStatus(4); deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setLocationUnit(repairBillSaveVo.getReceiveUnit()); deviceLibraryEntity.setLocationUnit(repairBillSaveVo.getReceiveUnit());
deviceLibraryEntity.setStorageLocation(null); deviceLibraryEntity.setStorageLocation(null);
deviceLibraryEntity.setStorageLocationId(null); deviceLibraryEntity.setStorageLocationId(0);
} }
deviceLibraryEntity.setManageStatus(0); deviceLibraryEntity.setManageStatus(0);
deviceLibraryService.update(deviceLibraryEntity); deviceLibraryService.update(deviceLibraryEntity);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论