|
|
@@ -499,6 +499,58 @@ public class SyPackingListFabricController {
|
|
|
return Result.OK("文件导入失败！");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 通过excel导入数据
|
|
|
+ *
|
|
|
+ * @param request
|
|
|
+ * @param response
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/importExcel2", method = RequestMethod.POST)
|
|
|
+ public Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
|
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
|
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
|
|
+ MultipartFile file = entity.getValue();// 获取上传文件对象
|
|
|
+ ImportParams params = new ImportParams();
|
|
|
+ //params.setTitleRows(1);//注释后就能读取数据了
|
|
|
+ //params.setHeadRows(1);
|
|
|
+ params.setNeedSave(true);
|
|
|
+ try {
|
|
|
+ List<SyPackingListFabricVo> list = ExcelImportUtil.importExcel(file.getInputStream(), SyPackingListFabricVo.class, params);
|
|
|
+ Map<String,SyPackingListFabric> maps=new HashMap<>();
|
|
|
+ for (SyPackingListFabricVo vo : list) {
|
|
|
+ SyPackingListFabricItem po =new SyPackingListFabricItem();
|
|
|
+ BeanUtils.copyProperties(vo,po);
|
|
|
+ if(!maps.containsKey(vo.getSyShippingDetailsId())){
|
|
|
+ SyPackingListFabric main =new SyPackingListFabric();
|
|
|
+ main.setGarmentFactory(vo.getTheGarmentFactory());//成衣工厂
|
|
|
+ main.setSyPackingListFabricItem(new ArrayList<>());
|
|
|
+ main.getSyPackingListFabricItem().add(po);
|
|
|
+ maps.put(vo.getSyShippingDetailsId(),main);
|
|
|
+ }else{
|
|
|
+ maps.get(vo.getSyShippingDetailsId()).getSyPackingListFabricItem().add(po);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String strs=syPackingListFabricService.excelTest(maps);
|
|
|
+ if(strs!=null){
|
|
|
+ return Result.OK(strs);
|
|
|
+ }
|
|
|
+ return Result.OK("文件导入成功！数据行数:" + list.size());
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error(e.getMessage(),e);
|
|
|
+ return Result.error("文件导入失败:"+e.getMessage());
|
|
|
+ } finally {
|
|
|
+ try {
|
|
|
+ file.getInputStream().close();
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return Result.OK("文件导入失败！");
|
|
|
+ }
|
|
|
+
|
|
|
@AutoLog(value = "手动同步辅料数据")
|
|
|
@ApiOperation(value="手动同步辅料数据", notes="手动同步辅料数据")
|
|
|
@GetMapping(value = "/getU8Data")
|
|
|
@@ -510,7 +562,7 @@ public class SyPackingListFabricController {
|
|
|
@AutoLog(value = "装箱单面辅料JSON")
|
|
|
@ApiOperation(value="装箱单面辅料JSON", notes="装箱单面辅料JSON")
|
|
|
@GetMapping(value = "/pushSplt")
|
|
|
- public JSONObject pushSplt(String id) {
|
|
|
+ public List pushSplt(String id) {
|
|
|
List list=new ArrayList();
|
|
|
SyPackingListFabric syPackingListFabric= syPackingListFabricService.getById(id);
|
|
|
QueryWrapper queryWrapper=new QueryWrapper();
|
|
|
@@ -519,14 +571,13 @@ public class SyPackingListFabricController {
|
|
|
for (SyPackingListFabricItem item : items){
|
|
|
item.setCreateTime(null);
|
|
|
}
|
|
|
- System.out.println("items\n"+items);
|
|
|
syPackingListFabric.setSyPackingListFabricItem(items);
|
|
|
syPackingListFabric.setCreateTime(null);
|
|
|
list.add(syPackingListFabric);
|
|
|
- Gson userGson = new GsonBuilder().create();
|
|
|
- JSONObject jsonObjec=new JSONObject();
|
|
|
- jsonObjec.put("splfi", userGson.toJson(JSONObject.toJSON(list)));
|
|
|
- return jsonObjec;
|
|
|
+ // Gson userGson = new GsonBuilder().create();
|
|
|
+ // //JSONObject jsonObjec=new JSONObject();
|
|
|
+ // jsonObjec.put("splfi", userGson.toJson(JSONObject.toJSON(list)));
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@AutoLog(value = "测试接收功能")
|
|
|
@@ -552,7 +603,6 @@ public class SyPackingListFabricController {
|
|
|
}
|
|
|
for(SyPackingListFabric syPackingListFabric : packingListFabrics){
|
|
|
if(syPackingListFabric==null||syPackingListFabric.getSyDeclarationElementsId()==null){
|
|
|
- System.out.println("SyPackingListFabric\n"+syPackingListFabric);
|
|
|
result.setSuccess(false);
|
|
|
result.success("未获取到发运明细的id");
|
|
|
return result;
|
huxy