|
|
@@ -2110,7 +2110,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(!StringUtil.hasText(map.get("detail")) ){
|
|
|
return ApiResponse.failRspResult("输入参数detail(镭雕条码后)不能为空");
|
|
|
}
|
|
|
- List<Map<Object, Object>> list = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
|
+ List<Map<Object, Object>> list = new ArrayList<>();
|
|
|
+ if(map.get("detail") instanceof ArrayList){
|
|
|
+ list = (ArrayList<Map<Object, Object>>) map.get("detail");
|
|
|
+ }else{
|
|
|
+ list = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
|
+ }
|
|
|
if(list.size() != (Integer) combineqty){
|
|
|
return ApiResponse.failRspResult("条码数量:"+list.size()+"与拼版数:"+combineqty+",不一致!");
|
|
|
}
|