diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
index 9185c0d7..822318aa 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
@@ -34,133 +34,182 @@ import java.util.Map;
  */
 public class FileCopy {
 
-    public static String getInfoAndUpFile(File[] fileList)throws Exception {
-        String fileName="";
-//        图片对应的信息
+    public static ArrayList<Object> getInfoAndUpFile(File[] fileList) throws Exception {
+        String fileName = "";
+//        榜单图片对应的信息
         HashMap<String, Object> fileMap = new HashMap<>();
-        File excelFile =null;
+//        车辆图片对应的信息
+        HashMap<String, Object> carFileMap = new HashMap<>();
+        ArrayList<Object> resultList = new ArrayList<>();
+        File excelFile = null;
         for (int i = 0; i < fileList.length; i++) {
             File file = fileList[i];
             String name = file.getName();
 
-            int xlsIndex=0;
+            int xlsIndex = 0;
 //            将文件夹中的文件上传到文件服务器
-            if (file.isDirectory()){
-                fileName = getInfoAndUpFile(file.listFiles());
+            if (file.isDirectory()) {
+                ArrayList<Object>     resultListt = getInfoAndUpFile(file.listFiles());
+                if (resultListt.get(0) != null) {
+                    fileName = fileName+String.valueOf(resultListt.get(0));
+                }
+                if (resultListt.get(1) != null) {
+
+                    carFileMap.putAll ((HashMap<String, Object>) resultListt.get(1));
+                }
+                if (resultListt.get(2) != null) {
+                    fileMap.putAll ((HashMap<String, Object>) resultListt.get(2));
+                }
             }
-            if (file.isFile()){
-                String indexString = name.substring(0,name.lastIndexOf("."));
+            if (file.isFile()) {
+                String indexString = name.substring(0, name.lastIndexOf("."));
+                String parent = file.getParent();
+                String parentName = parent.substring(parent.lastIndexOf("\\") + 1, parent.length());
                 String substring = name.substring(name.lastIndexOf(".") + 1, name.length());
-                if (substring.contains("xls")||substring.contains("xlsx")){
+                if (substring.contains("xls") || substring.contains("xlsx")) {
 //                    进行word操作
-                    excelFile=file;
-                    xlsIndex=i;
-                }else {
+                    excelFile = file;
+                    xlsIndex = i;
+                } else {
                     //            这个文件图片的信息
                     ArrayList<Object> list = new ArrayList<>();
-                  @Cleanup InputStream input=new  FileInputStream(file);
+                    @Cleanup InputStream input = new FileInputStream(file);
 
-//                    MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
+//                  MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
                     MultipartFile multipartFile = new MultipartFileDto(file.getName(), file.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
                     UtilsController utilsController = SpringContext.getBean(UtilsController.class);
                     System.out.println(multipartFile.getName());
                     ActionResult annex = utilsController.uploader(multipartFile, "annex");
-                    if (annex.getCode()==200){
-                    list.add(annex.getData());
+                    if (annex.getCode() == 200) {
+                        list.add(annex.getData());
+                    }
+//                    将榜单照片存在榜单列表中
+                    if (indexString.equals("1")) {
+                        if (fileMap.containsKey(parentName)) {
+                            List<Object> o = (List<Object>) fileMap.get(parentName);
+                            o.add(annex.getData());
+                            fileMap.put(parentName, o);
+                        } else {
+                            fileMap.put(parentName, list);
+                        }
+                    } else {
+                        if (carFileMap.containsKey(parentName)) {
+                            List<Object> o = (List<Object>) carFileMap.get(parentName);
+                            o.add(annex.getData());
+                            carFileMap.put(parentName, o);
+                        } else {
+                            carFileMap.put(parentName, list);
+                        }
                     }
-                    fileMap.put(indexString,JsonUtil.getListToJsonArray(list));
+//                    将车辆照片存在车辆照片中
+
                 }
-                if (i==fileList.length-1){
-                    ExcelReader reader = ExcelUtil.getReader(excelFile);
-                    reader.setIgnoreEmptyRow(true);
+                if (i == fileList.length - 1) {
+                    if (excelFile != null) {
+                        ExcelReader reader = ExcelUtil.getReader(excelFile);
+                        reader.setIgnoreEmptyRow(true);
 //                    List<HashMap> read = reader.read(3, reader.read().size(), HashMap.class);
 //                    List<Object> objects1 = reader.readRow(0);
 //                    System.out.println(objects1);
-                    List<Object> objects2 = reader.readColumn(0, 0, 1);
+                        List<Object> objects2 = reader.readColumn(0, 0, 1);
 //                    公司名字
-                    String companyStr = String.valueOf(objects2.get(0));
+                        String companyStr = String.valueOf(objects2.get(0));
 //                    销售合同编码
-                    String infoStr = String.valueOf(objects2.get(1));
-                    String companyName = companyStr.substring(0,companyStr.lastIndexOf("废钢收货明细表"));
-                    infoStr=infoStr.replaceAll(" ","");
+                        String infoStr = String.valueOf(objects2.get(1));
+                        String companyName = companyStr.substring(0, companyStr.lastIndexOf("废钢收货明细表"));
+                        infoStr = infoStr.replaceAll(" ", "");
 //                    销售合同编码
-                    String str = infoStr.substring(7,infoStr.indexOf("采购合同编码"));
+                        String str = infoStr.substring(7, infoStr.indexOf("采购合同编码"));
 //                   销售合同编码
-                    String str3 = infoStr.substring(infoStr.lastIndexOf("：")+1,infoStr.length());
-                    List<Object> objects = reader.readColumn(0, 3);
-                    System.out.println(objects);
+                        String str3 = infoStr.substring(infoStr.lastIndexOf("：") + 1, infoStr.length());
+                        List<Object> objects = reader.readColumn(0, 3);
+                        System.out.println(objects);
 //                    写入工具类
-                    ExcelWriter writer = reader.getWriter();
+                        ExcelWriter writer = reader.getWriter();
 //                    Workbook workbook = writer.getWorkbook();
-                    Sheet sheet = writer.getSheet();
-                    for (int i1 = 0; i1 < objects.size(); i1++) {
-                        Object o = objects.get(i1);
-                        Row row = sheet.getRow(i1 + 3);
-                        if (String.valueOf(o).isEmpty()){
-                            continue;
-                        }
+                        Sheet sheet = writer.getSheet();
+                        for (int i1 = 0; i1 < objects.size(); i1++) {
+                            Object o = objects.get(i1);
+                            Row row = sheet.getRow(i1 + 3);
+                            if (String.valueOf(o).isEmpty()) {
+                                continue;
+                            }
 ////                        System.out.println(row.getCell(0).getStringCellValue());
 //                        if ( row.getCell(0).getStringCellValue().isEmpty()){
 //                            continue;
 //                        }
 
-                        Cell cell = row.createCell(19);
-                        Cell cell1 = row.createCell(20);
-                        Cell cell2 = row.createCell(21);
-                        Cell cell3 = row.createCell(22);
-
-                        if (i1==(objects.size()-1)){
-                            row=sheet.getRow(2);
-                            cell=row.createCell(19);
-                            cell.setCellValue("榜单图片地址");
-                            cell=row.createCell(20);
-                            cell.setCellValue("客户");
-                            cell=row.createCell(21);
-                            cell.setCellValue("销售合同编码");
-                            cell=row.createCell(22);
-                            cell.setCellValue("采购合同编码");
-                        }else {
-                            Object o1 = fileMap.get(String.valueOf(o));
-                            cell.setCellValue(String.valueOf(o1).equals("null")?"":String.valueOf(o1));
-                            cell1.setCellValue(companyStr);
-                            cell2.setCellValue(str);
-                            cell3.setCellValue(str3);
+                            Cell cell4 = row.createCell(18);
+                            Cell cell = row.createCell(19);
+                            Cell cell1 = row.createCell(20);
+                            Cell cell2 = row.createCell(21);
+                            Cell cell3 = row.createCell(22);
+
+                            if (i1 == (objects.size() - 1)) {
+                                row = sheet.getRow(2);
+                                cell = row.createCell(19);
+                                cell.setCellValue("榜单图片地址");
+                                cell = row.createCell(20);
+                                cell.setCellValue("客户");
+                                cell = row.createCell(21);
+                                cell.setCellValue("销售合同编码");
+                                cell = row.createCell(22);
+                                cell.setCellValue("采购合同编码");
+                                cell = row.createCell(18);
+                                cell.setCellValue("车辆图片地址");
+                            } else {
+                                Object o1 = fileMap.get(String.valueOf(o));
+                                Object o2 = carFileMap.get(String.valueOf(o));
+
+                                cell.setCellValue(String.valueOf(o1).equals("null") ? "" : String.valueOf(o1));
+                                cell4.setCellValue(String.valueOf(o2).equals("null") ? "" : String.valueOf(o2));
+                                cell1.setCellValue(companyStr);
+                                cell2.setCellValue(str);
+                                cell3.setCellValue(str3);
 
+                            }
                         }
-                    }
-                    writer.flush(excelFile);
-                    writer.close();
-                    @Cleanup InputStream input=new  FileInputStream(excelFile);
+                        writer.flush(excelFile);
+                        writer.close();
+                        @Cleanup InputStream input = new FileInputStream(excelFile);
 
 //                    MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
-                    MultipartFile multipartFile = new MultipartFileDto(excelFile.getName(), excelFile.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
-                    UtilsController utilsController = SpringContext.getBean(UtilsController.class);
-                    System.out.println(multipartFile.getName());
-                    ActionResult annex = utilsController.uploader(multipartFile, "annex");
-                    if (annex.getCode()==200){
-                        UploaderVO  fileLoader=(UploaderVO)annex.getData();
-                        System.out.println(fileLoader);
-                        System.out.println(fileLoader.getName());
-                        return fileLoader.getName();
+                        MultipartFile multipartFile = new MultipartFileDto(excelFile.getName(), excelFile.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
+                        UtilsController utilsController = SpringContext.getBean(UtilsController.class);
+                        System.out.println(multipartFile.getName());
+                        ActionResult annex = utilsController.uploader(multipartFile, "annex");
+                        if (annex.getCode() == 200) {
+                            UploaderVO fileLoader = (UploaderVO) annex.getData();
+                            System.out.println(fileLoader);
+                            System.out.println(fileLoader.getName());
+                            resultList.add(fileLoader.getName());
+                            resultList.add(carFileMap);
+                            resultList.add(fileMap);
+                            return resultList;
+                        }
                     }
+
                 }
             }
         }
-
-        return  fileName;
+        resultList.add(fileName);
+        resultList.add(carFileMap);
+        resultList.add(fileMap);
+        return resultList;
     }
 
 
-    public static void createFile(String path){
+    public static void createFile(String path) {
         File file = new File(path);
-       if (!file.exists()){
-           file.mkdirs();
-       }
+        if (!file.exists()) {
+            file.mkdirs();
+        }
     }
+
     /**
-     * @TODO 删除文件夹下的文件
      * @param path
      * @return
+     * @TODO 删除文件夹下的文件
      */
     public static boolean delAllFile(String path) {
         boolean flag = false;
@@ -192,20 +241,18 @@ public class FileCopy {
     }
 
 
-
-
-
     /**
      * 获取图片的base64
+     *
      * @param picturesInfo
      * @return
      * @throws Exception
      */
-    public static List<Map<String,Object>>  getImageInfo(String picturesInfo) throws Exception {
-        List<Map<String,Object>> imageBaseList = new ArrayList<>();
-        if (!picturesInfo.equals("null")){
+    public static List<Map<String, Object>> getImageInfo(String picturesInfo) throws Exception {
+        List<Map<String, Object>> imageBaseList = new ArrayList<>();
+        if (!picturesInfo.equals("null")) {
             for (Object o : JsonUtil.getJsonToJsonArray(picturesInfo)) {
-                Map<String,String> map =(Map<String,String>)o;
+                Map<String, String> map = (Map<String, String>) o;
                 String url = map.get("url");
 //                System.out.println(url);
                 int i = url.indexOf("/", 16);
@@ -214,17 +261,17 @@ public class FileCopy {
 //                System.out.println("type.toLowerCase()"+type.toLowerCase());
                 String fileId = map.get("fileId");
 //           本地文件路径
-                String filePath = FilePathUtil.getFilePath(type.toLowerCase())+fileId;
+                String filePath = FilePathUtil.getFilePath(type.toLowerCase()) + fileId;
 //            获得图片的base64码
                 String imageBase = FileCopy.getImageBase(filePath);
                 int[] imgWidthHeight = FileCopy.getImgWidthHeight(filePath);
                 HashMap<String, Object> map1 = new HashMap<>();
-                map1.put("imgBase",imageBase);
-                map1.put("name",fileId);
-                map1.put("filePath",filePath);
-                if (imgWidthHeight!=null){
-                    map1.put("width",String.valueOf(imgWidthHeight[0]));
-                    map1.put("height",String.valueOf(imgWidthHeight[1]));
+                map1.put("imgBase", imageBase);
+                map1.put("name", fileId);
+                map1.put("filePath", filePath);
+                if (imgWidthHeight != null) {
+                    map1.put("width", String.valueOf(imgWidthHeight[0]));
+                    map1.put("height", String.valueOf(imgWidthHeight[1]));
                 }
 
                 imageBaseList.add(map1);
@@ -234,8 +281,10 @@ public class FileCopy {
         }
         return imageBaseList;
     }
+
     /**
      * 获取图片宽度和高度
+     *
      * @param
      * @return 返回图片的宽度
      */
@@ -249,14 +298,14 @@ public class FileCopy {
         }
         InputStream is = null;
         BufferedImage src = null;
-        int result[] = { 0, 0 };
+        int result[] = {0, 0};
         try {
             // 获得文件输入流
             is = new FileInputStream(file);
             // 从流里将图片写入缓冲图片区
             src = ImageIO.read(is);
-            result[0] =src.getWidth(null); // 得到源图片宽
-            result[1] =src.getHeight(null);// 得到源图片高
+            result[0] = src.getWidth(null); // 得到源图片宽
+            result[1] = src.getHeight(null);// 得到源图片高
             is.close();  //关闭输入流
             src = null;
         } catch (Exception ef) {
@@ -290,45 +339,46 @@ public class FileCopy {
         return encoder.encode(data);
     }
 
-    public static void copySCMFile(File source, String dest )throws IOException{
+    public static void copySCMFile(File source, String dest) throws IOException {
         File parentFile = source.getParentFile();
-        if (!parentFile.exists()){
+        if (!parentFile.exists()) {
             parentFile.mkdirs();
             copyFile(source, dest);
-        }else{
+        } else {
             copyFile(source, dest);
         }
 
     }
-    public static void copyFile(File source, String dest )throws IOException {
 
-        if (source.exists()){
+    public static void copyFile(File source, String dest) throws IOException {
+
+        if (source.exists()) {
             //创建目的地文件夹
             File destfile = new File(dest);
-            if(!destfile.exists()){
+            if (!destfile.exists()) {
                 destfile.mkdir();
             }
             //如果source是文件夹，则在目的地址中创建新的文件夹
-            if(source.isDirectory()){
-                File file = new File(dest+"\\"+source.getName());//用目的地址加上source的文件夹名称，创建新的文件夹
+            if (source.isDirectory()) {
+                File file = new File(dest + "\\" + source.getName());//用目的地址加上source的文件夹名称，创建新的文件夹
                 file.mkdir();
                 //得到source文件夹的所有文件及目录
                 File[] files = source.listFiles();
-                if(files.length==0){
+                if (files.length == 0) {
                     return;
-                }else{
-                    for(int i = 0 ;i<files.length;i++){
-                        copyFile(files[i],file.getPath());
+                } else {
+                    for (int i = 0; i < files.length; i++) {
+                        copyFile(files[i], file.getPath());
                     }
                 }
 
             }
             //source是文件，则用字节输入输出流复制文件
-            else if(source.isFile()){
+            else if (source.isFile()) {
                 FileInputStream fis = new FileInputStream(source);
                 //创建新的文件，保存复制内容，文件名称与源文件名称一致
-                File dfile = new File(dest+"\\"+source.getName());
-                if(!dfile.exists()){
+                File dfile = new File(dest + "\\" + source.getName());
+                if (!dfile.exists()) {
                     dfile.createNewFile();
                 }
 
@@ -339,9 +389,9 @@ public class FileCopy {
                 // 定义长度
                 int len;
                 // 循环读取
-                while ((len = fis.read(b))!=-1) {
+                while ((len = fis.read(b)) != -1) {
                     // 写出数据
-                    fos.write(b, 0 , len);
+                    fos.write(b, 0, len);
                 }
 
                 //关闭资源
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
index 10580c68..b4fcff72 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
@@ -73,8 +73,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * purchaseorder
+ *
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
@@ -82,7 +82,7 @@ import java.util.Map;
  */
 @Slf4j
 @RestController
-@Api(tags = "purchaseorder" , value = "purchaseorder")
+@Api(tags = "purchaseorder", value = "purchaseorder")
 @RequestMapping("/api/purchaseorder/Purchaseorder")
 public class PurchaseorderController {
 
@@ -145,7 +145,7 @@ public class PurchaseorderController {
     @Transactional
     public ActionResult pigeonhole(@RequestBody PigeonholeModel pigeonholeModel) {
         PurchaseorderitemEntity purchaseorder = purchaseorderitemService.getById(pigeonholeModel.getId());
-        if (purchaseorder.getInvoiceAmount().equals(purchaseorder.getAmount()) && purchaseorder.getInvoiceAmount().equals(purchaseorder.getPayPrice())){
+        if (purchaseorder.getInvoiceAmount().equals(purchaseorder.getAmount()) && purchaseorder.getInvoiceAmount().equals(purchaseorder.getPayPrice())) {
             purchaseorder.setStatus("3");
             purchaseorderitemService.updateById(purchaseorder);
             List<PoundlistEntity> poundlistEntityList = purchaseorderitemService.getPoundList(purchaseorder.getId());
@@ -154,7 +154,7 @@ public class PurchaseorderController {
                 poundlistService.updateById(poundlistEntity);
             }
             return ActionResult.success("归档成功！");
-        }else{
+        } else {
             return ActionResult.fail("发票金额、金额、已付款金额三者不一致！");
         }
     }
@@ -171,18 +171,18 @@ public class PurchaseorderController {
         String[] idList = ids.split(",");
         String supplier = "";
         int i = 0;
-        for (String id : idList){
+        for (String id : idList) {
             PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(id);
-            if (!purchaseorderEntity.getStatus().equals("2")){
+            if (!purchaseorderEntity.getStatus().equals("2")) {
                 return ActionResult.fail("请先完成入库操作");
             }
-            if (purchaseorderEntity.getPayPrice().equals(purchaseorderEntity.getAmount())){
+            if (purchaseorderEntity.getPayPrice().equals(purchaseorderEntity.getAmount())) {
                 return ActionResult.fail("已完成付款");
             }
-            if (!purchaseorderEntity.getInvoiceAmount().equals(purchaseorderEntity.getAmount())){
+            if (!purchaseorderEntity.getInvoiceAmount().equals(purchaseorderEntity.getAmount())) {
                 return ActionResult.fail("请先开具发票");
             }
-            if (i>0 && !supplier.equals(purchaseorderEntity.getSupplierName())){
+            if (i > 0 && !supplier.equals(purchaseorderEntity.getSupplierName())) {
                 return ActionResult.fail("存在多个不同供应商，请重新勾选");
             }
             supplier = purchaseorderEntity.getSupplierName();
@@ -198,8 +198,8 @@ public class PurchaseorderController {
      * @return
      */
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination)throws IOException{
-        List<PurchaseorderitemEntity> list= purchaseorderitemService.getList(purchaseorderPagination);
+    public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination) throws IOException {
+        List<PurchaseorderitemEntity> list = purchaseorderitemService.getList(purchaseorderPagination);
         //处理id字段转名称，若无需转或者为空可删除
         /*for(PurchaseorderitemEntity entity:list){
             Map<String,Object> contractCodeMap = new HashMap<>();
@@ -211,12 +211,12 @@ public class PurchaseorderController {
 
             entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
         }*/
-        List<PurchaseorderListVO> listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class);
-        for(PurchaseorderListVO purchaseorderVO:listVO){
+        List<PurchaseorderListVO> listVO = JsonUtil.getJsonToList(list, PurchaseorderListVO.class);
+        for (PurchaseorderListVO purchaseorderVO : listVO) {
         }
-        PageListVO vo=new PageListVO();
+        PageListVO vo = new PageListVO();
         vo.setList(listVO);
-        PaginationVO page=JsonUtil.getJsonToBean(purchaseorderPagination,PaginationVO.class);
+        PaginationVO page = JsonUtil.getJsonToBean(purchaseorderPagination, PaginationVO.class);
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
@@ -231,8 +231,8 @@ public class PurchaseorderController {
     @PostMapping
     @Transactional
     public ActionResult create(@RequestBody @Valid PurchaseorderCrForm purchaseorderCrForm) throws DataException {
-        String mainId =RandomUtil.uuId();
-        UserInfo userInfo=userProvider.get();
+        String mainId = RandomUtil.uuId();
+        UserInfo userInfo = userProvider.get();
         purchaseorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("cgdj", false));
         purchaseorderCrForm.setCreatorUserName(userInfo.getUserId());
         purchaseorderCrForm.setCreatorTime(DateUtil.getNow());
@@ -243,8 +243,8 @@ public class PurchaseorderController {
         PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class);
         entity.setId(mainId);
         purchaseorderitemService.save(entity);
-        List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class);
-        for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){
+        List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class);
+        for (Purchaseorder_item0Entity entitys : Purchaseorder_item0List) {
             entitys.setId(RandomUtil.uuId());
             entitys.setPurchaseorderId(entity.getId());
             purchaseorder_item0Service.save(entitys);
@@ -286,7 +286,6 @@ public class PurchaseorderController {
     }
 
 
-
     /**
      * 模板下载
      *
@@ -294,14 +293,14 @@ public class PurchaseorderController {
      */
     @ApiOperation("模板下载")
     @GetMapping("/templateDownload")
-    public ActionResult<DownloadVO>  TemplateDownload(){
-        UserInfo userInfo=userProvider.get();
-        DownloadVO vo=DownloadVO.builder().build();
-        try{
+    public ActionResult<DownloadVO> TemplateDownload() {
+        UserInfo userInfo = userProvider.get();
+        DownloadVO vo = DownloadVO.builder().build();
+        try {
             vo.setName("职员信息.xlsx");
-            vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
-        }catch(Exception e){
-            log.error("信息导出Excel错误:{}" ,e.getMessage());
+            vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=", userInfo.getId() + "#" + "职员信息.xlsx" + "#" + "Temporary"));
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
         }
         return ActionResult.success(vo);
     }
@@ -313,27 +312,26 @@ public class PurchaseorderController {
      */
     @ApiOperation("上传文件")
     @PostMapping("/Uploader")
-    public ActionResult Uploader() throws Exception  {
+    public ActionResult Uploader() throws Exception {
         List<MultipartFile> list = UpUtil.getFileAll();
         MultipartFile file = list.get(0);
-        if (file.getOriginalFilename().endsWith(".zip" )) {
-            String filePath = configValueUtil.getTemporaryFilePath()+"unzip\\";
+        if (file.getOriginalFilename().endsWith(".zip")) {
+            String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\";
 //            String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
 //            fileName = XSSEscape.escape(fileName);
             //上传文件
             File temporaryFile = new File(filePath);
-            if (!temporaryFile.exists()){
+            if (!temporaryFile.exists()) {
                 temporaryFile.mkdirs();
             }
             @Cleanup InputStream inputStream = file.getInputStream();
             File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK"));
             HashMap<String, String> imgMap = new HashMap<>();
-            String fileName = FileCopy.getInfoAndUpFile(gbk.listFiles());
-            log.warn(filePath);
-            log.warn(fileName);
+            List<Object> resultList= FileCopy.getInfoAndUpFile(gbk.listFiles());
+            FileUtil.deleteFileAll(temporaryFile);
 //            FileUtil.upFile(file, filePath, fileName);
             DownloadVO vo = DownloadVO.builder().build();
-            vo.setName(fileName);
+            vo.setName(String.valueOf(resultList.get(0)));
             return ActionResult.success(vo);
         } else {
             return ActionResult.fail("选择文件不符合导入");
@@ -376,92 +374,93 @@ public class PurchaseorderController {
 
 
     /**
-    * 导出Excel
-    *
-    * @return
-    */
+     * 导出Excel
+     *
+     * @return
+     */
     @ApiOperation("导出Excel")
     @GetMapping("/Actions/Export")
     public ActionResult Export(PurchaseorderPaginationExportModel purchaseorderPaginationExportModel) throws IOException {
-        if (StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())){
+        if (StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())) {
             return ActionResult.fail("请选择导出字段");
         }
-        PurchaseorderPagination purchaseorderPagination=JsonUtil.getJsonToBean(purchaseorderPaginationExportModel, PurchaseorderPagination.class);
-        List<PurchaseorderitemEntity> list=  purchaseorderitemService.getTypeList(purchaseorderPagination,purchaseorderPaginationExportModel.getDataType());
+        PurchaseorderPagination purchaseorderPagination = JsonUtil.getJsonToBean(purchaseorderPaginationExportModel, PurchaseorderPagination.class);
+        List<PurchaseorderitemEntity> list = purchaseorderitemService.getTypeList(purchaseorderPagination, purchaseorderPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
-        for(PurchaseorderitemEntity entity:list){
-            Map<String,Object> contractNameMap = new HashMap<>();
-            entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",entity.getContractName(),contractNameMap));
+        for (PurchaseorderitemEntity entity : list) {
+            Map<String, Object> contractNameMap = new HashMap<>();
+            entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "contract_name", "contract_name", entity.getContractName(), contractNameMap));
             entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
         }
-        List<PurchaseorderListVO> listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class);
-        for(PurchaseorderListVO purchaseorderVO:listVO){
+        List<PurchaseorderListVO> listVO = JsonUtil.getJsonToList(list, PurchaseorderListVO.class);
+        for (PurchaseorderListVO purchaseorderVO : listVO) {
         }
 
         //转换为map输出
-        List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
-        String[]keys=!StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())?purchaseorderPaginationExportModel.getSelectKey().split(","):new String[0];
-        UserInfo userInfo=userProvider.get();
-        DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
+        List<Map<String, Object>> mapList = JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO, "yyyy-MM-dd HH:mm:ss"));
+        String[] keys = !StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey()) ? purchaseorderPaginationExportModel.getSelectKey().split(",") : new String[0];
+        UserInfo userInfo = userProvider.get();
+        DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo);
         return ActionResult.success(vo);
     }
+
     //导出表格
-    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
-        DownloadVO vo=DownloadVO.builder().build();
-        List<ExcelExportEntity> entitys=new ArrayList<>();
-        if(keys.length>0){
-            for(String key:keys){
-                switch(key){
-                    case "documentNo" :
-                        entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
+    public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
+        DownloadVO vo = DownloadVO.builder().build();
+        List<ExcelExportEntity> entitys = new ArrayList<>();
+        if (keys.length > 0) {
+            for (String key : keys) {
+                switch (key) {
+                    case "documentNo":
+                        entitys.add(new ExcelExportEntity("单据编号", "documentNo"));
                         break;
-                    case "contractName" :
-                        entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
+                    case "contractName":
+                        entitys.add(new ExcelExportEntity("合同名称", "contractName"));
                         break;
-                    case "supplierName" :
-                        entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
+                    case "supplierName":
+                        entitys.add(new ExcelExportEntity("供应商名称", "supplierName"));
                         break;
-                    case "currency" :
-                        entitys.add(new ExcelExportEntity("币种" ,"currency"));
+                    case "currency":
+                        entitys.add(new ExcelExportEntity("币种", "currency"));
                         break;
-                    case "contractNo" :
-                        entitys.add(new ExcelExportEntity("对方合同号" ,"contractNo"));
+                    case "contractNo":
+                        entitys.add(new ExcelExportEntity("对方合同号", "contractNo"));
                         break;
-                    case "advanceAmount" :
-                        entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
+                    case "advanceAmount":
+                        entitys.add(new ExcelExportEntity("垫资金额", "advanceAmount"));
                         break;
-                    case "num" :
-                        entitys.add(new ExcelExportEntity("重量" ,"num"));
+                    case "num":
+                        entitys.add(new ExcelExportEntity("重量", "num"));
                         break;
-                    case "amount" :
-                        entitys.add(new ExcelExportEntity("金额" ,"amount"));
+                    case "amount":
+                        entitys.add(new ExcelExportEntity("金额", "amount"));
                         break;
-                    case "notAmount" :
-                        entitys.add(new ExcelExportEntity("不含税金额" ,"notAmount"));
+                    case "notAmount":
+                        entitys.add(new ExcelExportEntity("不含税金额", "notAmount"));
                         break;
-                    case "remark" :
-                        entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
+                    case "remark":
+                        entitys.add(new ExcelExportEntity("备注信息", "remark"));
                         break;
-                    case "creatorUserName" :
-                        entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
+                    case "creatorUserName":
+                        entitys.add(new ExcelExportEntity("制单人", "creatorUserName"));
                         break;
-                    case "creatorTime" :
-                        entitys.add(new ExcelExportEntity("制单时间" ,"creatorTime"));
+                    case "creatorTime":
+                        entitys.add(new ExcelExportEntity("制单时间", "creatorTime"));
                         break;
-                    case "erpNo" :
-                        entitys.add(new ExcelExportEntity("ERP订单号" ,"erpNo"));
+                    case "erpNo":
+                        entitys.add(new ExcelExportEntity("ERP订单号", "erpNo"));
                         break;
-                    case "payPrice" :
-                        entitys.add(new ExcelExportEntity("已付款金额" ,"payPrice"));
+                    case "payPrice":
+                        entitys.add(new ExcelExportEntity("已付款金额", "payPrice"));
                         break;
-                    case "invoiceNum" :
-                        entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum"));
+                    case "invoiceNum":
+                        entitys.add(new ExcelExportEntity("发票数量", "invoiceNum"));
                         break;
-                    case "invoiceAmount" :
-                        entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
+                    case "invoiceAmount":
+                        entitys.add(new ExcelExportEntity("发票金额", "invoiceAmount"));
                         break;
-                    case "status" :
-                        entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
+                    case "status":
+                        entitys.add(new ExcelExportEntity("单据状态 ", "status"));
                         break;
                     default:
                         break;
@@ -471,9 +470,9 @@ public class PurchaseorderController {
 
         ExportParams exportParams = new ExportParams(null, "表单信息");
         exportParams.setType(ExcelType.XSSF);
-        try{
+        try {
             @Cleanup Workbook workbook = new HSSFWorkbook();
-            if (entitys.size()>0){
+            if (entitys.size() > 0) {
                 workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
             }
             String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
@@ -502,14 +501,14 @@ public class PurchaseorderController {
      */
     @DeleteMapping("/batchRemove/{ids}")
     @Transactional
-    public ActionResult batchRemove(@PathVariable("ids") String ids){
+    public ActionResult batchRemove(@PathVariable("ids") String ids) {
         String[] idList = ids.split(",");
-        int i =0;
-        for (String allId : idList){
+        int i = 0;
+        for (String allId : idList) {
             this.delete(allId);
             i++;
         }
-        if (i == 0 ){
+        if (i == 0) {
             return ActionResult.fail("删除失败");
         }
         return ActionResult.success("删除成功");
@@ -524,16 +523,16 @@ public class PurchaseorderController {
      */
     @GetMapping("/batchQueryPurchaseorder/{ids}")
     @Transactional
-    public ActionResult<List<PurchaseorderitemEntity>> batchQueryPurchaseorder(@PathVariable("ids") String ids){
+    public ActionResult<List<PurchaseorderitemEntity>> batchQueryPurchaseorder(@PathVariable("ids") String ids) {
         List<PurchaseorderitemEntity> list = new ArrayList<>();
         String[] idList = ids.split(",");
-        for (String id: idList) {
-            PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
+        for (String id : idList) {
+            PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
             List<PoundlistEntity> poundlistEntityList = purchaseorderitemService.getPoundList(id);
             entity.setPoundlistEntityList(poundlistEntityList);
-            if(entity != null && StringUtils.isNotEmpty(entity.getContractCode())){
+            if (entity != null && StringUtils.isNotEmpty(entity.getContractCode())) {
                 ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractCode());
-                if(contractFileEntity != null && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
+                if (contractFileEntity != null && StringUtils.isNotEmpty(contractFileEntity.getContractName())) {
                     entity.setContractNo(contractFileEntity.getContractCode());
                 }
             }
@@ -549,9 +548,9 @@ public class PurchaseorderController {
      * @return
      */
     @GetMapping("/{id}")
-    public ActionResult<PurchaseorderInfoVO> info(@PathVariable("id") String id){
-        PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
-        PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
+    public ActionResult<PurchaseorderInfoVO> info(@PathVariable("id") String id) {
+        PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
+        PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
         vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
         /*SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId());
         if(supplierEntity != null){
@@ -559,43 +558,40 @@ public class PurchaseorderController {
         }*/
 
 
-
-
-
-        if(vo.getCreatorTime()!=null){
+        if (vo.getCreatorTime() != null) {
             vo.setCreatorTime(vo.getCreatorTime());
         }
 
         //子表
         List<Purchaseorder_item0Entity> Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
-        for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){
-            if(StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())){
+        for (Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List) {
+            if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())) {
                 MaterialEntity materialEntity = materialService.getById(purchaseorder_item0Entity.getMaterialId());
-                if(materialEntity != null){
+                if (materialEntity != null) {
                     purchaseorder_item0Entity.setMaterialName(materialEntity.getItemName());
-                    if(StringUtils.isNotEmpty(materialEntity.getInArea())){
+                    if (StringUtils.isNotEmpty(materialEntity.getInArea())) {
                         purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea());
                         ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea());
-                        if(reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){
+                        if (reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())) {
                             purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
                         }
                     }
                 }
             }
         }
-        vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List,Purchaseorder_item0Model.class ));
+        vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List, Purchaseorder_item0Model.class));
         QueryWrapper<InvoicesitemEntity> invoicesitemWrapper = new QueryWrapper<>();
-        invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id);
+        invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, id);
         List<InvoicesitemEntity> invoicesitemList = invoicesitemService.list(invoicesitemWrapper);
         List<Invoices_item0itemEntity> Invoices_item0itemList = new ArrayList<>();
-        for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){
+        for (InvoicesitemEntity invoicesitemEntity : invoicesitemList) {
             List<Invoices_item0itemEntity> invoices_item0itemList = purchaseorderitemService.GetInvoices_item0itemList(invoicesitemEntity.getId());
             Invoices_item0itemList.addAll(invoices_item0itemList);
         }
-        for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){
+        for (Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList) {
         }
-        vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class ));
-        if(invoicesitemList != null && invoicesitemList.size() > 0){
+        vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList, Invoices_item0itemModel.class));
+        if (invoicesitemList != null && invoicesitemList.size() > 0) {
             vo.setInvoicesitemEntity(invoicesitemList.get(0));
         }
         List<PaymentListVO> paymentList = paymentService.queryByPurchaseorderId(id);
@@ -605,9 +601,9 @@ public class PurchaseorderController {
         List<PurchasebackEntity> PurchasebackList = purchasebackService.list(purchasebackWrapper);
         vo.setPurchasebackList(PurchasebackList);
         List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
-        for(CollectionpoEntity collectionpoEntity : CollectionitemList){
+        for (CollectionpoEntity collectionpoEntity : CollectionitemList) {
         }
-        vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class ));
+        vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList, CollectionitemModel.class));
         //副表
         return ActionResult.success(vo);
     }
@@ -619,8 +615,8 @@ public class PurchaseorderController {
      * @return
      */
     @GetMapping("guidang/{id}")
-    public ActionResult<PurchaseorderInfoVO> guidang(@PathVariable("id") String id){
-        PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
+    public ActionResult<PurchaseorderInfoVO> guidang(@PathVariable("id") String id) {
+        PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
         entity.setStatus("3");
         purchaseorderitemService.updateById(entity);
         return ActionResult.success("归档成功");
@@ -634,58 +630,58 @@ public class PurchaseorderController {
      */
     @GetMapping("/detail/{id}")
     public ActionResult<PurchaseorderInfoVO> detailInfo(@PathVariable("id") String id) throws IOException {
-        PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
-        PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
+        PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
+        PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
 
         //子表数据转换
         List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
-        List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class);
-        for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){
-            Map<String,Object> vehicleIdMap = new HashMap<>();
-            jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581","vehicle_id","ticketno",jg_purchaseorder_item0Model.getVehicleId(),vehicleIdMap));
-            Map<String,Object> materialIdMap = new HashMap<>();
-            jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_purchaseorder_item0Model.getMaterialId(),materialIdMap));
+        List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List, Purchaseorder_item0Model.class);
+        for (Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList) {
+            Map<String, Object> vehicleIdMap = new HashMap<>();
+            jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581", "vehicle_id", "ticketno", jg_purchaseorder_item0Model.getVehicleId(), vehicleIdMap));
+            Map<String, Object> materialIdMap = new HashMap<>();
+            jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533", "id", "item_name", jg_purchaseorder_item0Model.getMaterialId(), materialIdMap));
             PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId());
             jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate());
 
             SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId());
-            if(supplierEntity != null){
+            if (supplierEntity != null) {
                 jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName());
             }
             UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId());
-            if(userEntity != null){
+            if (userEntity != null) {
                 jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName());
             }
         }
         vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList);
-		List<Invoices_item0itemEntity> jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id);
-		List<Invoices_item0itemModel> jg_invoices_item0ModelList = JsonUtil.getJsonToList(jg_invoices_item0List,Invoices_item0itemModel.class);
-		for(Invoices_item0itemModel jg_invoices_item0Model : jg_invoices_item0ModelList){
-    }
-		vo.setInvoices_item0itemList(jg_invoices_item0ModelList);
+        List<Invoices_item0itemEntity> jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id);
+        List<Invoices_item0itemModel> jg_invoices_item0ModelList = JsonUtil.getJsonToList(jg_invoices_item0List, Invoices_item0itemModel.class);
+        for (Invoices_item0itemModel jg_invoices_item0Model : jg_invoices_item0ModelList) {
+        }
+        vo.setInvoices_item0itemList(jg_invoices_item0ModelList);
 
         QueryWrapper<InvoicesitemEntity> invoicesitemWrapper = new QueryWrapper<>();
-        invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id);
+        invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, id);
         List<InvoicesitemEntity> invoicesitemList = invoicesitemService.list(invoicesitemWrapper);
         List<Invoices_item0itemEntity> Invoices_item0itemList = new ArrayList<>();
-        for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){
+        for (InvoicesitemEntity invoicesitemEntity : invoicesitemList) {
             List<Invoices_item0itemEntity> invoices_item0itemList = purchaseorderitemService.GetInvoices_item0itemList(invoicesitemEntity.getId());
             Invoices_item0itemList.addAll(invoices_item0itemList);
         }
-        for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){
+        for (Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList) {
         }
-        vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class ));
+        vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList, Invoices_item0itemModel.class));
 
         List<PaymentListVO> paymentList = paymentService.queryByPurchaseorderId(id);
         vo.setPaymentList(paymentList);
 
         List<Receiptin_item0Entity> receiptin_item0itemList = purchaseorderitemService.GetReceiptin_item0itemList(id);
-        List<Receiptin_item0Model> jg_receiptin_item0ModelList = JsonUtil.getJsonToList(receiptin_item0itemList,Receiptin_item0Model.class);
+        List<Receiptin_item0Model> jg_receiptin_item0ModelList = JsonUtil.getJsonToList(receiptin_item0itemList, Receiptin_item0Model.class);
         vo.setReceiptin_item0List(jg_receiptin_item0ModelList);
         QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
         receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
         ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
-        if(receiptinEntity != null){
+        if (receiptinEntity != null) {
             vo.setReceiptamount(receiptinEntity.getReceiptamount());
             vo.setReceiptnum(receiptinEntity.getReceiptnum());
         }
@@ -699,7 +695,7 @@ public class PurchaseorderController {
         BigDecimal refundNum = new BigDecimal(0);
         BigDecimal refundAmount = new BigDecimal(0);
         List<Purchaseback_item0Entity> purchaseback_item0EntityList = new ArrayList<>();
-        for (PurchasebackEntity purchasebackEntity: PurchasebackList) {
+        for (PurchasebackEntity purchasebackEntity : PurchasebackList) {
             refundNum = refundNum.add(purchasebackEntity.getRefundNum());
             refundAmount = refundAmount.add(purchasebackEntity.getRefundAmount());
             QueryWrapper<Purchaseback_item0Entity> purchasebackitem0Wrapper = new QueryWrapper<>();
@@ -710,32 +706,30 @@ public class PurchaseorderController {
         vo.setRefundAmount(refundAmount);
         vo.setRefundNum(refundNum);
         vo.setPurchaseback_item0EntityList(purchaseback_item0EntityList);
-		List<CollectionpoEntity> jg_collectionList = purchaseorderitemService.GetCollectionitemList(id);
-		List<CollectionitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class);
-		for(CollectionitemModel jg_collectionModel : jg_collectionModelList){
-    }
-		vo.setCollectionitemList(jg_collectionModelList);
+        List<CollectionpoEntity> jg_collectionList = purchaseorderitemService.GetCollectionitemList(id);
+        List<CollectionitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList, CollectionitemModel.class);
+        for (CollectionitemModel jg_collectionModel : jg_collectionModelList) {
+        }
+        vo.setCollectionitemList(jg_collectionModelList);
 
         List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
-        for(CollectionpoEntity collectionpoEntity : CollectionitemList){
+        for (CollectionpoEntity collectionpoEntity : CollectionitemList) {
         }
-        vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class ));
+        vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList, CollectionitemModel.class));
 
         //附表数据转换
 
 //添加到详情表单对象中
-        Map<String,Object> contractCodeMap = new HashMap<>();
-        vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",vo.getContractCode(),contractCodeMap));
-        Map<String,Object> supplierIdMap = new HashMap<>();
-        vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",vo.getSupplierId(),supplierIdMap));
+        Map<String, Object> contractCodeMap = new HashMap<>();
+        vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "id", "contract_name", vo.getContractCode(), contractCodeMap));
+        Map<String, Object> supplierIdMap = new HashMap<>();
+        vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621", "id", "supplier_name", vo.getSupplierId(), supplierIdMap));
         vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
 
         return ActionResult.success(vo);
     }
 
 
-
-
     /**
      * 更新
      *
@@ -747,7 +741,7 @@ public class PurchaseorderController {
     public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException {
         UserInfo userInfo = userProvider.get();
         PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
-        if(!entity.getStatus().equals("0")){
+        if (!entity.getStatus().equals("0")) {
             String info = "";
             switch (entity.getStatus()) {
                 case "1":
@@ -760,7 +754,7 @@ public class PurchaseorderController {
                     info = "归档";
                     break;
             }
-            return ActionResult.fail("已"+info+"，无法编辑！");
+            return ActionResult.fail("已" + info + "，无法编辑！");
         }
         if (entity != null) {
             PurchaseorderitemEntity subentity = JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class);
@@ -794,12 +788,12 @@ public class PurchaseorderController {
                 invoices_item0itemService.save(entitys);
             }
             QueryWrapper<PaymentdocpoEntity> PaymentdocpoWrapper = new QueryWrapper<>();
-            PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo());
+            PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo, entity.getDocumentNo());
             List<PaymentdocpoEntity> paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper);
 
             for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) {
                 QueryWrapper<PaymentitemEntity> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno,paymentdocpoEntity.getDocumentNo());
+                queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno, paymentdocpoEntity.getDocumentNo());
                 paymentitemService.remove(queryWrapper);
             }
 
@@ -847,7 +841,6 @@ public class PurchaseorderController {
     }
 
 
-
     /**
      * 删除
      *
@@ -856,27 +849,27 @@ public class PurchaseorderController {
      */
     @DeleteMapping("/{id}")
     @Transactional
-    public ActionResult delete(@PathVariable("id") String id){
-        PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
-        if (!entity.getStatus().equals("0")){
+    public ActionResult delete(@PathVariable("id") String id) {
+        PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
+        if (!entity.getStatus().equals("0")) {
             return ActionResult.fail("该状态下不允许删除！");
         }
-        if(entity!=null){
+        if (entity != null) {
             purchaseorderitemService.delete(entity);
-            QueryWrapper<Purchaseorder_item0Entity> queryWrapperPurchaseorder_item0=new QueryWrapper<>();
-            queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId());
+            QueryWrapper<Purchaseorder_item0Entity> queryWrapperPurchaseorder_item0 = new QueryWrapper<>();
+            queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId());
             purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0);
-            QueryWrapper<Invoices_item0itemEntity> queryWrapperInvoices_item0item=new QueryWrapper<>();
-            queryWrapperInvoices_item0item.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId,entity.getId());
+            QueryWrapper<Invoices_item0itemEntity> queryWrapperInvoices_item0item = new QueryWrapper<>();
+            queryWrapperInvoices_item0item.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId, entity.getId());
             invoices_item0itemService.remove(queryWrapperInvoices_item0item);
-            QueryWrapper<PaymentitemEntity> queryWrapperPaymentitem=new QueryWrapper<>();
-            queryWrapperPaymentitem.lambda().eq(PaymentitemEntity::getDocumentno,entity.getDocumentNo());
+            QueryWrapper<PaymentitemEntity> queryWrapperPaymentitem = new QueryWrapper<>();
+            queryWrapperPaymentitem.lambda().eq(PaymentitemEntity::getDocumentno, entity.getDocumentNo());
             paymentitemService.remove(queryWrapperPaymentitem);
-            QueryWrapper<PurchasebackitemEntity> queryWrapperPurchasebackitem=new QueryWrapper<>();
-            queryWrapperPurchasebackitem.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId,entity.getId());
+            QueryWrapper<PurchasebackitemEntity> queryWrapperPurchasebackitem = new QueryWrapper<>();
+            queryWrapperPurchasebackitem.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, entity.getId());
             purchasebackitemService.remove(queryWrapperPurchasebackitem);
-            QueryWrapper<CollectionpoEntity> queryWrapperCollectionitem=new QueryWrapper<>();
-            queryWrapperCollectionitem.lambda().eq(CollectionpoEntity::getSalesOrderNo,entity.getDocumentNo());
+            QueryWrapper<CollectionpoEntity> queryWrapperCollectionitem = new QueryWrapper<>();
+            queryWrapperCollectionitem.lambda().eq(CollectionpoEntity::getSalesOrderNo, entity.getDocumentNo());
             collectionpoService.remove(queryWrapperCollectionitem);
 
         }
@@ -884,8 +877,4 @@ public class PurchaseorderController {
     }
 
 
-
-
-
-
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderDTO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderDTO.java
index 749e45d5..13203dba 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderDTO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderDTO.java
@@ -41,19 +41,17 @@ public class PurchaseorderDTO {
     @Excel(name = "结算重量")
     private String settlement;
 
-    @Excel(name = "磅单图片")
-    private String imgPicturess;
 
     @Excel(name = "是否垫资")
     private String advance;
 
-    @Excel(name = "自然人")
-    private String naturalId;
+//    @Excel(name = "自然人")
+//    private String naturalId;
 
-    @Excel(name = "采购单价")
+    @Excel(name = "采购额")
     private String purchasePrice;
 
-    @Excel(name = "销售单价")
+    @Excel(name = "销售额")
     private String salesPrice;
 
     @Excel(name = "运费")
@@ -62,6 +60,9 @@ public class PurchaseorderDTO {
     @Excel(name = "起始地")
     private String originPrice;
 
+    @Excel(name = "业务员2")
+    private String naturalId;
+
     @Excel(name = "备注")
     private String remark;
 
@@ -70,15 +71,18 @@ public class PurchaseorderDTO {
 
     @Excel(name = "榜单图片地址")
     private String poundPictures;
+    @Excel(name = "车辆图片地址")
+    private String carPictures;
 
     @Excel(name = "销售合同编码")
     private String salesId;
 
-    @Excel(name="采购合同编码")
+    @Excel(name = "采购合同编码")
     private String purchaseId;
-    @Excel(name="客户")
+    @Excel(name = "客户")
     private String customerId;
 
+
     private String id;
 
     private List<PurchaseorderDTO> list;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index 530993c0..c9a462ae 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -23,8 +23,6 @@ import jnpf.base.controller.BillRuleController;
 import jnpf.base.entity.ProvinceEntity;
 import jnpf.base.mapper.ProvinceMapper;
 import jnpf.config.ConfigValueUtil;
-import jnpf.contractfile.entity.ContractFileEntity;
-import jnpf.contractfile.service.ContractFileService;
 import jnpf.customer.entity.CustomerEntity;
 import jnpf.customer.mapper.CustomerVMapper;
 import jnpf.exception.DataException;
@@ -77,6 +75,7 @@ import java.awt.*;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -85,7 +84,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- *
  * purchaseorder
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
@@ -122,7 +120,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
     private PurchaseorderitemMapper purchaseorderitemMapper;
 
     @Resource
-    private  ConfigValueUtil configValueUtil;
+    private ConfigValueUtil configValueUtil;
 
     @Resource
     private VehicleMapper vehicleMapper;
@@ -156,16 +154,16 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
     @Autowired
     private Receiptin_item0Service receiptin_item0Service;
 
-    public void getExcel(List<HashMap<String,Object>> list ,String templateFilePath) throws Exception{
+    public void getExcel(List<HashMap<String, Object>> list, String templateFilePath) throws Exception {
         //声明要创建的文件名
-        String filename =  templateFilePath+"\\废钢收货明细表.xls" ;
+        String filename = templateFilePath + "\\废钢收货明细表.xls";
 //创建 HSSFWorkbook 类的实例
-        HSSFWorkbook workbook =  new  HSSFWorkbook();
-        FileOutputStream fileOut =  new  FileOutputStream(filename);
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        FileOutputStream fileOut = new FileOutputStream(filename);
 
-        try{
+        try {
 //调用 creatSheet() 方法并传递要创建的工作表的名称
-            HSSFSheet sheet = workbook.createSheet( "榜单信息" );
+            HSSFSheet sheet = workbook.createSheet("榜单信息");
             HSSFCellStyle cellStyle = workbook.createCellStyle();
             HSSFCellStyle headLineStyle = workbook.createCellStyle();
             HSSFCellStyle headStyle = workbook.createCellStyle();
@@ -231,14 +229,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 8));
 
 
-
             BigDecimal sum = BigDecimal.ZERO;
-            if (list!=null&&list.size()>0){
+            if (list != null && list.size() > 0) {
                 for (int i = 0; i < list.size(); i++) {
                     HashMap<String, Object> map = list.get(i);
 
                     //创建第二行
-                    HSSFRow row2 = sheet.createRow((short) i+3 );
+                    HSSFRow row2 = sheet.createRow((short) i + 3);
 //在第二行插入数据
                     HSSFCell lineCell1 = row2.createCell(0);
                     HSSFCell lineCell2 = row2.createCell(1);
@@ -249,66 +246,66 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                     HSSFCell lineCell7 = row2.createCell(6);
                     HSSFCell lineCell8 = row2.createCell(7);
                     HSSFCell lineCell9 = row2.createCell(8);
-                    lineCell1.setCellValue( i+1 );
+                    lineCell1.setCellValue(i + 1);
                     lineCell1.setCellStyle(lineStyle);
-                    lineCell2.setCellValue(String.valueOf(map.get("poundDate")).equals("null")?"":String.valueOf(map.get("poundDate"))  );
+                    lineCell2.setCellValue(String.valueOf(map.get("poundDate")).equals("null") ? "" : String.valueOf(map.get("poundDate")));
                     lineCell2.setCellStyle(lineStyle);
-                    lineCell3.setCellValue( String.valueOf(map.get("ticketNo")).equals("null")?"":String.valueOf(map.get("ticketNo")));
+                    lineCell3.setCellValue(String.valueOf(map.get("ticketNo")).equals("null") ? "" : String.valueOf(map.get("ticketNo")));
                     lineCell3.setCellStyle(lineStyle);
-                    lineCell4.setCellValue(String.valueOf(map.get("materialName")).equals("null")?"":String.valueOf(map.get("materialName")) );
+                    lineCell4.setCellValue(String.valueOf(map.get("materialName")).equals("null") ? "" : String.valueOf(map.get("materialName")));
                     lineCell4.setCellStyle(lineStyle);
-                    lineCell5.setCellValue(String.valueOf(map.get("unit")).equals("null")?"":String.valueOf(map.get("unit")) );
+                    lineCell5.setCellValue(String.valueOf(map.get("unit")).equals("null") ? "" : String.valueOf(map.get("unit")));
                     lineCell5.setCellStyle(lineStyle);
 
-                    lineCell6.setCellValue( String.valueOf(map.get("grossWeight")).equals("null")?"":String.valueOf(map.get("grossWeight")) );
+                    lineCell6.setCellValue(String.valueOf(map.get("grossWeight")).equals("null") ? "" : String.valueOf(map.get("grossWeight")));
                     lineCell6.setCellStyle(lineStyle);
 
-                    lineCell7.setCellValue( String.valueOf(map.get("tareWeight")).equals("null")?"":String.valueOf(map.get("tareWeight")));
+                    lineCell7.setCellValue(String.valueOf(map.get("tareWeight")).equals("null") ? "" : String.valueOf(map.get("tareWeight")));
                     lineCell7.setCellStyle(lineStyle);
 
-                    lineCell8.setCellValue( String.valueOf(map.get("buckleWeight")).equals("null")?"":String.valueOf(map.get("buckleWeight")) );
+                    lineCell8.setCellValue(String.valueOf(map.get("buckleWeight")).equals("null") ? "" : String.valueOf(map.get("buckleWeight")));
                     lineCell8.setCellStyle(lineStyle);
 
-                    lineCell9.setCellValue( String.valueOf(map.get("settlement")).equals("null")?"":String.valueOf(map.get("settlement")));
+                    lineCell9.setCellValue(String.valueOf(map.get("settlement")).equals("null") ? "" : String.valueOf(map.get("settlement")));
                     lineCell9.setCellStyle(lineStyle);
                     String s = String.valueOf(map.get("settlement")).equals("null") ? "0" : String.valueOf(map.get("settlement"));
-                    sum=sum.add(new BigDecimal(s));
+                    sum = sum.add(new BigDecimal(s));
 
-                    if (i==list.size()-1){
+                    if (i == list.size() - 1) {
                         //使用 createRow() 方法创建第 0 行
-                        HSSFRow rowhead = sheet.createRow(( short ) 0 );
+                        HSSFRow rowhead = sheet.createRow((short) 0);
 // 使用 createCell() 方法创建单元格，并使用 setCellValue() 方法为单元格设置值
 
                         HSSFCell cell = rowhead.createCell(0);
                         String s1 = String.valueOf(map.get("supplierNm")).equals("null") ? "" : String.valueOf(map.get("supplierNm"));
-                        if (s1.equals("")){
+                        if (s1.equals("")) {
                             for (int i1 = 0; i1 < list.size(); i1++) {
                                 HashMap<String, Object> map1 = list.get(i1);
-                                if (!String.valueOf(map1.get("supplierNm")).equals("null")){
-                                    s1 =String.valueOf(map1.get("supplierNm"));
+                                if (!String.valueOf(map1.get("supplierNm")).equals("null")) {
+                                    s1 = String.valueOf(map1.get("supplierNm"));
                                 }
                             }
                         }
                         String s2 = String.valueOf(map.get("supplierName")).equals("null") ? "" : String.valueOf(map.get("supplierName"));
-                        if(s2.equals("")){
+                        if (s2.equals("")) {
                             for (int i1 = 0; i1 < list.size(); i1++) {
                                 HashMap<String, Object> map1 = list.get(i1);
-                                if (!String.valueOf(map1.get("supplierName")).equals("null")){
-                                    s2 =String.valueOf(map1.get("supplierName"));
+                                if (!String.valueOf(map1.get("supplierName")).equals("null")) {
+                                    s2 = String.valueOf(map1.get("supplierName"));
                                 }
                             }
                         }
-                        cell.setCellValue(s1+"收货明细表");
+                        cell.setCellValue(s1 + "收货明细表");
                         cell.setCellStyle(cellStyle);
                         //创建第一行
-                        HSSFRow row = sheet.createRow((short) 1 );
+                        HSSFRow row = sheet.createRow((short) 1);
 //在第一行插入数据
                         HSSFCell cell1 = row.createCell(0);
 
-                        cell1.setCellValue( "供货单位："+s2+"                       收货单位：" );
+                        cell1.setCellValue("供货单位：" + s2 + "                       收货单位：");
                         cell1.setCellStyle(headStyle);
                         //创建第二行
-                        HSSFRow row1 = sheet.createRow((short) 2 );
+                        HSSFRow row1 = sheet.createRow((short) 2);
 //在第二行插入数据
                         HSSFCell cell2 = row1.createCell(0);
                         HSSFCell cell3 = row1.createCell(1);
@@ -319,30 +316,30 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                         HSSFCell cell8 = row1.createCell(6);
                         HSSFCell cell9 = row1.createCell(7);
                         HSSFCell cell10 = row1.createCell(8);
-                        cell2.setCellValue( "序号" );
+                        cell2.setCellValue("序号");
                         cell2.setCellStyle(headLineStyle);
-                        cell3.setCellValue( "收货日期" );
+                        cell3.setCellValue("收货日期");
                         cell3.setCellStyle(headLineStyle);
-                        cell4.setCellValue( "送货车号" );
+                        cell4.setCellValue("送货车号");
                         cell4.setCellStyle(headLineStyle);
-                        cell5.setCellValue( "货物" );
+                        cell5.setCellValue("货物");
                         cell5.setCellStyle(headLineStyle);
-                        cell6.setCellValue( "单位" );
+                        cell6.setCellValue("单位");
                         cell6.setCellStyle(headLineStyle);
-                        cell7.setCellValue( "毛重" );
+                        cell7.setCellValue("毛重");
                         cell7.setCellStyle(headLineStyle);
-                        cell8.setCellValue( "皮重" );
+                        cell8.setCellValue("皮重");
                         cell8.setCellStyle(headLineStyle);
-                        cell9.setCellValue( "扣重" );
+                        cell9.setCellValue("扣重");
                         cell9.setCellStyle(headLineStyle);
-                        cell10.setCellValue( "结算重量" );
+                        cell10.setCellValue("结算重量");
                         cell10.setCellStyle(headLineStyle);
-                        HSSFRow lowRow = sheet.createRow((short) i+4 );
+                        HSSFRow lowRow = sheet.createRow((short) i + 4);
                         HSSFCell lowCell1 = lowRow.createCell(0);
                         HSSFCell lowCell2 = lowRow.createCell(8);
                         lowCell1.setCellValue("合计");
                         lowCell1.setCellStyle(lineStyle);
-                        sum.setScale(2,BigDecimal.ROUND_DOWN);
+                        sum.setScale(2, RoundingMode.DOWN);
                         lowCell2.setCellValue(sum.toString());
                         lowCell2.setCellStyle(lineStyle);
                         lowRow.createCell(1).setCellStyle(lineStyle);
@@ -367,13 +364,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             sheet.autoSizeColumn(8);
             sheet.setAutobreaks(true);//这个是sheet缩放设置，默认打印一页要true
 
-            sheet.setMargin(Sheet.BottomMargin,( double ) 0.5 );// 页边距（下）
+            sheet.setMargin(Sheet.BottomMargin, 0.5);// 页边距（下）
 
-            sheet.setMargin(Sheet.LeftMargin,( double ) 0.1 );// 页边距（左）
+            sheet.setMargin(Sheet.LeftMargin, 0.1);// 页边距（左）
 
-            sheet.setMargin(Sheet.RightMargin,( double ) 0.1 );// 页边距（右）
+            sheet.setMargin(Sheet.RightMargin, 0.1);// 页边距（右）
 
-            sheet.setMargin(Sheet.TopMargin,( double ) 0.5 );// 页边距（上）
+            sheet.setMargin(Sheet.TopMargin, 0.5);// 页边距（上）
 
             sheet.setHorizontallyCenter(true);//设置打印页面为水平居中
 
@@ -386,7 +383,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             sheet.setFitToPage(true);
 
 
-
             HSSFPrintSetup printSetup = sheet.getPrintSetup();
 
             printSetup.setLandscape(false); // 打印方向，true：横向，false：纵向
@@ -394,11 +390,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             printSetup.setPaperSize(HSSFPrintSetup.A4_PAPERSIZE); //纸张大小，自选A4 作者：大萌音音 https://www.bilibili.com/read/cv15053559 出处：bilibili
 
 
-
-
             workbook.write(fileOut);
 
-        }finally {
+        } finally {
 //关闭流
             fileOut.close();
 //关闭工作簿
@@ -406,72 +400,71 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         }
 
 //在控制台打印消息
-        log.warn( "Excel文件生成成功。" );
+        log.warn("Excel文件生成成功。");
 
     }
 
     /**
-     *
-     * @param wrapper 条件构造器
+     * @param wrapper          条件构造器
      * @param templateFilePath 临时文件路径
      * @throws Exception
      */
-    public void getPdf(LambdaQueryWrapper<PurchaseorderitemEntity> wrapper,String templateFilePath) throws Exception{
+    public void getPdf(LambdaQueryWrapper<PurchaseorderitemEntity> wrapper, String templateFilePath) throws Exception {
         for (HashMap<String, Object> orderMap : purchaseorderitemMapper.getPdfInfo(wrapper)) {
             byte[] bytes = null;
             HttpHeaders headers = null;
-            ByteArrayOutputStream out=null;
+            ByteArrayOutputStream out = null;
             ExportPdf exportPdf = new ExportPdf();
             //渲染模板参数
 //        pdf模板
-            Map map=orderMap;
+            Map map = orderMap;
 //
-            map.put("title","济钢城市矿产科技有限公司采购订单");
+            map.put("title", "济钢城市矿产科技有限公司采购订单");
             map.put("name", "城市矿产再生资源事业部");
-            List<HashMap<String,Object>> reportList = (List<HashMap<String,Object>>) map.get("reportList");
-            if (reportList!=null){
-                Integer settlement=0;
+            List<HashMap<String, Object>> reportList = (List<HashMap<String, Object>>) map.get("reportList");
+            if (reportList != null) {
+                Integer settlement = 0;
                 BigDecimal settlementSum = new BigDecimal(settlement);
-                Integer amount=0;
+                Integer amount = 0;
                 BigDecimal amountSum = new BigDecimal(amount);
                 BigDecimal decimal = new BigDecimal("0.00");
                 for (int i = 0; i < reportList.size(); i++) {
                     HashMap<String, Object> map1 = reportList.get(i);
-                    settlementSum=settlementSum.add( map1.get("settlement")!=null?(BigDecimal)map1.get("settlement"):decimal) ;
-                    amountSum=amountSum.add( map1.get("amount")!=null?(BigDecimal)map1.get("amount"):decimal) ;
+                    settlementSum = settlementSum.add(map1.get("settlement") != null ? (BigDecimal) map1.get("settlement") : decimal);
+                    amountSum = amountSum.add(map1.get("amount") != null ? (BigDecimal) map1.get("amount") : decimal);
                 }
-                map.put("settlementSum",settlementSum);
-                map.put("amountSum",amountSum);
+                map.put("settlementSum", settlementSum);
+                map.put("amountSum", amountSum);
             }
 //        word模板
             out = exportPdf.createPdf(map, "test.ftl", "/templates/export");
             bytes = out.toByteArray();
-            String fileName="废钢采购订单("+map.get("supplierName")+").pdf";
+            String fileName = "废钢采购订单(" + map.get("supplierName") + ").pdf";
 //            fileName = URLEncoder.encode(fileName, "utf-8");
 
 //        存在本地文件中
             InputStream inputStream = new ByteArrayInputStream(bytes);
             MultipartFile file = new MultipartFileDto(ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
 //        FileUtil.upFile(file, templateFilePath+"/wc/", fileName);
-                File f = new File(templateFilePath, fileName);
-                //将上传的文件存储到指定位置
-                file.transferTo(f);
-                inputStream.close();
-                log.warn("pdf文件生成成功！");
+            File f = new File(templateFilePath, fileName);
+            //将上传的文件存储到指定位置
+            file.transferTo(f);
+            inputStream.close();
+            log.warn("pdf文件生成成功！");
         }
     }
 
     /**
-     *@TODO 在临时路径生成word文件
-     * @param list word信息的数组
+     * @param list             word信息的数组
      * @param templateFilePath 临时路径
      * @throws Exception
+     * @TODO 在临时路径生成word文件
      */
-    public void getWord(List<HashMap<String,Object>> list ,String templateFilePath) throws Exception{
+    public void getWord(List<HashMap<String, Object>> list, String templateFilePath) throws Exception {
         //        创建一个新的word文件
         Document document = new Document();
         Section section = document.addSection();
-        String titleStr="";
+        String titleStr = "";
 //        ExcelExportUtil;
 //        WordUtil.getWriter().
         ParagraphStyle style = new ParagraphStyle(document);
@@ -486,20 +479,20 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         style2.getCharacterFormat().setFontName("Arial");
         style2.getCharacterFormat().setFontSize(18f);
         document.getStyles().add(style2);
-        if (list!=null&&list.size()>0){
+        if (list != null && list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 HashMap<String, Object> map = list.get(i);
-                if (i==0){
+                if (i == 0) {
                     Paragraph title = section.addParagraph();
-                    title.appendText(String.valueOf(map.get("supplierName")+"榜单图片"));
-                    titleStr=String.valueOf(map.get("supplierName"));
+                    title.appendText(map.get("supplierName") + "榜单图片");
+                    titleStr = String.valueOf(map.get("supplierName"));
                     title.getFormat().setHorizontalAlignment(HorizontalAlignment.Center);
 
                     title.applyStyle("titleStyle");
                     continue;
                 }
                 List<Map<String, Object>> imgList = FileCopy.getImageInfo(String.valueOf(map.get("poundPictures")));
-                if (imgList!=null&&imgList.size()>0){
+                if (imgList != null && imgList.size() > 0) {
                     for (int i1 = 0; i1 < imgList.size(); i1++) {
                         Map<String, Object> map1 = imgList.get(i1);
 //                        log.warn("路径"+(String)map1.get("filePath"));
@@ -510,20 +503,20 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                         Paragraph paragraph = section.addParagraph();
                         DocPicture pic = paragraph.appendPicture((String) map1.get("filePath"));
                         int picHeight = 300;
-                        int picWidth=250;
+                        int picWidth = 250;
                         Integer width = null;
 
                         Integer height = null;
 
 
-                        if (map1.get("width")!=null){
-                            width=      Integer.valueOf(String.valueOf(map1.get("width")));
+                        if (map1.get("width") != null) {
+                            width = Integer.valueOf(String.valueOf(map1.get("width")));
                         }
-                        if (map1.get("height")!=null){
-                           height=    Integer.valueOf(String.valueOf(map1.get("height")));
+                        if (map1.get("height") != null) {
+                            height = Integer.valueOf(String.valueOf(map1.get("height")));
                         }
-                        if (width!=null&&height!=null){
-                            picWidth= picHeight * width/height;
+                        if (width != null && height != null) {
+                            picWidth = picHeight * width / height;
                         }
 
                         pic.setWidth(picWidth);
@@ -532,30 +525,30 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 }
             }
             //生成word文档
-            document.saveToFile(templateFilePath+"废钢收获榜单照片("+titleStr+")).docx", FileFormat.Docx_2013);
+            document.saveToFile(templateFilePath + "废钢收获榜单照片(" + titleStr + ")).docx", FileFormat.Docx_2013);
             document.close();
             log.warn("word文档生成成功！");
         }
     }
 
     @Override
-    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity,HttpServletResponse response) throws Exception {
+    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity, HttpServletResponse response) throws Exception {
         //        临时文件夹地址
-        String templateFilePath = configValueUtil.getTemplateFilePath()+"info\\";
+        String templateFilePath = configValueUtil.getTemplateFilePath() + "info\\";
         FileCopy.createFile(templateFilePath);
         LambdaQueryWrapper<PurchaseorderitemEntity> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(PurchaseorderitemEntity::getDocumentNo,"cgdj2023020300000001");
-        wrapper.eq(PurchaseorderitemEntity::getDocumentNo,purchaseorderitemEntity.getDocumentNo());
+        wrapper.eq(PurchaseorderitemEntity::getDocumentNo, purchaseorderitemEntity.getDocumentNo());
 
         List<HashMap<String, Object>> info = purchaseorderitemMapper.getWordExcelInfo(wrapper);
-        if (info!=null&&info.size()>0){
+        if (info != null && info.size() > 0) {
             List<HashMap<String, Object>> vehicleInfo = purchaseorderitemMapper.getVehicleInfo(wrapper);
-            this.getPdf(wrapper,templateFilePath);
-            this.getWord(info,templateFilePath);
-            this.getExcel(info,templateFilePath);
-            this.getVehicle(vehicleInfo,templateFilePath);
-            this.getZIP(templateFilePath,response);
-        }else{
+            this.getPdf(wrapper, templateFilePath);
+            this.getWord(info, templateFilePath);
+            this.getExcel(info, templateFilePath);
+            this.getVehicle(vehicleInfo, templateFilePath);
+            this.getZIP(templateFilePath, response);
+        } else {
             log.error("采购订单号出错！查不到该采购订单！");
         }
 
@@ -563,158 +556,157 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
     public ResponseEntity<byte[]> getPdfInfoo() throws Exception {
 //        临时文件夹地址
-        String templateFilePath = configValueUtil.getTemplateFilePath()+"/wc/";
+        String templateFilePath = configValueUtil.getTemplateFilePath() + "/wc/";
         PurchaseorderPagination pagination = new PurchaseorderPagination();
         pagination.setDocumentNo("cgdj2023020300000001");
         List<PurchaseOrderVO> pMap = this.getPMap(pagination);
-if (pMap!=null&&pMap.size()>0){
-    PurchaseOrderVO pVO = pMap.get(0);
+        if (pMap != null && pMap.size() > 0) {
+            PurchaseOrderVO pVO = pMap.get(0);
 //    榜单图片地址
 //    榜单图片传输到指定文件夹
 
-    byte[] bytes = null;
-    HttpHeaders headers = null;
-    ByteArrayOutputStream out=null;
-    try {
-        ExportPdf exportPdf = new ExportPdf();
-        //渲染模板参数
+            byte[] bytes = null;
+            HttpHeaders headers = null;
+            ByteArrayOutputStream out = null;
+            try {
+                ExportPdf exportPdf = new ExportPdf();
+                //渲染模板参数
 //        pdf模板
-        Map map=new HashMap();
+                Map map = new HashMap();
 //        多个榜单的图片信息
-        ArrayList<HashMap<String,Object>> imgList = new ArrayList<>();
+                ArrayList<HashMap<String, Object>> imgList = new ArrayList<>();
 //        word模板
-        HashMap wordHashMap = new HashMap();
-        map.put("title","济钢城市矿产科技有限公司");
-        map.put("name", "城市矿产再生资源事业部");
-        map.put("creatorTime", pVO.getCreatorTime());
-        map.put("contractNo", pVO.getContractNo());
-        map.put("contractCode",pVO.getContractCode());
-        map.put("supplierName", pVO.getSupplierName());
-        map.put("documentNo",pVO.getDocumentNo());
-        List<PurchaseorderItemModelVO> list = pVO.getPurchaseorder_item0List();
-        Integer settlement=0;
-        BigDecimal settlementSum = new BigDecimal(settlement);
-        Integer amount=0;
-        BigDecimal amountSum = new BigDecimal(amount);
-        for (int i = 0; i < list.size(); i++) {
-            HashMap<String, Object> imgMap = new HashMap<>();
-            PurchaseorderItemModelVO model = list.get(i);
+                HashMap wordHashMap = new HashMap();
+                map.put("title", "济钢城市矿产科技有限公司");
+                map.put("name", "城市矿产再生资源事业部");
+                map.put("creatorTime", pVO.getCreatorTime());
+                map.put("contractNo", pVO.getContractNo());
+                map.put("contractCode", pVO.getContractCode());
+                map.put("supplierName", pVO.getSupplierName());
+                map.put("documentNo", pVO.getDocumentNo());
+                List<PurchaseorderItemModelVO> list = pVO.getPurchaseorder_item0List();
+                Integer settlement = 0;
+                BigDecimal settlementSum = new BigDecimal(settlement);
+                Integer amount = 0;
+                BigDecimal amountSum = new BigDecimal(amount);
+                for (int i = 0; i < list.size(); i++) {
+                    HashMap<String, Object> imgMap = new HashMap<>();
+                    PurchaseorderItemModelVO model = list.get(i);
 //            log.warn("报错点"+model.getAmount());
 //            log.warn("报错点"+model.getAmount().isEmpty());
 //            log.warn("报错点"+model.getAmount().equals("null"));
-            settlementSum=settlementSum.add(new BigDecimal(model.getSettlement()==null?"0.00000000":model.getSettlement())) ;
-            amountSum=amountSum.add(new BigDecimal(model.getAmount()==null?"0.00000000":model.getAmount()));
-            model.setSettlement(new BigDecimal(model.getSettlement()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString());
-            model.setPrice(new BigDecimal(model.getPrice()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString());
-            model.setAmount(new BigDecimal(model.getAmount()==null?"0.00000000":model.getAmount()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString());
+                    settlementSum = settlementSum.add(new BigDecimal(model.getSettlement() == null ? "0.00000000" : model.getSettlement()));
+                    amountSum = amountSum.add(new BigDecimal(model.getAmount() == null ? "0.00000000" : model.getAmount()));
+                    model.setSettlement(new BigDecimal(model.getSettlement()).setScale(2, RoundingMode.HALF_DOWN).toString());
+                    model.setPrice(new BigDecimal(model.getPrice()).setScale(2, RoundingMode.HALF_DOWN).toString());
+                    model.setAmount(new BigDecimal(model.getAmount() == null ? "0.00000000" : model.getAmount()).setScale(2, RoundingMode.HALF_DOWN).toString());
 //            客户名称
-            String supplierNm = model.getSupplierNm();
-            imgMap.put("supplierNm",supplierNm);
+                    String supplierNm = model.getSupplierNm();
+                    imgMap.put("supplierNm", supplierNm);
 //            车辆图片地址
-            String vehiclePictures = model.getVehiclePictures();
+                    String vehiclePictures = model.getVehiclePictures();
 //            榜单图片地址
-            String pictures = model.getPoundPictures();
-            imgMap.put("pictures",FileCopy.getImageInfo(pictures));
-            imgList.add(imgMap);
-        }
-        wordHashMap.put("imgList",imgList);
+                    String pictures = model.getPoundPictures();
+                    imgMap.put("pictures", FileCopy.getImageInfo(pictures));
+                    imgList.add(imgMap);
+                }
+                wordHashMap.put("imgList", imgList);
 //        log.warn(wordHashMap.toString());
 //        String word = new ExportPdf().createWord(wordHashMap, "doc.ftl");
 //        FileUtils.write(new File(templateFilePath+"file.doc"), word.toString(),"UTF-8");
 //        创建一个新的word文件
-        Document document = new Document();
-        Section section = document.addSection();
-
-        Paragraph title = section.addParagraph();
-        title.appendText(String.valueOf(map.get("supplierName")+"榜单图片"));
-        ParagraphStyle style = new ParagraphStyle(document);
-        style.setName("titleStyle");
-        style.getCharacterFormat().setBold(true);
-        style.getCharacterFormat().setTextColor(Color.BLUE);
-        style.getCharacterFormat().setFontName("Arial");
-        style.getCharacterFormat().setFontSize(22f);
-        title.getFormat().setHorizontalAlignment(HorizontalAlignment.Center);
-        document.getStyles().add(style);
-        title.applyStyle("titleStyle");
-
-        ParagraphStyle style2 = new ParagraphStyle(document);
-        style2.setName("paraStyle");
-        style2.getCharacterFormat().setFontName("Arial");
-        style2.getCharacterFormat().setFontSize(18f);
-        document.getStyles().add(style2);
-
-        List<Map<String,Object>>  pictures =( List<Map<String,Object>>)  wordHashMap.get("imgList");
-        for (int i = 0; i < pictures.size(); i++) {
-            Map<String, Object> map1 = pictures.get(i);
-            if (map1.get("pictures")!=null){
-                 List<Map<String,Object>> pictures1 = ( List<Map<String,Object>>) map1.get("pictures");
-                for (int i1 = 0; i1 < pictures1.size(); i1++) {
-                    Map<String, Object> map2 = pictures1.get(i1);
-                    if(map2.get("filePath")!=null&&!String.valueOf(map2.get("filePath")).equals("null")){
-                        log.warn("路径"+(String)map2.get("filePath"));
-                        //        添加一个段落
-                        Paragraph paragraph1 = section.addParagraph();
-                        paragraph1.appendText(String.valueOf(map1.get("supplierNm")));
-                        paragraph1.applyStyle("paraStyle");
-                        Paragraph paragraph = section.addParagraph();
-
-                        DocPicture pic = paragraph.appendPicture((String) map2.get("filePath"));
-                        if (map2.get("width")!=null){
-                            pic.setWidth(Float.valueOf(String.valueOf(map2.get("width")+"f")));
-                        }
-                        if (map2.get("height")!=null){
-                            pic.setHeight(Float.valueOf(String.valueOf(map2.get("height")+"f")));
+                Document document = new Document();
+                Section section = document.addSection();
+
+                Paragraph title = section.addParagraph();
+                title.appendText(map.get("supplierName") + "榜单图片");
+                ParagraphStyle style = new ParagraphStyle(document);
+                style.setName("titleStyle");
+                style.getCharacterFormat().setBold(true);
+                style.getCharacterFormat().setTextColor(Color.BLUE);
+                style.getCharacterFormat().setFontName("Arial");
+                style.getCharacterFormat().setFontSize(22f);
+                title.getFormat().setHorizontalAlignment(HorizontalAlignment.Center);
+                document.getStyles().add(style);
+                title.applyStyle("titleStyle");
+
+                ParagraphStyle style2 = new ParagraphStyle(document);
+                style2.setName("paraStyle");
+                style2.getCharacterFormat().setFontName("Arial");
+                style2.getCharacterFormat().setFontSize(18f);
+                document.getStyles().add(style2);
+
+                List<Map<String, Object>> pictures = (List<Map<String, Object>>) wordHashMap.get("imgList");
+                for (int i = 0; i < pictures.size(); i++) {
+                    Map<String, Object> map1 = pictures.get(i);
+                    if (map1.get("pictures") != null) {
+                        List<Map<String, Object>> pictures1 = (List<Map<String, Object>>) map1.get("pictures");
+                        for (int i1 = 0; i1 < pictures1.size(); i1++) {
+                            Map<String, Object> map2 = pictures1.get(i1);
+                            if (map2.get("filePath") != null && !String.valueOf(map2.get("filePath")).equals("null")) {
+                                log.warn("路径" + map2.get("filePath"));
+                                //        添加一个段落
+                                Paragraph paragraph1 = section.addParagraph();
+                                paragraph1.appendText(String.valueOf(map1.get("supplierNm")));
+                                paragraph1.applyStyle("paraStyle");
+                                Paragraph paragraph = section.addParagraph();
+
+                                DocPicture pic = paragraph.appendPicture((String) map2.get("filePath"));
+                                if (map2.get("width") != null) {
+                                    pic.setWidth(Float.valueOf(map2.get("width") + "f"));
+                                }
+                                if (map2.get("height") != null) {
+                                    pic.setHeight(Float.valueOf(map2.get("height") + "f"));
+                                }
+                            }
                         }
                     }
                 }
-            }
-        }
 //生成word文档
-        document.saveToFile(templateFilePath+"doc.docx", FileFormat.Docx_2013);
-        map.put("settlementSum",settlementSum.setScale(2,BigDecimal.ROUND_HALF_DOWN).toString());
-        map.put("amountSum",amountSum.setScale(2,BigDecimal.ROUND_HALF_DOWN).toString() );
-        map.put("reportList", list);
-        //repotData自己加测试数据
-
-        out = exportPdf.createPdf(map, "test.ftl", "/templates/export");
-        bytes = out.toByteArray();
-        String fileName="废钢采购订单("+map.get("supplierName")+")("+map.get("creatorTime")+").pdf";
-        fileName = URLEncoder.encode(fileName, "utf-8");
-        headers = new HttpHeaders();
-        headers.add("Content-Disposition",
-                "attachment; filename=" + fileName);
+                document.saveToFile(templateFilePath + "doc.docx", FileFormat.Docx_2013);
+                map.put("settlementSum", settlementSum.setScale(2, RoundingMode.HALF_DOWN).toString());
+                map.put("amountSum", amountSum.setScale(2, RoundingMode.HALF_DOWN).toString());
+                map.put("reportList", list);
+                //repotData自己加测试数据
+
+                out = exportPdf.createPdf(map, "test.ftl", "/templates/export");
+                bytes = out.toByteArray();
+                String fileName = "废钢采购订单(" + map.get("supplierName") + ")(" + map.get("creatorTime") + ").pdf";
+                fileName = URLEncoder.encode(fileName, "utf-8");
+                headers = new HttpHeaders();
+                headers.add("Content-Disposition",
+                        "attachment; filename=" + fileName);
 //        存在本地文件中
-        InputStream inputStream = new ByteArrayInputStream(bytes);
-        MultipartFile file = new MultipartFileDto(ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
+                InputStream inputStream = new ByteArrayInputStream(bytes);
+                MultipartFile file = new MultipartFileDto(ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
 
 
 //        FileUtil.upFile(file, templateFilePath+"/wc/", fileName);
-        try {
-            File f = new File(templateFilePath, fileName);
-            //将上传的文件存储到指定位置
-            file.transferTo(f);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
+                try {
+                    File f = new File(templateFilePath, fileName);
+                    //将上传的文件存储到指定位置
+                    file.transferTo(f);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 
 
-        //"attachment; filename=" + new String(fileName.getBytes("gbk"), StandardCharsets.ISO_8859_1));
-    } catch (Exception e) {
-        log.error("导出pdf失败:{}", e);
+                //"attachment; filename=" + new String(fileName.getBytes("gbk"), StandardCharsets.ISO_8859_1));
+            } catch (Exception e) {
+                log.error("导出pdf失败:{}", e);
 //            throw new SubBusinessException(ErrorCode.FILE_DOWNLOAD_ERROR, "导出pdf失败!");
 
-    }finally {
-        if (null!=out){
-            try {
-                out.close();
-            } catch (IOException e) {
-                log.error("out close error:{}", e);
+            } finally {
+                if (null != out) {
+                    try {
+                        out.close();
+                    } catch (IOException e) {
+                        log.error("out close error:{}", e);
+                    }
+                }
             }
+            return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
         }
-    }
-    return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
-}
         return null;
     }
 
@@ -722,145 +714,145 @@ if (pMap!=null&&pMap.size()>0){
     public List<PurchaseOrderVO> getPMap(PurchaseorderPagination purchaseorderPagination) {
 //        QueryWrapper<PurchaseorderitemEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<PurchaseorderitemEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PurchaseorderitemEntity::getDocumentNo,purchaseorderPagination.getDocumentNo());
+        wrapper.eq(PurchaseorderitemEntity::getDocumentNo, purchaseorderPagination.getDocumentNo());
         return purchaseorderitemMapper.getPurchorderItemMap(wrapper);
     }
 
     @Override
-    public List<PurchaseorderitemEntity> getList(PurchaseorderPagination purchaseorderPagination){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        int total=0;
-        int purchaseorderNum =0;
-        QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
-        int purchaseorder_item0Num =0;
-        QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper=new QueryWrapper<>();
-        int purchasebackitemNum =0;
-        QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper=new QueryWrapper<>();
-        int invoices_item0itemNum =0;
-        QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper=new QueryWrapper<>();
-        int paymentitemNum =0;
-        QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
-        int collectionitemNum =0;
-        QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
-    boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    if(isPc && pcPermission){
-        if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
-            if (ObjectUtil.isEmpty(purchaseorderObj)){
-                return new ArrayList<>();
-            } else {
-                purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
-                purchaseorderNum++;
-            }
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
-            if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
-                return new ArrayList<>();
-            } else {
-                purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
-                purchaseorder_item0Num++;
-            }
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
-            if (ObjectUtil.isEmpty(purchasebackitemObj)){
-                return new ArrayList<>();
-            } else {
-                purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
-                purchasebackitemNum++;
-            }
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
-            if (ObjectUtil.isEmpty(invoices_item0itemObj)){
-                return new ArrayList<>();
-            } else {
-                invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
-                invoices_item0itemNum++;
-            }
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
-            if (ObjectUtil.isEmpty(paymentitemObj)){
-                return new ArrayList<>();
-            } else {
-                paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
-                paymentitemNum++;
-            }
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
-            if (ObjectUtil.isEmpty(collectionitemObj)){
-                return new ArrayList<>();
-            } else {
-                collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
-                collectionitemNum++;
+    public List<PurchaseorderitemEntity> getList(PurchaseorderPagination purchaseorderPagination) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        int total = 0;
+        int purchaseorderNum = 0;
+        QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper = new QueryWrapper<>();
+        int purchaseorder_item0Num = 0;
+        QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper = new QueryWrapper<>();
+        int purchasebackitemNum = 0;
+        QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper = new QueryWrapper<>();
+        int invoices_item0itemNum = 0;
+        QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper = new QueryWrapper<>();
+        int paymentitemNum = 0;
+        QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper = new QueryWrapper<>();
+        int collectionitemNum = 0;
+        QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper = new QueryWrapper<>();
+        boolean pcPermission = false;
+        boolean appPermission = false;
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder"));
+                if (ObjectUtil.isEmpty(purchaseorderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>) purchaseorderObj;
+                    purchaseorderNum++;
+                }
+                Object purchaseorder_item0Obj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder_item0"));
+                if (ObjectUtil.isEmpty(purchaseorder_item0Obj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>) purchaseorder_item0Obj;
+                    purchaseorder_item0Num++;
+                }
+                Object purchasebackitemObj = authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper, purchaseorderPagination.getMenuId(), "purchasebackitem"));
+                if (ObjectUtil.isEmpty(purchasebackitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>) purchasebackitemObj;
+                    purchasebackitemNum++;
+                }
+                Object invoices_item0itemObj = authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper, purchaseorderPagination.getMenuId(), "invoices_item0item"));
+                if (ObjectUtil.isEmpty(invoices_item0itemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>) invoices_item0itemObj;
+                    invoices_item0itemNum++;
+                }
+                Object paymentitemObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper, purchaseorderPagination.getMenuId(), "paymentitem"));
+                if (ObjectUtil.isEmpty(paymentitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>) paymentitemObj;
+                    paymentitemNum++;
+                }
+                Object collectionitemObj = authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper, purchaseorderPagination.getMenuId(), "collectionitem"));
+                if (ObjectUtil.isEmpty(collectionitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>) collectionitemObj;
+                    collectionitemNum++;
+                }
             }
         }
-    }
-    if(!isPc && appPermission){
-        if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
-            if (ObjectUtil.isEmpty(purchaseorderObj)){
-                return new ArrayList<>();
-            } else {
-            purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
-             purchaseorderNum++;
-            }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder"));
+                if (ObjectUtil.isEmpty(purchaseorderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>) purchaseorderObj;
+                    purchaseorderNum++;
+                }
 
 
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
-            if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
-                return new ArrayList<>();
-            } else {
-            purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
-             purchaseorder_item0Num++;
-            }
+                Object purchaseorder_item0Obj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder_item0"));
+                if (ObjectUtil.isEmpty(purchaseorder_item0Obj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>) purchaseorder_item0Obj;
+                    purchaseorder_item0Num++;
+                }
 
 
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
-            if (ObjectUtil.isEmpty(purchasebackitemObj)){
-                return new ArrayList<>();
-            } else {
-            purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
-             purchasebackitemNum++;
-            }
+                Object purchasebackitemObj = authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper, purchaseorderPagination.getMenuId(), "purchasebackitem"));
+                if (ObjectUtil.isEmpty(purchasebackitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>) purchasebackitemObj;
+                    purchasebackitemNum++;
+                }
 
 
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
-            if (ObjectUtil.isEmpty(invoices_item0itemObj)){
-                return new ArrayList<>();
-            } else {
-            invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
-             invoices_item0itemNum++;
-            }
+                Object invoices_item0itemObj = authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper, purchaseorderPagination.getMenuId(), "invoices_item0item"));
+                if (ObjectUtil.isEmpty(invoices_item0itemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>) invoices_item0itemObj;
+                    invoices_item0itemNum++;
+                }
 
 
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
-            if (ObjectUtil.isEmpty(paymentitemObj)){
-                return new ArrayList<>();
-            } else {
-            paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
-             paymentitemNum++;
-            }
+                Object paymentitemObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper, purchaseorderPagination.getMenuId(), "paymentitem"));
+                if (ObjectUtil.isEmpty(paymentitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>) paymentitemObj;
+                    paymentitemNum++;
+                }
 
 
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
-            if (ObjectUtil.isEmpty(collectionitemObj)){
-                return new ArrayList<>();
-            } else {
-            collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
-             collectionitemNum++;
-            }
+                Object collectionitemObj = authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper, purchaseorderPagination.getMenuId(), "collectionitem"));
+                if (ObjectUtil.isEmpty(collectionitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>) collectionitemObj;
+                    collectionitemNum++;
+                }
 
 
             }
         }
-        if(StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())){
-            List<String> PoundDateList =  purchaseorderPagination.getCreatorTime();
+        if (StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())) {
+            List<String> PoundDateList = purchaseorderPagination.getCreatorTime();
             Long fir = Long.valueOf(PoundDateList.get(0));
             Long sec = Long.valueOf(PoundDateList.get(1));
             purchaseorderPagination.setStartDate(new Date(fir));
             purchaseorderPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
         }
-        if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){
+        if (StringUtil.isEmpty(purchaseorderPagination.getSidx())) {
             purchaseorderPagination.setSidx("CREATOR_TIME");
             purchaseorderPagination.setSort("DESC");
-        }else{
+        } else {
             try {
                 String sidx = purchaseorderPagination.getSidx();
                 PoundlistEntity poundlistEntity = new PoundlistEntity();
@@ -872,9 +864,9 @@ if (pMap!=null&&pMap.size()>0){
                 e.printStackTrace();
             }
         }
-        Page<PurchaseorderitemEntity> page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
+        Page<PurchaseorderitemEntity> page = new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
         IPage<PurchaseorderitemEntity> iPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
-        return purchaseorderPagination.setData(iPage.getRecords(),iPage.getTotal());
+        return purchaseorderPagination.setData(iPage.getRecords(), iPage.getTotal());
 
 
 
@@ -952,237 +944,240 @@ if (pMap!=null&&pMap.size()>0){
             return purchaseorderPagination.setData(list, list.size());
         }*/
     }
+
     @Override
-    public List<PurchaseorderitemEntity> getTypeList(PurchaseorderPagination purchaseorderPagination, String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        int total=0;
-        int purchaseorderNum =0;
-        QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
-        int purchaseorder_item0Num =0;
-        QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper=new QueryWrapper<>();
-        int purchasebackitemNum =0;
-        QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper=new QueryWrapper<>();
-        int invoices_item0itemNum =0;
-        QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper=new QueryWrapper<>();
-        int paymentitemNum =0;
-        QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
-        int collectionitemNum =0;
-        QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = false;
-    boolean appPermission = false;
-    boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    if(isPc && pcPermission){
-        if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
-            if (ObjectUtil.isEmpty(purchaseorderObj)){
-                return new ArrayList<>();
-            } else {
-                purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
-                purchaseorderNum++;
-            }
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
-            if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
-                return new ArrayList<>();
-            } else {
-                purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
-                purchaseorder_item0Num++;
-            }
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
-            if (ObjectUtil.isEmpty(purchasebackitemObj)){
-                return new ArrayList<>();
-            } else {
-                purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
-                purchasebackitemNum++;
-            }
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
-            if (ObjectUtil.isEmpty(invoices_item0itemObj)){
-                return new ArrayList<>();
-            } else {
-                invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
-                invoices_item0itemNum++;
-            }
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
-            if (ObjectUtil.isEmpty(paymentitemObj)){
-                return new ArrayList<>();
-            } else {
-                paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
-                paymentitemNum++;
-            }
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
-            if (ObjectUtil.isEmpty(collectionitemObj)){
-                return new ArrayList<>();
-            } else {
-                collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
-                collectionitemNum++;
+    public List<PurchaseorderitemEntity> getTypeList(PurchaseorderPagination purchaseorderPagination, String dataType) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        int total = 0;
+        int purchaseorderNum = 0;
+        QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper = new QueryWrapper<>();
+        int purchaseorder_item0Num = 0;
+        QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper = new QueryWrapper<>();
+        int purchasebackitemNum = 0;
+        QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper = new QueryWrapper<>();
+        int invoices_item0itemNum = 0;
+        QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper = new QueryWrapper<>();
+        int paymentitemNum = 0;
+        QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper = new QueryWrapper<>();
+        int collectionitemNum = 0;
+        QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper = new QueryWrapper<>();
+        boolean pcPermission = false;
+        boolean appPermission = false;
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder"));
+                if (ObjectUtil.isEmpty(purchaseorderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>) purchaseorderObj;
+                    purchaseorderNum++;
+                }
+                Object purchaseorder_item0Obj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder_item0"));
+                if (ObjectUtil.isEmpty(purchaseorder_item0Obj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>) purchaseorder_item0Obj;
+                    purchaseorder_item0Num++;
+                }
+                Object purchasebackitemObj = authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper, purchaseorderPagination.getMenuId(), "purchasebackitem"));
+                if (ObjectUtil.isEmpty(purchasebackitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>) purchasebackitemObj;
+                    purchasebackitemNum++;
+                }
+                Object invoices_item0itemObj = authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper, purchaseorderPagination.getMenuId(), "invoices_item0item"));
+                if (ObjectUtil.isEmpty(invoices_item0itemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>) invoices_item0itemObj;
+                    invoices_item0itemNum++;
+                }
+                Object paymentitemObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper, purchaseorderPagination.getMenuId(), "paymentitem"));
+                if (ObjectUtil.isEmpty(paymentitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>) paymentitemObj;
+                    paymentitemNum++;
+                }
+                Object collectionitemObj = authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper, purchaseorderPagination.getMenuId(), "collectionitem"));
+                if (ObjectUtil.isEmpty(collectionitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>) collectionitemObj;
+                    collectionitemNum++;
+                }
             }
         }
-    }
-    if(!isPc && appPermission){
-        if (!userProvider.get().getIsAdministrator()){
-            Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
-            if (ObjectUtil.isEmpty(purchaseorderObj)){
-                return new ArrayList<>();
-            } else {
-            purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
-             purchaseorderNum++;
-            }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder"));
+                if (ObjectUtil.isEmpty(purchaseorderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>) purchaseorderObj;
+                    purchaseorderNum++;
+                }
 
 
-            Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
-            if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
-                return new ArrayList<>();
-            } else {
-            purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
-             purchaseorder_item0Num++;
-            }
+                Object purchaseorder_item0Obj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper, purchaseorderPagination.getMenuId(), "purchaseorder_item0"));
+                if (ObjectUtil.isEmpty(purchaseorder_item0Obj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>) purchaseorder_item0Obj;
+                    purchaseorder_item0Num++;
+                }
 
 
-            Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
-            if (ObjectUtil.isEmpty(purchasebackitemObj)){
-                return new ArrayList<>();
-            } else {
-            purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
-             purchasebackitemNum++;
-            }
+                Object purchasebackitemObj = authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper, purchaseorderPagination.getMenuId(), "purchasebackitem"));
+                if (ObjectUtil.isEmpty(purchasebackitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>) purchasebackitemObj;
+                    purchasebackitemNum++;
+                }
 
 
-            Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
-            if (ObjectUtil.isEmpty(invoices_item0itemObj)){
-                return new ArrayList<>();
-            } else {
-            invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
-             invoices_item0itemNum++;
-            }
+                Object invoices_item0itemObj = authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper, purchaseorderPagination.getMenuId(), "invoices_item0item"));
+                if (ObjectUtil.isEmpty(invoices_item0itemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>) invoices_item0itemObj;
+                    invoices_item0itemNum++;
+                }
 
 
-            Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
-            if (ObjectUtil.isEmpty(paymentitemObj)){
-                return new ArrayList<>();
-            } else {
-            paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
-             paymentitemNum++;
-            }
+                Object paymentitemObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper, purchaseorderPagination.getMenuId(), "paymentitem"));
+                if (ObjectUtil.isEmpty(paymentitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>) paymentitemObj;
+                    paymentitemNum++;
+                }
 
 
-            Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
-            if (ObjectUtil.isEmpty(collectionitemObj)){
-                return new ArrayList<>();
-            } else {
-            collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
-             collectionitemNum++;
-            }
+                Object collectionitemObj = authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper, purchaseorderPagination.getMenuId(), "collectionitem"));
+                if (ObjectUtil.isEmpty(collectionitemObj)) {
+                    return new ArrayList<>();
+                } else {
+                    collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>) collectionitemObj;
+                    collectionitemNum++;
+                }
 
 
+            }
         }
-    }
-        if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())){
+        if (StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())) {
             purchaseorderNum++;
-            purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getDocumentNo,purchaseorderPagination.getDocumentNo());
-                    }
+            purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getDocumentNo, purchaseorderPagination.getDocumentNo());
+        }
 
-        if(AllIdList.size()>0){
-        purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getId, AllIdList);
+        if (AllIdList.size() > 0) {
+            purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getId, AllIdList);
         }
         //排序
-        if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){
-        purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId);
-        }else{
+        if (StringUtil.isEmpty(purchaseorderPagination.getSidx())) {
+            purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId);
+        } else {
             try {
                 String sidx = purchaseorderPagination.getSidx();
                 PurchaseorderitemEntity purchaseorderitemEntity = new PurchaseorderitemEntity();
                 Field declaredField = purchaseorderitemEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                 purchaseorderQueryWrapper="asc".equals(purchaseorderPagination.getSort().toLowerCase())?purchaseorderQueryWrapper.orderByAsc(value):purchaseorderQueryWrapper.orderByDesc(value);
+                purchaseorderQueryWrapper = "asc".equalsIgnoreCase(purchaseorderPagination.getSort()) ? purchaseorderQueryWrapper.orderByAsc(value) : purchaseorderQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<PurchaseorderitemEntity> page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
-                IPage<PurchaseorderitemEntity> userIPage=this.page(page, purchaseorderQueryWrapper);
-                return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<PurchaseorderitemEntity> page = new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
+                IPage<PurchaseorderitemEntity> userIPage = this.page(page, purchaseorderQueryWrapper);
+                return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<PurchaseorderitemEntity> list = new ArrayList();
                 return purchaseorderPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(purchaseorderQueryWrapper);
         }
     }
 
     @Override
-    public PurchaseorderitemEntity getInfo(String id){
-        QueryWrapper<PurchaseorderitemEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(PurchaseorderitemEntity::getId,id);
+    public PurchaseorderitemEntity getInfo(String id) {
+        QueryWrapper<PurchaseorderitemEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PurchaseorderitemEntity::getId, id);
         return this.getOne(queryWrapper);
     }
 
     @Override
-    public void create(PurchaseorderitemEntity entity){
+    public void create(PurchaseorderitemEntity entity) {
         this.save(entity);
     }
 
     @Override
-    public boolean update(String id, PurchaseorderitemEntity entity){
+    public boolean update(String id, PurchaseorderitemEntity entity) {
         entity.setId(id);
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(PurchaseorderitemEntity entity){
-        if(entity!=null){
+    public void delete(PurchaseorderitemEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
+
     //子表方法
     @Override
-    public List<Purchaseorder_item0Entity> GetPurchaseorder_item0List(String id){
+    public List<Purchaseorder_item0Entity> GetPurchaseorder_item0List(String id) {
         QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, id);
         return purchaseorder_item0Service.list(queryWrapper);
     }
 
     @Override
-    public List<Invoices_item0itemEntity> GetInvoices_item0itemList(String id){
+    public List<Invoices_item0itemEntity> GetInvoices_item0itemList(String id) {
         QueryWrapper<Invoices_item0itemEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(Invoices_item0itemEntity::getInvoicesId, id);
         return invoices_item0itemService.list(queryWrapper);
     }
 
     @Override
-    public List<Receiptin_item0Entity> GetReceiptin_item0itemList(String id){
+    public List<Receiptin_item0Entity> GetReceiptin_item0itemList(String id) {
         QueryWrapper<ReceiptinEntity> receiptinQueryWrapper = new QueryWrapper<>();
         receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
         ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinQueryWrapper);
         List<Receiptin_item0Entity> list = new ArrayList<>();
         //查询入库信息
-        if(receiptinEntity != null){
+        if (receiptinEntity != null) {
             list = receiptin_item0Service.queryByReceiptinId(receiptinEntity.getId());
         }
         return list;
     }
 
     @Override
-    public List<PaymentitemEntity> GetPaymentitemList(String id){
+    public List<PaymentitemEntity> GetPaymentitemList(String id) {
         QueryWrapper<PaymentitemEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno, id);
         return paymentitemService.list(queryWrapper);
     }
 
     @Override
-    public List<PurchasebackitemEntity> GetPurchasebackitemList(String id){
+    public List<PurchasebackitemEntity> GetPurchasebackitemList(String id) {
         QueryWrapper<PurchasebackitemEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, id);
         return purchasebackitemService.list(queryWrapper);
     }
 
     @Override
-    public List<CollectionpoEntity> GetCollectionitemList(String id){
+    public List<CollectionpoEntity> GetCollectionitemList(String id) {
         QueryWrapper<CollectionpoEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CollectionpoEntity::getSalesOrderNo, id);
-        queryWrapper.lambda().eq(CollectionpoEntity::getPaymentType,3);
+        queryWrapper.lambda().eq(CollectionpoEntity::getPaymentType, 3);
         return collectionpoService.list(queryWrapper);
     }
 
@@ -1190,31 +1185,30 @@ if (pMap!=null&&pMap.size()>0){
     public void getVehicle(List<HashMap<String, Object>> vehicleInfo, String templateFilePath) throws Exception {
 //        BufferedInputStream input = null;
 //        BufferedOutputStream out = null;
-        try{
-            if (vehicleInfo!=null&&vehicleInfo.size()>0){
-                for (int i = 0; i < vehicleInfo.size(); i++) {
-                    HashMap<String, Object> map = vehicleInfo.get(i);
-                    List<Map<String, Object>> list = FileCopy.getImageInfo(String.valueOf(map.get("vehiclePictures")).equals("null") ? "null" : String.valueOf(map.get("vehiclePictures")));
-                    if (list!=null&&list.size()>0){
-                        for (int i1 = 0; i1 < list.size(); i1++) {
-                            Map<String, Object> stringObjectMap = list.get(i1);
-                           if (!String.valueOf(stringObjectMap.get("filePath")).equals("null")){
-                               String s = String.valueOf(stringObjectMap.get("filePath"));
-                               File vehicleImg = new File(s);
-                               String s2 = String.valueOf(map.get("ticketNo")).equals("null")?"":String.valueOf(map.get("ticketNo"));
-                               String s3 = String.valueOf(map.get("drivername")).equals("null")?"":String.valueOf(map.get("drivername"));
-                               String s4 = String.valueOf(map.get("contact")).equals("null")?"":String.valueOf(map.get("contact"));
-
-
-                               String s1 = String.valueOf( i+"-"+s2+s3 + s4);
-                               File outImg = new File(templateFilePath+"vehicle\\"+s1+"\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png");
-                               File parentFile = outImg.getParentFile();
-                               if (!parentFile.exists()){
-                                   parentFile.mkdirs();
-                               }
+        if (vehicleInfo != null && vehicleInfo.size() > 0) {
+            for (int i = 0; i < vehicleInfo.size(); i++) {
+                HashMap<String, Object> map = vehicleInfo.get(i);
+                List<Map<String, Object>> list = FileCopy.getImageInfo(String.valueOf(map.get("vehiclePictures")).equals("null") ? "null" : String.valueOf(map.get("vehiclePictures")));
+                if (list != null && list.size() > 0) {
+                    for (int i1 = 0; i1 < list.size(); i1++) {
+                        Map<String, Object> stringObjectMap = list.get(i1);
+                        if (!String.valueOf(stringObjectMap.get("filePath")).equals("null")) {
+                            String s = String.valueOf(stringObjectMap.get("filePath"));
+                            File vehicleImg = new File(s);
+                            String s2 = String.valueOf(map.get("ticketNo")).equals("null") ? "" : String.valueOf(map.get("ticketNo"));
+                            String s3 = String.valueOf(map.get("drivername")).equals("null") ? "" : String.valueOf(map.get("drivername"));
+                            String s4 = String.valueOf(map.get("contact")).equals("null") ? "" : String.valueOf(map.get("contact"));
+
+
+                            String s1 = String.valueOf(i + "-" + s2 + s3 + s4);
+                            File outImg = new File(templateFilePath + "vehicle\\" + s1 + "\\" + UUID.randomUUID().toString().replaceAll("-", "") + ".png");
+                            File parentFile = outImg.getParentFile();
+                            if (!parentFile.exists()) {
+                                parentFile.mkdirs();
+                            }
 //                               log.warn(templateFilePath+s1+"\\"+"vehicle\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png");
 //
-                               FileCopy.copyFile(vehicleImg,templateFilePath+"vehicle\\"+s1+"\\");
+                            FileCopy.copyFile(vehicleImg, templateFilePath + "vehicle\\" + s1 + "\\");
 //                                   input = new BufferedInputStream(new FileInputStream(vehicleImg));
 //                                   out = new BufferedOutputStream(new FileOutputStream(outImg));
 //                                   byte[] bys = new byte[1024];
@@ -1224,19 +1218,10 @@ if (pMap!=null&&pMap.size()>0){
 //                                       out.write(bys, 0, len);
 //                                   }
 //
-                           }
                         }
                     }
                 }
             }
-        }finally {
-//            if (input!=null){
-//                input.close();
-//            }
-//           if (out!=null){
-//               out.close();
-//           }
-
         }
 
     }
@@ -1244,18 +1229,18 @@ if (pMap!=null&&pMap.size()>0){
     @Override
     public void getZIP(String templateFilePath, HttpServletResponse response) throws Exception {
         OutputStream toClient = null;
-        String s=null;
-        File file1=null;
+        String s = null;
+        File file1 = null;
         try {
-            file1 = new File(templateFilePath );
-            if (!file1.exists()){
+            file1 = new File(templateFilePath);
+            if (!file1.exists()) {
                 file1.mkdirs();
             }
             //生成zip文件
             ZipUtil.zip(templateFilePath);
 //            ZipUtil.zip(templateFilePath);
 //TODO 将压缩包流返回
-             s = templateFilePath.substring(0,templateFilePath.lastIndexOf("\\"))+".zip";
+            s = templateFilePath.substring(0, templateFilePath.lastIndexOf("\\")) + ".zip";
             String url = s;
             log.warn(url);
             File file = new File(url);
@@ -1275,23 +1260,20 @@ if (pMap!=null&&pMap.size()>0){
             //删除文件夹下文件
 //            FileUtil.deleteFile(templateFilePath);
 
-        }finally {
-            if (toClient!=null){
+        } finally {
+            if (toClient != null) {
                 toClient.close();
 
             }
-            if (s!=null){
+            if (s != null) {
                 FileUtil.deleteFileAll(file1);
                 FileUtil.deleteFile(s);
             }
 
 
-
-
         }
 
 
-
     }
 
     @Override
@@ -1302,28 +1284,34 @@ if (pMap!=null&&pMap.size()>0){
             for (int i = 0; i < purchaseorderList.size(); i++) {
                 Map<String, Object> dataRowMap = new HashMap<>();
                 PurchaseorderDTO model = purchaseorderList.get(i);
-                dataRowMap.put("poundDate", model.getPoundDate());
-                dataRowMap.put("vehicleId", model.getVehicleId());
-                dataRowMap.put("materialId", model.getMaterialId());
-                dataRowMap.put("unit", model.getUnit());
-                dataRowMap.put("grossWeight", model.getGrossWeight());
-                dataRowMap.put("tartareWeighte", model.getTartareWeighte());
-                dataRowMap.put("buckleWeight", model.getBuckleWeight());
-                dataRowMap.put("netWeight", model.getNetWeight());
-                dataRowMap.put("settlement", model.getSettlement());
-                dataRowMap.put("imgPicturess", model.getPoundPictures());
-                dataRowMap.put("advance", model.getAdvance());
-                dataRowMap.put("naturalId", model.getNaturalId());
-                dataRowMap.put("purchasePrice", model.getPurchasePrice());
-                dataRowMap.put("salesPrice", model.getSalesPrice());
-                dataRowMap.put("transportPrice", model.getTransportPrice());
-                dataRowMap.put("originPrice", model.getOriginPrice());
-                dataRowMap.put("remark", model.getRemark());
-                dataRowMap.put("causeError", model.getCauseError());
-                dataRowMap.put("salesId",model.getSalesId());
-                dataRowMap.put("purchaseId",model.getPurchaseId());
-                dataRowMap.put("customerId",model.getCustomerId());
-                dataRow.add(dataRowMap);
+                if (model.getPoundDate()==null){
+
+                }else {
+                    dataRowMap.put("poundDate", model.getPoundDate());
+                    dataRowMap.put("vehicleId", model.getVehicleId());
+                    dataRowMap.put("materialId", model.getMaterialId());
+                    dataRowMap.put("unit", model.getUnit());
+                    dataRowMap.put("grossWeight", model.getGrossWeight());
+                    dataRowMap.put("tartareWeighte", model.getTartareWeighte());
+                    dataRowMap.put("buckleWeight", model.getBuckleWeight());
+                    dataRowMap.put("netWeight", model.getNetWeight());
+                    dataRowMap.put("settlement", model.getSettlement());
+                    dataRowMap.put("poundPictures", model.getPoundPictures());
+                    dataRowMap.put("advance", model.getAdvance());
+                    dataRowMap.put("naturalId", model.getNaturalId());
+                    dataRowMap.put("purchasePrice", model.getPurchasePrice());
+                    dataRowMap.put("salesPrice", model.getSalesPrice());
+                    dataRowMap.put("transportPrice", model.getTransportPrice());
+                    dataRowMap.put("originPrice", model.getOriginPrice());
+                    dataRowMap.put("remark", model.getRemark());
+                    dataRowMap.put("causeError", model.getCauseError());
+                    dataRowMap.put("salesId", model.getSalesId());
+                    dataRowMap.put("purchaseId", model.getPurchaseId());
+                    dataRowMap.put("customerId", model.getCustomerId());
+                    dataRowMap.put("carPictures", model.getCarPictures());
+                    dataRow.add(dataRowMap);
+                }
+
             }
             for (int i = 1; i <= 23; i++) {
                 Map<String, Object> columnsMap = new HashMap<>();
@@ -1360,6 +1348,7 @@ if (pMap!=null&&pMap.size()>0){
 
     /**
      * 导入
+     *
      * @param dataList
      * @return
      */
@@ -1371,171 +1360,184 @@ if (pMap!=null&&pMap.size()>0){
         int num = 0;
 
         List<PurchaseorderDTO> errList = new ArrayList<>();
-        int num1=dataList.size();
+        int num1 = dataList.size();
         ArrayList<Integer> ints = new ArrayList<>();
+//        进行编码id的转换
         for (int i = 0; i < num1; i++) {
             PurchaseorderDTO model = dataList.get(i);
-        if (model.getPoundDate()!=null&&!model.getPoundDate().isEmpty()&&!model.getPoundDate().equals("null")){
+//            收获日期
+            if (model.getPoundDate() != null && !model.getPoundDate().isEmpty() && !model.getPoundDate().equals("null")) {
 
 //            model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
-            Date date = new SimpleDateFormat("yyyy.MM.dd").parse(model.getPoundDate());
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            model.setPoundDate(formatter.format(date));
-            if(model.getUnit()!=null){
-                if (model.getUnit().equals("吨")||model.getUnit().equals("T")){
-                    model.setUnit("0");
-                }
-                if (model.getUnit().equals("千克")||model.getUnit().equals("KG")){
-                    model.setUnit("1");
-                }
-            }
-            if (model.getAdvance()!=null){
-                if (model.getAdvance().equals("是")){
-                    model.setAdvance("1");
-                }
-                if (model.getAdvance().equals("否")){
-                    model.setAdvance("0");
-                }
-            }
-            if (model.getVehicleId()!=null){
-                LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(VehicleEntity::getTicketno,model.getVehicleId());
-                List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
-                if (vehicleEntityList!=null&&vehicleEntityList.size()>0){
-                    model.setVehicleId(vehicleEntityList.get(0).getId());
+                Date date = new SimpleDateFormat("yyyy.MM.dd").parse(model.getPoundDate());
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+                model.setPoundDate(formatter.format(date));
+//                单位
+                if (model.getUnit() != null) {
+                    if (model.getUnit().equals("吨") || model.getUnit().equals("T")) {
+                        model.setUnit("0");
+                    }
+                    if (model.getUnit().equals("千克") || model.getUnit().equals("KG")) {
+                        model.setUnit("1");
+                    }
                 }
-                else {
-                    model.setCauseError("车牌号不存在！请添加车辆信息在尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            是否垫资
+                if (model.getAdvance() != null) {
+                    if (model.getAdvance().equals("是")) {
+                        model.setAdvance("1");
+                    }
+                    if (model.getAdvance().equals("否")) {
+                        model.setAdvance("0");
+                    }
                 }
-            }
-            if (model.getMaterialId()!=null){
-                LambdaQueryWrapper<MaterialEntity> wrapper = new LambdaQueryWrapper<MaterialEntity>();
-                wrapper.eq(MaterialEntity::getItemName,model.getMaterialId());
-                List<MaterialEntity> materialEntityList = materialMapper.selectList(wrapper);
-                if (materialEntityList!=null&&materialEntityList.size()>0){
-                    model.setMaterialId(materialEntityList.get(0).getId());
-                }else{
-                    model.setCauseError("货物信息不存在！请添加货物信息后尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            送货车号
+                if (model.getVehicleId() != null) {
+                    LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(VehicleEntity::getTicketno, model.getVehicleId());
+                    List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
+                    if (vehicleEntityList != null && vehicleEntityList.size() > 0) {
+                        model.setVehicleId(vehicleEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("车牌号不存在！请添加车辆信息在尝试添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
+                    }
                 }
-            }
-            if (model.getNaturalId()!=null){
-                LambdaQueryWrapper<Jg_naturalEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(Jg_naturalEntity::getName,model.getNaturalId());
-                List<Jg_naturalEntity> naturalEntityList = naturalMapper.selectList(wrapper);
-                if(naturalEntityList!=null&&naturalEntityList.size()>0){
-                    model.setNaturalId(naturalEntityList.get(0).getId());
-                }else {
-                    model.setCauseError("自然人信息不存在！请添加自然人信息后尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            货物
+                if (model.getMaterialId() != null) {
+                    LambdaQueryWrapper<MaterialEntity> wrapper = new LambdaQueryWrapper<MaterialEntity>();
+                    wrapper.eq(MaterialEntity::getItemName, model.getMaterialId());
+                    List<MaterialEntity> materialEntityList = materialMapper.selectList(wrapper);
+                    if (materialEntityList != null && materialEntityList.size() > 0) {
+                        model.setMaterialId(materialEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("货物信息不存在！请添加货物信息后尝试添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
+                    }
                 }
-            }
-            if (model.getCustomerId()!=null){
-                LambdaQueryWrapper<CustomerEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(CustomerEntity::getSupplierNm,model.getCustomerId());
-                List<CustomerEntity> customerEntityList = customerMapper.selectList(wrapper);
-                if (customerEntityList!=null&&customerEntityList.size()>0){
-                    model.setCustomerId(customerEntityList.get(0).getId());
-                }else{
-                    model.setCauseError("客户信息不存在！请添加客户信息后尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            业务员2
+                if (model.getNaturalId() != null) {
+                    LambdaQueryWrapper<Jg_naturalEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(Jg_naturalEntity::getName, model.getNaturalId());
+                    List<Jg_naturalEntity> naturalEntityList = naturalMapper.selectList(wrapper);
+                    if (naturalEntityList != null && naturalEntityList.size() > 0) {
+                        model.setNaturalId(naturalEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("业务员2信息不存在！请添加业务员2信息后尝试添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
+                    }
                 }
-            }
-            if (model.getPurchaseId()!=null){
-                LambdaQueryWrapper<PurchaseorderitemEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PurchaseorderitemEntity::getDocumentNo,model.getPurchaseId());
-                List<PurchaseorderitemEntity> purchaseorderitemEntityList = purchaseorderitemMapper.selectList(wrapper);
-                if (purchaseorderitemEntityList!=null&&purchaseorderitemEntityList.size()>0){
-                    model.setPurchaseId(purchaseorderitemEntityList.get(0).getId());
-                }else {
-                    model.setCauseError("采购合同不存在！请添加采购合同后尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            客户
+                if (model.getCustomerId() != null) {
+                    LambdaQueryWrapper<CustomerEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(CustomerEntity::getSupplierNm, model.getCustomerId());
+                    List<CustomerEntity> customerEntityList = customerMapper.selectList(wrapper);
+                    if (customerEntityList != null && customerEntityList.size() > 0) {
+                        model.setCustomerId(customerEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("客户信息不存在！请添加客户信息后尝试添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
+                    }
                 }
-            }
-            if (model.getSalesId()!=null){
-                LambdaQueryWrapper<SaleorderitemEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(SaleorderitemEntity::getDocumentNo,model.getSalesId());
-                List<SaleorderitemEntity> saleorderitemEntityList = saleorderitemMapper.selectList(wrapper);
-                if (saleorderitemEntityList!=null&&saleorderitemEntityList.size()>0){
-                    model.setSalesId(saleorderitemEntityList.get(0).getId());
-                }else {
-                    model.setCauseError("销售合同不存在！请添加销售合同后尝试添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
+//            采购合同编码
+                if (model.getPurchaseId() != null) {
+                    LambdaQueryWrapper<PurchaseorderitemEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(PurchaseorderitemEntity::getDocumentNo, model.getPurchaseId());
+                    List<PurchaseorderitemEntity> purchaseorderitemEntityList = purchaseorderitemMapper.selectList(wrapper);
+                    if (purchaseorderitemEntityList != null && purchaseorderitemEntityList.size() > 0) {
+                        model.setPurchaseId(purchaseorderitemEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("采购合同不存在！请添加采购合同后尝试添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
+                    }
                 }
-            }
-            if (model.getOriginPrice()!=null){
-                //            区域转换
-                LambdaQueryWrapper<ProvinceEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(ProvinceEntity::getParentId,"-1");
-                List<ProvinceEntity> list = provinceMapper.selectList(wrapper);
-                ArrayList<String> strings = new ArrayList<>();
-                for (int i1 = 0; i1 < list.size(); i1++) {
-                    String fullName = list.get(i1).getFullName();
-                    if (model.getOriginPrice().contains(fullName)){
-                        strings.add(list.get(i1).getId());
-                        break;
+//            销售合同编码
+                if (model.getSalesId() != null) {
+                    LambdaQueryWrapper<SaleorderitemEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(SaleorderitemEntity::getDocumentNo, model.getSalesId());
+                    List<SaleorderitemEntity> saleorderitemEntityList = saleorderitemMapper.selectList(wrapper);
+                    if (saleorderitemEntityList != null && saleorderitemEntityList.size() > 0) {
+                        model.setSalesId(saleorderitemEntityList.get(0).getId());
+                    } else {
+                        model.setCauseError("销售合同不存在！请添加销售合同后尝试添加！");
+                        errList.add(model);
+
+                        ints.add(i);
+                        continue;
                     }
                 }
-                wrapper.clear();
-                if (strings.size()>0){
-                    wrapper.eq(ProvinceEntity::getParentId,strings.get(0));
-                    List<ProvinceEntity> list1 = provinceMapper.selectList(wrapper);
-                    for (int i1 = 0; i1 < list1.size(); i1++) {
-                        String fullName = list1.get(i1).getFullName();
-                        if (model.getOriginPrice().contains(fullName)){
-                            strings.add(list1.get(i1).getId());
+//            起始地
+                if (model.getOriginPrice() != null) {
+                    //            区域转换
+                    LambdaQueryWrapper<ProvinceEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(ProvinceEntity::getParentId, "-1");
+                    List<ProvinceEntity> list = provinceMapper.selectList(wrapper);
+                    ArrayList<String> strings = new ArrayList<>();
+                    for (int i1 = 0; i1 < list.size(); i1++) {
+                        String fullName = list.get(i1).getFullName();
+                        if (model.getOriginPrice().contains(fullName)) {
+                            strings.add(list.get(i1).getId());
                             break;
                         }
                     }
-                    if (strings.size()>1){
-                        wrapper.clear();
-                        wrapper.eq(ProvinceEntity::getParentId,strings.get(1));
-                        List<ProvinceEntity> list2 = provinceMapper.selectList(wrapper);
-                        for (int i1 = 0; i1 < list2.size(); i1++) {
-                            String fullName = list2.get(i1).getFullName();
-                            if (model.getOriginPrice().contains(fullName)){
-                                strings.add(list2.get(i1).getId());
+                    wrapper.clear();
+                    if (strings.size() > 0) {
+                        wrapper.eq(ProvinceEntity::getParentId, strings.get(0));
+                        List<ProvinceEntity> list1 = provinceMapper.selectList(wrapper);
+                        for (int i1 = 0; i1 < list1.size(); i1++) {
+                            String fullName = list1.get(i1).getFullName();
+                            if (model.getOriginPrice().contains(fullName)) {
+                                strings.add(list1.get(i1).getId());
                                 break;
                             }
                         }
-                        model.setOriginPrice(JsonUtil.getListToJsonArray(strings).toJSONString());
+                        if (strings.size() > 1) {
+                            wrapper.clear();
+                            wrapper.eq(ProvinceEntity::getParentId, strings.get(1));
+                            List<ProvinceEntity> list2 = provinceMapper.selectList(wrapper);
+                            for (int i1 = 0; i1 < list2.size(); i1++) {
+                                String fullName = list2.get(i1).getFullName();
+                                if (model.getOriginPrice().contains(fullName)) {
+                                    strings.add(list2.get(i1).getId());
+                                    break;
+                                }
+                            }
+                            model.setOriginPrice(JsonUtil.getListToJsonArray(strings).toJSONString());
+                        }
+                    } else {
+                        model.setCauseError("发货地格式不正确！请修改后重新添加！");
+                        errList.add(model);
+                        ints.add(i);
+                        continue;
                     }
-                }else {
-                    model.setCauseError("发货地格式不正确！请修改后重新添加！");
-                    errList.add(model);
-                    ints.add(i);
-                    continue;
                 }
+            } else {
+                ints.add(i);
+                errList.add(model);
             }
-        }else {
-            ints.add(i);
-            errList.add(model);
-        }
         }
+//        错误信息
         ArrayList<PurchaseorderDTO> dtos = new ArrayList<>();
         for (int i = 0; i < ints.size(); i++) {
             Integer integer = ints.get(i);
             dtos.add(dataList.get(integer));
         }
+//        移除错误的信息
         for (int i = 0; i < dtos.size(); i++) {
             PurchaseorderDTO purchaseorderDTO = dtos.get(i);
             dataList.remove(purchaseorderDTO);
         }
         BillRuleController bean = SpringContext.getBean(BillRuleController.class);
-        String str2="purchase";
+        String str2 = "purchase";
         //        采购订单表
         PurchaseorderitemEntity purEntities = new PurchaseorderitemEntity();
 //        采购订单明细
@@ -1550,149 +1552,147 @@ if (pMap!=null&&pMap.size()>0){
         BigDecimal rateSum = new BigDecimal("0.00");
 //        advance_amount垫资金额：判断采购订单子表中有多少磅单是属于垫资的，找到之后将他们的【金额】进行汇总得到。
         BigDecimal advanceSum = new BigDecimal("0.00");
-if (dataList.size()>0){
-    //            合同id
-    String purchaseId = dataList.get(0).getPurchaseId();
-    LambdaQueryWrapper<ContractMEntity> wrapper = new LambdaQueryWrapper<>();
-    wrapper.eq(ContractMEntity::getContractType,"0");
-    wrapper.eq(ContractMEntity::getContractCode,purchaseId);
-    List<ContractMEntity> contractMEntities = contractMapper.selectList(wrapper);
-    if (contractMEntities!=null&&contractMEntities.size()>0){
-        //        采购合同
-        ContractMEntity contractMEntity = contractMEntities.get(0);
+        if (dataList.size() > 0) {
+            //            合同id
+            String purchaseId = dataList.get(0).getPurchaseId();
+            LambdaQueryWrapper<ContractMEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ContractMEntity::getContractType, "0");
+            wrapper.eq(ContractMEntity::getContractCode, purchaseId);
+            List<ContractMEntity> contractMEntities = contractMapper.selectList(wrapper);
+            if (contractMEntities != null && contractMEntities.size() > 0) {
+                //        采购合同
+                ContractMEntity contractMEntity = contractMEntities.get(0);
 //雪花算法获取采购订单id
-        Long aLong = new DefaultIdentifierGenerator().nextId(PurchaseorderitemEntity.class);
+                Long aLong = new DefaultIdentifierGenerator().nextId(PurchaseorderitemEntity.class);
 
 //采购
-        for (int i = 0; i < dataList.size(); i++) {
-
-            PurchaseorderDTO model = dataList.get(i);
-            Purchaseorder_item0Entity item0 = new Purchaseorder_item0Entity();
-            Long aLong2 = new DefaultIdentifierGenerator().nextId(Purchaseorder_item0Entity.class);
+                for (int i = 0; i < dataList.size(); i++) {
+                    PurchaseorderDTO model = dataList.get(i);
+                    Purchaseorder_item0Entity item0 = new Purchaseorder_item0Entity();
+                    Long aLong2 = new DefaultIdentifierGenerator().nextId(Purchaseorder_item0Entity.class);
 //            雪花算法获取榜单id
-            Long aLong1 = new DefaultIdentifierGenerator().nextId(PoundlistEntity.class);
-            model.setId(aLong1.toString());
+                    Long aLong1 = new DefaultIdentifierGenerator().nextId(PoundlistEntity.class);
+                    model.setId(aLong1.toString());
 //                设置id
-            item0.setId(aLong2.toString());
+                    item0.setId(aLong2.toString());
 //            主表Id
-            item0.setPurchaseorderId(aLong.toString());
+                    item0.setPurchaseorderId(aLong.toString());
 //poundlist_id磅单id：
-            item0.setPoundlistId(aLong1.toString());
+                    item0.setPoundlistId(aLong1.toString());
 //price单价：为execl中的采购单价
-            item0.setPrice(new BigDecimal(model.getPurchasePrice()));
+                    item0.setPrice(new BigDecimal(model.getPurchasePrice()));
 //settlement结算重量：为execl中的结算重量
-            item0.setSettlement(new BigDecimal(model.getSettlement()));
+                    item0.setSettlement(new BigDecimal(model.getSettlement()));
 //rate税率：默认为0 即13个点
-            item0.setRate("0");
+                    item0.setRate("0");
 //amount金额：price*settlement，保留6位小数
-            item0.setAmount(item0.getPrice().multiply(item0.getSettlement()).setScale(6,BigDecimal.ROUND_HALF_UP));
+                    item0.setAmount(item0.getPrice().multiply(item0.getSettlement()).setScale(6, RoundingMode.HALF_UP));
 //not_amount不含税金额：price*settlement*(1 - 税率)   不含税价格为sum/1.13=price
-            item0.setNotAmount(item0.getAmount().divide(new BigDecimal(1+0.13)));
+                    item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13)));
 //vehicle_id车辆id：磅单c表车辆id
-            item0.setVehicleId(model.getVehicleId());
+                    item0.setVehicleId(model.getVehicleId());
 //material_id物料id：磅单表物料id
-            item0.setMaterialId(model.getMaterialId());
+                    item0.setMaterialId(model.getMaterialId());
 //supplier_id供应商id：磅单表供应商id
-            item0.setSupplierId(contractMEntity.getCode());
+                    item0.setSupplierId(contractMEntity.getCode());
 
 
 //结算重量汇总到主表
-            settlementNum=settlementNum.add(item0.getSettlement());
+                    settlementNum = settlementNum.add(item0.getSettlement());
 //垫资金额
-            if (model.getAdvance().equals("是")){
-                advanceSum=advanceSum.add(item0.getSettlement());
-            }
+                    if (model.getAdvance().equals("是")) {
+                        advanceSum = advanceSum.add(item0.getSettlement());
+                    }
 //金额
-            amoutSum=amoutSum.add(item0.getAmount());
+                    amoutSum = amoutSum.add(item0.getAmount());
 //            不含税金额
-            notAmountSum=notAmountSum.add(item0.getNotAmount());
+                    notAmountSum = notAmountSum.add(item0.getNotAmount());
 
 
-            purItemEntities.add(item0);
+                    purItemEntities.add(item0);
 
-            if (i==dataList.size()-1){
-                PurchaseorderitemEntity entity = new PurchaseorderitemEntity();
+                    if (i == dataList.size() - 1) {
+                        PurchaseorderitemEntity entity = new PurchaseorderitemEntity();
 //                    id
-                entity.setId(aLong.toString());
-                //            税额rateSum
-                rateSum=amoutSum.subtract(notAmountSum);
+                        entity.setId(aLong.toString());
+                        //            税额rateSum
+                        rateSum = amoutSum.subtract(notAmountSum);
 
 //            生成的采购编码
-                ActionResult pdBillNumber = bean.getBillNumber(str2);
-                entity.setDocumentNo(String.valueOf(pdBillNumber.getData()));
+                        ActionResult pdBillNumber = bean.getBillNumber(str2);
+                        entity.setDocumentNo(String.valueOf(pdBillNumber.getData()));
 
 //                合同id
-                entity.setContractCode(contractMEntities.get(0).getId());
+                        entity.setContractCode(contractMEntities.get(0).getId());
 //                对方合同号
-                entity.setContractNo(contractMEntities.get(0).getContractNo());
+                        entity.setContractNo(contractMEntities.get(0).getContractNo());
 //                供应商、客户ID
-                entity.setSupplierId(contractMEntities.get(0).getCode());
+                        entity.setSupplierId(contractMEntities.get(0).getCode());
 //                        供应商名称
-                entity.setSupplierName(contractMEntities.get(0).getName());
+                        entity.setSupplierName(contractMEntities.get(0).getName());
 //                        重量
-                entity.setNum(settlementNum);
+                        entity.setNum(settlementNum);
 //                    金额
-                entity.setAmount(amoutSum);
+                        entity.setAmount(amoutSum);
 //                    不含税金额
-                entity.setNotAmount(notAmountSum);
+                        entity.setNotAmount(notAmountSum);
 //                    税额
-                entity.setRate(rateSum);
+                        entity.setRate(rateSum);
 //                    垫资金额
-                entity.setAdvanceAmount(advanceSum);
-                purEntities=entity;
-            }
-        }
-
+                        entity.setAdvanceAmount(advanceSum);
+                        purEntities = entity;
+                    }
+                }
 
 
-    }else {
-        log.error("采购合同不存在！请添加后后重新添加！");
-        errList.addAll(dataList);
-    }
+            } else {
+                log.error("采购合同不存在！请添加后后重新添加！");
+                errList.addAll(dataList);
+            }
 
-    for (int i = 0; i < ints.size(); i++) {
-        Integer integer = ints.get(i);
-        dataList.remove(integer);
-    }
-    List<PoundlistEntity> entitys = JsonUtil.getJsonToList(dataList, PoundlistEntity.class);
+            for (int i = 0; i < ints.size(); i++) {
+                Integer integer = ints.get(i);
+                dataList.remove(integer);
+            }
+            List<PoundlistEntity> entitys = JsonUtil.getJsonToList(dataList, PoundlistEntity.class);
 
-    String str1="poundlist";
-    for (PoundlistEntity model:entitys
-    ) {
+            String str1 = "poundlist";
+            for (PoundlistEntity model : entitys
+            ) {
 //            生成的榜单编码
-        ActionResult pdBillNumber = bean.getBillNumber(str1);
-        model.setPoundlistNo(String.valueOf(pdBillNumber.getData()));
+                ActionResult pdBillNumber = bean.getBillNumber(str1);
+                model.setPoundlistNo(String.valueOf(pdBillNumber.getData()));
 //            是否审核
-        model.setIsExamine("1");
+                model.setIsExamine("1");
 //            榜单类型
-        model.setPoundType("0");
+                model.setPoundType("0");
 //            业务员默认当前操作人
-        String userId = userProvider.get().getUserId();
-        model.setBusinessId(userId);
-        sum+= poundlistMapper.insert(model);
-    }
+                String userId = userProvider.get().getUserId();
+                model.setBusinessId(userId);
+                sum += poundlistMapper.insert(model);
+            }
 //        榜单逻辑
 
 //进行数据添加
 
 
-    int insert = purchaseorderitemMapper.insert(purEntities);
-    for (int i = 0; i < purItemEntities.size(); i++) {
-        Purchaseorder_item0Entity entity = purItemEntities.get(i);
-        purchaseorderItem0Mapper.insert(entity);
-    }
-}
+            int insert = purchaseorderitemMapper.insert(purEntities);
+            for (int i = 0; i < purItemEntities.size(); i++) {
+                Purchaseorder_item0Entity entity = purItemEntities.get(i);
+                purchaseorderItem0Mapper.insert(entity);
+            }
+        }
 
         PurchaseOrderImportVo importVo = new PurchaseOrderImportVo();
-        num=errList.size();
+        num = errList.size();
         importVo.setSnum(sum);
         importVo.setFnum(num);
-            importVo.setFailResult(errList);
-            if (errList.size()>0){
-                importVo.setResultType(1);
-            }else {
-                importVo.setResultType(0);
-            }
+        importVo.setFailResult(errList);
+        if (errList.size() > 0) {
+            importVo.setResultType(1);
+        } else {
+            importVo.setResultType(0);
+        }
 
         return importVo;
     }
@@ -1710,15 +1710,15 @@ if (dataList.size()>0){
         map.put(8, "扣重");
         map.put(9, "净重");
         map.put(10, "结算重量");
-        map.put(11, "榜单图片");
-        map.put(12, "是否垫资");
-        map.put(13, "自然人");
-        map.put(14, "采购单价");
-        map.put(15, "销售单价");
-        map.put(16, "运费");
-        map.put(17, "起始地");
-        map.put(18, "备注");
-        map.put(19, "错误原因");
+        map.put(11, "是否垫资");
+        map.put(12, "自然人");
+        map.put(13, "采购单价");
+        map.put(14, "销售单价");
+        map.put(15, "运费");
+        map.put(16, "起始地");
+        map.put(17, "备注");
+        map.put(18, "错误原因");
+        map.put(19, "车辆图片地址");
         map.put(20, "榜单图片地址");
         map.put(21, "销售合同编码");
         map.put(22, "采购合同编码");