|
|
@@ -456,7 +456,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
public ApiResult<Map<Object,Object>> barcode(String accessKey, String requestId, String data) {
|
|
|
String AE_MASTER = checkAccessKey(accessKey, requestId);
|
|
|
SpObserver.putSp(AE_MASTER);
|
|
|
- Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
|
|
|
+ Map<Object, Object> map = FlexJsonUtil.fromJson(data);
|
|
|
try {
|
|
|
if(!StringUtil.hasText(map.get("outno"))){
|
|
|
return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),requestId,"传参异常，出库单号不能为空！");
|
|
|
@@ -465,7 +465,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
if(!StringUtil.hasText(map.get("barlist"))){
|
|
|
return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),requestId,"传参操作类型:"+map.get("type")+"是写入，barlist 不允许为空");
|
|
|
}
|
|
|
- List<Map<Object,Object>> barlist = BaseUtil.parseGridStoreToMaps(map.get("barlist").toString());
|
|
|
+ List<Map<Object,Object>> barlist = (ArrayList)map.get("barlist");
|
|
|
List<Map<Object,Object>> datab = new ArrayList<>();
|
|
|
for(Map<Object,Object> mp : barlist){
|
|
|
Map<Object,Object> mapb = new HashMap<>();
|
