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 6c584fae..28b29263 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
@@ -10,7 +10,6 @@ import jnpf.model.UploaderVO;
 import jnpf.util.FilePathUtil;
 import jnpf.util.JsonUtil;
 import jnpf.util.context.SpringContext;
-import lombok.Cleanup;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
@@ -74,7 +73,7 @@ public class FileCopy {
                 } else {
                     //            这个文件图片的信息
                     ArrayList<Object> list = new ArrayList<>();
-                    @Cleanup InputStream input = new FileInputStream(file);
+                    InputStream input = new FileInputStream(file);
 
 //                  MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
                     MultipartFile multipartFile = new MultipartFileDto(file.getName(), file.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
@@ -82,6 +81,7 @@ public class FileCopy {
                     ActionResult annex = utilsController.uploader(multipartFile, "annex");
 
                         UploaderVO data = (UploaderVO)annex.getData();
+
                         String url = data.getUrl();
                      Map<String,Object> dataMap=  JsonUtil.entityToMap(annex.getData());
                         if (!dataMap.containsKey("fileId")) {
@@ -110,11 +110,12 @@ public class FileCopy {
                         }
                     }
 //                    将车辆照片存在车辆照片中
-
+                    input.close();
                 }
                 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);
@@ -206,7 +207,8 @@ public class FileCopy {
                         }
                         writer.flush(excelFile);
                         writer.close();
-                        @Cleanup InputStream input = new FileInputStream(excelFile);
+                        reader.close();
+                       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));
@@ -222,11 +224,16 @@ public class FileCopy {
                             resultList.add(fileMap);
                             return resultList;
                         }
+                        input.close();
                     }
 
                 }
+
             }
+
         }
+
+
         resultList.add(fileName);
         resultList.add(carFileMap);
         resultList.add(fileMap);
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 6800d4ac..0e54b789 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
@@ -24,8 +24,6 @@ import jnpf.materialvo.service.MaterialService;
 import jnpf.mobilePort.utils.FileCopy;
 import jnpf.payment.model.payment.PaymentListVO;
 import jnpf.payment.service.PaymentService;
-import jnpf.paymentdoc.entity.PaymentdocItem1Entity;
-import jnpf.permission.entity.UserEntity;
 import jnpf.permission.service.UserService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
@@ -332,7 +330,8 @@ public class PurchaseorderController {
         List<MultipartFile> list = UpUtil.getFileAll();
         MultipartFile file = list.get(0);
         if (file.getOriginalFilename().endsWith(".zip")) {
-            FileUtil.deleteFileAll(new File(configValueUtil.getTemporaryFilePath() +"unzip"));
+
+            cn.hutool.core.io.FileUtil.del(new File(configValueUtil.getTemporaryFilePath() +"unzip\\"));
             String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\";
 
 //            String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
@@ -343,10 +342,11 @@ public class PurchaseorderController {
                 temporaryFile.mkdirs();
             }
 
-            @Cleanup InputStream inputStream = file.getInputStream();
+            InputStream inputStream = file.getInputStream();
             File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK"));
             List<Object> resultList= FileCopy.getInfoAndUpFile(gbk.listFiles());
-            FileUtil.deleteFileAll(temporaryFile);
+            inputStream.close();
+            cn.hutool.core.io.FileUtil.del(temporaryFile);
 //            FileUtil.upFile(file, filePath, fileName);
             DownloadVO vo = DownloadVO.builder().build();
             vo.setName(String.valueOf(resultList.get(0)));
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 c2b06428..291d7981 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
@@ -1582,6 +1582,24 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                         continue;
                     }
                 }
+//                榜单照片
+                if (model.getPoundPictures()!=null&&!model.getPoundPictures().isEmpty()){
+
+                }else {
+                    model.setCauseError("榜单照片导入失败！请重新导入！");
+                    errList.add(model);
+                    ints.add(i);
+                    continue;
+                }
+//                车辆照片
+                if (model.getCarPictures()!=null&&!model.getCarPictures().isEmpty()){
+
+                }else {
+                    model.setCauseError("车辆照片导入失败！请重新导入！");
+                    errList.add(model);
+                    ints.add(i);
+                    continue;
+                }
 //            起始地
                 if (model.getOriginPrice() != null) {
                     //            区域转换
@@ -1690,7 +1708,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 BigDecimal pricePur = new BigDecimal(model.getPurchasePrice());
                 BigDecimal settlem = model.getSettlement();
 //            采购额/结算重量
-                item0.setPrice(pricePur.divide(settlem, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
+                item0.setPrice(pricePur.divide(settlem,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
 //settlement结算重量：为execl中的结算重量
                 item0.setSettlement(model.getSettlement());
 //rate税率：默认为0 即13个点
@@ -1700,14 +1718,15 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 //amount金额：price*settlement，保留6位小数
                 item0.setAmount(new BigDecimal(model.getPurchasePrice()));
 //not_amount不含税金额：price*settlement*(1 - 税率)   不含税价格为sum/1.13=price
-                item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13), RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
+                item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13),6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
 //vehicle_id车辆id：磅单c表车辆id
                 item0.setVehicleId(model.getVehicleId());
 //material_id物料id：磅单表物料id
                 item0.setMaterialId(model.getMaterialId());
 //supplier_id供应商id：磅单表供应商id
                 item0.setSupplierId(contractMEntity.getCode());
-
+//是否垫资
+                item0.setAdvance(model.getAdvance());
 
 //结算重量汇总到主表
                 settlementNum = settlementNum.add(item0.getSettlement());
@@ -1791,10 +1810,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 BigDecimal settlement = model.getSettlement();
                 BigDecimal purchasePrice = model.getPurchasePrice();
 //                采购单价
-                model.setPurchasePrice(purchasePrice.divide(settlement, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
+                model.setPurchasePrice(purchasePrice.divide(settlement,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
                 BigDecimal salesPrice = model.getSalesPrice();
 //                销售单价
-                model.setSalesPrice(salesPrice.divide(settlement, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
+                model.setSalesPrice(salesPrice.divide(settlement, 6,RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
 //            是否审核
                 model.setIsExamine("1");
 //            榜单类型