合并报表库存导出问题修改

src/main/java/com/neotel/smfcore/custom/lizhen/report/merge/ReportMergeController.java

@@ -96,26 +96,28 @@ public class ReportMergeController {
                     url = url + "/inner/report/inventory"+getQueryStr(queryCondition);
                     String result = HttpUtil.get(url);
                     PageData data = JSONObject.parseObject(result, PageData.class);
-                    if (data.getContent() != null && !data.getContent().isEmpty()) {
-                        List<StoragePosDto> storageDtoList = JSONArray.parseArray(JSONObject.toJSONString(data.getContent()), StoragePosDto.class);
-                        dtoList = storageDtoList.stream().map(item -> {
+                    List content = data.getContent();
+                    if ( content!= null && !content.isEmpty()) {
+                        String contentStr = JSONObject.toJSONString(data.getContent());
+                        List<JSONObject> contentList = JSONArray.parseArray(contentStr, JSONObject.class);
+                        dtoList = contentList.stream().map(item -> {
                             MergeInventoryDto dto = new MergeInventoryDto();
-                            dto.setStoragePosName(item.getPosName());
-                            BarcodeDto barcode = item.getBarcode();
+                            dto.setStoragePosName(item.getString("posName"));
+                            JSONObject barcode = item.getObject("barcode",JSONObject.class);
                             if (barcode != null) {
-                                dto.setPartNumber(barcode.getPartNumber());
+                                dto.setPartNumber(barcode.getString("partNumber"));
                                 dto.setReelCount(1);
-                                dto.setAmount(barcode.getAmount());
-                                dto.setProvider(barcode.getProvider());
-                                dto.setProviderNumber(barcode.getProviderNumber());
-                                dto.setBarcode(barcode.getBarcode());
-                                dto.setBatch(barcode.getBatch());
-                                dto.setDateCode(barcode.getDateCode());
-                                dto.setPutInDate(barcode.getPutInDate());
-                                dto.setFirstPutInDate(barcode.getFirstPutInDate());
-                                dto.setDisableMsg(barcode.getDisableMsg());
-                            }
-                            dto.setSource(item.getSource());
+                                dto.setAmount(barcode.getInteger("amount"));
+                                dto.setProvider(barcode.getString("provider"));
+                                dto.setProviderNumber(barcode.getString("providerNumber"));
+                                dto.setBarcode(barcode.getString("barcode"));
+                                dto.setBatch(barcode.getString("batch"));
+                                dto.setDateCode(barcode.getString("dateCode"));
+                                dto.setPutInDate(barcode.getDate("putInDate"));
+                                dto.setFirstPutInDate(barcode.getDate("firstPutInDate"));
+                                dto.setDisableMsg(barcode.getString("disableMsg"));
+                            }
+                            dto.setSource(item.getString("source"));
                             dto.setFloor(floor);
                             dto.setFactory("A5");
                             dto.setPlant("W337");