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

fix(申请模块): 使用报废,退役,销毁 申请判断序列号是否对应的问题

使用报废,退役,销毁 申请判断序列号是否对应的问题
上级 f044e8ee
...@@ -493,14 +493,27 @@ public class PackingController { ...@@ -493,14 +493,27 @@ public class PackingController {
@ApiOperation(value = "判断序列号区间是否存在") @ApiOperation(value = "判断序列号区间是否存在")
@PostMapping("/seqsExist/{id}/{num}/{seq}") @PostMapping("/seqsExist/{id}/{num}/{seq}")
public ResponseEntity seqsExist(@PathVariable("id") int id,@PathVariable("num") int num,@PathVariable("seq") String seq){ public ResponseEntity seqsExist(@PathVariable("id") int id,@PathVariable("num") int num,@PathVariable("seq") String seq){
// List<DeviceLibrary> deviceLibraries = packingLibraryService.getAllDevSeqs(id); List<DeviceLibrary> deviceLibraries = packingLibraryService.getAllDevSeqs(id);
List<DeviceLibrary> deviceLibraries = deviceLibraryCacheService.getAllDeviceLibraryList(); // List<DeviceLibrary> deviceLibraries = deviceLibraryCacheService.getAllDeviceLibraryList();
List<String> existSeqs = deviceLibraries.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList()); List<String> existSeqs = deviceLibraries.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList());
//输入的区间序列号
List<String> inputSeqs = DeviceSeqUtil.selectDeviceSeqs(seq); List<String> inputSeqs = DeviceSeqUtil.selectDeviceSeqs(seq);
List<String> hasApplySeqs = deviceLibraries.stream() List<String> hasApplySeqs = deviceLibraries.stream()
.filter(deviceLibrary -> deviceLibrary.getApplyTaskId()!=null) .filter(deviceLibrary -> deviceLibrary.getApplyTaskId()!=null)
.map(DeviceLibrary::getSeqNumber) .map(DeviceLibrary::getSeqNumber)
.collect(Collectors.toList()); .collect(Collectors.toList());
//新增判断
if (!inputSeqs.isEmpty()){
for (String inputSeq : inputSeqs) {
if (!existSeqs.contains(inputSeq)){
return ResponseEntity.ok("序列号为"+inputSeq+"与型号不匹配");
}
if (deviceLibraryService.findBySeqNumber(inputSeq).getPackingId() != id){
return ResponseEntity.ok("序列号为"+inputSeq+"与型号不匹配");
}
}
}
if (inputSeqs.size()!=num){ if (inputSeqs.size()!=num){
return ResponseEntity.ok("序列号区间总数为"+inputSeqs.size()+",与装备数量不匹配"); return ResponseEntity.ok("序列号区间总数为"+inputSeqs.size()+",与装备数量不匹配");
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论