| 
					
				 | 
			
			
				@@ -820,9 +820,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 temps.add(preAssembledPackingList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if(preAssembledPackingList.getStatus().equals("0")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    result.setCode(200); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    result.setCode(201); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     result.setMessage("单据"+preAssembledPackingList.getDocumentNo()+"未提交!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    result.setSuccess(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    result.setSuccess(false); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     return result; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1160,6 +1160,107 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mains.add(main); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        boolean bool= syPreAssembledPackingListService.add(mains); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        syPreAssembledPackingListService.add(mains); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 通过excel导入数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param request 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param response 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @RequestMapping(value = "/importExcel2", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public Result<?> importExcel3(HttpServletRequest request, HttpServletResponse response) throws IOException { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        try{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            String str=""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                MultipartFile file = entity.getValue();// 获取上传文件对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                InputStream inputStream=file.getInputStream(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ImportParams params = new ImportParams(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Workbook workbook=new XSSFWorkbook(inputStream); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                str+=refreshSheet1(workbook); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                params.setTitleRows(2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                params.setHeadRows(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                params.setNeedSave(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return Result.ok(str); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }catch (Exception e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return Result.error("文件导入失败"+e.getMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private String refreshSheet1(Workbook workbook1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List <SyPreAssembledPackingList> mains=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Iterator sheets=workbook1.sheetIterator(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        int num=0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        while (sheets.hasNext()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            num++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            SyPreAssembledPackingList main=new SyPreAssembledPackingList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<SyPreAssembledPackingListItem> items=new ArrayList<SyPreAssembledPackingListItem>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            Sheet sheet=(Sheet) sheets.next(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<String> strs3=new ArrayList<String>();//获取尺码名称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<String > list=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Integer> nums=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            list.add("item NO./SKU NO./UPC NO./PACKS CODE"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            list.add("PREACKSKU"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            list.add("净净重"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (int x=0;x<=sheet.getLastRowNum();x++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Row row=sheet.getRow(x);//列 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Cell cell2=row.getCell(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(cell2==null){//如果这一列为空就退出 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<String> strs=new ArrayList<String>();//装主要数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<String> strs2=new ArrayList<String>();//获取尺码的信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                for (int i=0;i<row.getLastCellNum();i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Cell cell=row.getCell(i); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if(cell==null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    cell.setCellType(CellType.STRING);//获取的都转换成String 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if(cell.getStringCellValue().length()<1&&x>0&&!nums.contains(i)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        System.out.println("报错了\t第"+(i+1)+"个\t"+sheet.getRow(0).getCell(i).getStringCellValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if(x==0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if((i>7&&i<row.getLastCellNum()-13)||i==row.getLastCellNum()-4){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            strs3.add(cell.getStringCellValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if(list.contains(cell.getStringCellValue())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            nums.add(i); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            System.out.println("字段\t"+cell.getStringCellValue()+"\t"+i); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if((i>7&&i<row.getLastCellNum()-13)||i==row.getLastCellNum()-4){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            strs2.add(cell.getStringCellValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            strs.add(cell.getStringCellValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(x>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    SyPreAssembledPackingListItem item= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            new SyPreAssembledPackingListItem(strs.toArray(new String[strs.size()]), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    strs2.toArray(new String[strs2.size()]), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    strs3.toArray(new String[strs3.size()])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    items.add(item); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    main=new SyPreAssembledPackingList(strs.toArray(new String[strs.size()])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            main.setSyPreAssembledPackingListItemList(items);//获取集合 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            mains.add(main); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return syPreAssembledPackingListService.test(mains); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |