订单导入修改

SC-boot/linkage-common/src/main/java/jnpf/util/ExcelUtil.java

@@ -3,7 +3,10 @@ package jnpf.util;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult;
+import io.netty.util.internal.ObjectUtil;
 import lombok.Cleanup;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
@@ -19,6 +22,7 @@ import java.util.List;
  */
 public class ExcelUtil {
 
+
     /**
      * excel转成实体
      * @param filePath 路径
@@ -60,6 +64,7 @@ public class ExcelUtil {
         ImportParams params = new ImportParams();
         params.setTitleRows(titleRows);
         params.setHeadRows(headerRows);
+//        params.setVerifyHandler(verifyHandler);
         List<T> list = null;
         try {
             list = ExcelImportUtil.importExcel(file, pojoClass, params);

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java

@@ -276,15 +276,20 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
             for (int i = 0; i < personList.size(); i++) {
                 Map<String, Object> dataRowMap = new HashMap<>();
                 PoundlistEntity model = personList.get(i);
-                dataRowMap.put("customerName", model.getCustomerName());
+                if (StringUtils.isBlank(model.getCustomerName()) && StringUtils.isBlank(model.getVehicleName()) && model.getGrossWeight() == null
-                dataRowMap.put("vehicleName", model.getVehicleName());
+                        && model.getTareWeight() == null && model.getSettlement() == null && StringUtils.isBlank(model.getUnit())
-                dataRowMap.put("grossWeight", model.getGrossWeight());
+                        && model.getSalesPrice()==null && StringUtils.isBlank(model.getSalesAmount())) {
-                dataRowMap.put("tareWeight", model.getTareWeight());
+                }else{
-                dataRowMap.put("settlement", model.getSettlement());
+                    dataRowMap.put("customerName", model.getCustomerName());
-                dataRowMap.put("unit", model.getUnit());
+                    dataRowMap.put("vehicleName", model.getVehicleName());
-                dataRowMap.put("salesPrice", model.getSalesPrice());
+                    dataRowMap.put("grossWeight", model.getGrossWeight());
-                dataRowMap.put("salesAmount", model.getSalesAmount());
+                    dataRowMap.put("tareWeight", model.getTareWeight());
-                dataRow.add(dataRowMap);
+                    dataRowMap.put("settlement", model.getSettlement());
+                    dataRowMap.put("unit", model.getUnit());
+                    dataRowMap.put("salesPrice", model.getSalesPrice());
+                    dataRowMap.put("salesAmount", model.getSalesAmount());
+                    dataRow.add(dataRowMap);
+                }
             }
             for (int i = 1; i < 10; i++) {
                 Map<String, Object> columnsMap = new HashMap<>();