|
@@ -99,13 +99,19 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
|
|
|
Map<String,String> map = new<String,String> HashMap();
|
|
|
|
|
|
List<TWorkpiece> list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getPointId,pointId));
|
|
|
- if(CollectionUtil.isEmpty(list)){
|
|
|
- return null;
|
|
|
+
|
|
|
+ TWorkpiece workpiece = new TWorkpiece();
|
|
|
+
|
|
|
+ if(!CollectionUtil.isEmpty(list)){
|
|
|
+ workpiece = list.get(0);
|
|
|
}
|
|
|
- TWorkpiece workpiece = list.get(0);
|
|
|
|
|
|
BeanUtil.copyProperties(workpiece, map);
|
|
|
|
|
|
+// if(CollectionUtil.isEmpty(list)){
|
|
|
+// return new HashMap();
|
|
|
+// }
|
|
|
+
|
|
|
|
|
|
//根据库位查询
|
|
|
|