|
@@ -140,7 +140,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
if(param.getType() == 2){
|
|
if(param.getType() == 2){
|
|
ssSceneMap = laserService.list(sceneNumList);
|
|
ssSceneMap = laserService.list(sceneNumList);
|
|
}
|
|
}
|
|
- HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
|
|
|
|
+ //HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
|
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
for (SceneVo record : page.getRecords()) {
|
|
if(param.getType() == 2){
|
|
if(param.getType() == 2){
|
|
@@ -166,9 +166,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
record.setIsMain(false);
|
|
record.setIsMain(false);
|
|
record.setIsDel(false);
|
|
record.setIsDel(false);
|
|
}
|
|
}
|
|
- if(coldMap.get(record.getNum())!=null){
|
|
|
|
- record.setColdStorage(coldMap.get(record.getNum()));
|
|
|
|
- }
|
|
|
|
|
|
+// if(coldMap.get(record.getNum())!=null){
|
|
|
|
+// record.setColdStorage(coldMap.get(record.getNum()));
|
|
|
|
+// }
|
|
}
|
|
}
|
|
return PageInfo.PageInfo(page);
|
|
return PageInfo.PageInfo(page);
|
|
}
|
|
}
|