|  | @@ -1,6 +1,7 @@
 | 
											
												
													
														|  |  package com.steerinfo.dil.controller;
 |  |  package com.steerinfo.dil.controller;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import com.alibaba.druid.support.json.JSONUtils;
 |  |  import com.alibaba.druid.support.json.JSONUtils;
 | 
											
												
													
														|  | 
 |  | +import com.alibaba.fastjson.JSONObject;
 | 
											
												
													
														|  |  import com.steerinfo.dil.feign.BmstruckFeign;
 |  |  import com.steerinfo.dil.feign.BmstruckFeign;
 | 
											
												
													
														|  |  import com.steerinfo.dil.feign.ColumnDataFeign;
 |  |  import com.steerinfo.dil.feign.ColumnDataFeign;
 | 
											
												
													
														|  |  import com.steerinfo.dil.feign.ESFeign;
 |  |  import com.steerinfo.dil.feign.ESFeign;
 | 
											
										
											
												
													
														|  | @@ -1632,7 +1633,15 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
 | 
											
												
													
														|  |          int count = 0;
 |  |          int count = 0;
 | 
											
												
													
														|  |          String saleOrderNo = null;
 |  |          String saleOrderNo = null;
 | 
											
												
													
														|  |          System.out.println("------销售订单批量导入Excel导入-----" + new Date());
 |  |          System.out.println("------销售订单批量导入Excel导入-----" + new Date());
 | 
											
												
													
														|  | -        System.out.println(mapList);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        try {
 | 
											
												
													
														|  | 
 |  | +            Map<String, Object> logMap = new HashMap<>();
 | 
											
												
													
														|  | 
 |  | +            logMap.put("mapList",mapList);
 | 
											
												
													
														|  | 
 |  | +            JSONObject jsonObject = new JSONObject(logMap);
 | 
											
												
													
														|  | 
 |  | +            System.out.println(jsonObject);
 | 
											
												
													
														|  | 
 |  | +            //newFileTool.newFile(jsonObject.toString(),"物流批量导入-订单");
 | 
											
												
													
														|  | 
 |  | +        }catch (Exception e){
 | 
											
												
													
														|  | 
 |  | +            e.printStackTrace();
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  |          System.out.println("------销售订单批量导入Excel导入-----" + new Date());
 |  |          System.out.println("------销售订单批量导入Excel导入-----" + new Date());
 | 
											
												
													
														|  |          try {
 |  |          try {
 | 
											
												
													
														|  |              for (Map<String,Object> map:mapList
 |  |              for (Map<String,Object> map:mapList
 | 
											
										
											
												
													
														|  | @@ -1670,7 +1679,15 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
 | 
											
												
													
														|  |          int count = 0;
 |  |          int count = 0;
 | 
											
												
													
														|  |          String saleOrderNo = null;
 |  |          String saleOrderNo = null;
 | 
											
												
													
														|  |          System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
 |  |          System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
 | 
											
												
													
														|  | -        System.out.println(mapList);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        try {
 | 
											
												
													
														|  | 
 |  | +            Map<String, Object> logMap = new HashMap<>();
 | 
											
												
													
														|  | 
 |  | +            logMap.put("mapList",mapList);
 | 
											
												
													
														|  | 
 |  | +            JSONObject jsonObject = new JSONObject(logMap);
 | 
											
												
													
														|  | 
 |  | +            System.out.println(jsonObject);
 | 
											
												
													
														|  | 
 |  | +        }catch (Exception e){
 | 
											
												
													
														|  | 
 |  | +            e.printStackTrace();
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  | 
 |  | +        //System.out.println(jsonObject);
 | 
											
												
													
														|  |          System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
 |  |          System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
 | 
											
												
													
														|  |          try {
 |  |          try {
 | 
											
												
													
														|  |              for (Map<String,Object> map:mapList
 |  |              for (Map<String,Object> map:mapList
 |