导入导出

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -1846,55 +1846,58 @@ public class CustomExcelImportUtil {
             // System.out.println("index：" + index);
             try {
                 record.setId(row.getCell(0).getStringCellValue());
-                String no = getCellValue(row.getCell(1));
+                String no = getCellValue(row.getCell(2));
                 if(StringUtils.isNotBlank(no) && no.contains(".")){
                     record.setNo(no.split(".")[0]);
                 }else{
                     record.setNo(no);
                 }
-                record.setName(row.getCell(2).getStringCellValue());
-                record.setTypeName(row.getCell(3).getStringCellValue());
-                String value = getCellValue(row.getCell(4));
+                record.setName(row.getCell(3).getStringCellValue());
+                record.setTypeName(row.getCell(1).getStringCellValue());
+                String value = getCellValue(row.getCell(6));
                 if (StringUtils.isBlank(value)) {
                     record.setInitialValue(0.0);
                 } else {
                     record.setInitialValue(new Double(value));
                 }
-                record.setUnit(getCellValue(row.getCell(5)));
-                record.setGgxh(getCellValue(row.getCell(6)));
-                record.setInitNo(getCellValue(row.getCell(7)));
-                record.setLevel(getSpareLevel(getCellValue(row.getCell(8))));
-                String usePeriod = getCellValue(row.getCell(9));
-                if(StringUtils.isBlank(usePeriod)){
-                    record.setUsePeriod(new BigDecimal(0));
-                }else{
-                    record.setUsePeriod(new BigDecimal(usePeriod));
-                }
-                String agePeriod = getCellValue(row.getCell(10));
-                if(StringUtils.isBlank(agePeriod)){
-                    record.setAgePeriod(new BigDecimal(0));
-                }else{
-                    record.setAgePeriod(new BigDecimal(agePeriod));
-                }
-                String purchasePeriod = getCellValue(row.getCell(11));
-                if(StringUtils.isBlank(purchasePeriod)){
-                    record.setPurchasePeriod(new BigDecimal(0));
-                }else{
-                    record.setPurchasePeriod(new BigDecimal(purchasePeriod));
-                }
+                record.setUnit(getCellValue(row.getCell(7)));
+                record.setGgxh(getCellValue(row.getCell(4)));
+
+                record.setLevel(getSpareLevel(getCellValue(row.getCell(11))));
+//                String usePeriod = getCellValue(row.getCell(9));
+//                if(StringUtils.isBlank(usePeriod)){
+//                    record.setUsePeriod(new BigDecimal(0));
+//                }else{
+//                    record.setUsePeriod(new BigDecimal(usePeriod));
+//                }
+//                String agePeriod = getCellValue(row.getCell(10));
+//                if(StringUtils.isBlank(agePeriod)){
+//                    record.setAgePeriod(new BigDecimal(0));
+//                }else{
+//                    record.setAgePeriod(new BigDecimal(agePeriod));
+//                }
+//                String purchasePeriod = getCellValue(row.getCell(11));
+//                if(StringUtils.isBlank(purchasePeriod)){
+//                    record.setPurchasePeriod(new BigDecimal(0));
+//                }else{
+//                    record.setPurchasePeriod(new BigDecimal(purchasePeriod));
+//                }
                 record.setProducerId(getCellValue(row.getCell(12)));
-                String maxStock = getCellValue(row.getCell(13));
+                String maxStock = getCellValue(row.getCell(9));
                 if(StringUtils.isBlank(maxStock)){
                     record.setMaxStock(new BigDecimal(0));
                 }else{
                     record.setMaxStock(new BigDecimal(maxStock));
                 }
-                String mixStock = getCellValue(row.getCell(14));
+                String mixStock = getCellValue(row.getCell(10));
                 if(StringUtils.isBlank(mixStock)){
                     record.setMinStock(new BigDecimal(0));
                 }else{
                     record.setMinStock(new BigDecimal(mixStock));
                 }
+                record.setYt(getYt(getCellValue(row.getCell(13))));
+                record.setRemark(getCellValue(row.getCell(14)));
+//                record.setCreatedTime(LocalDateTime.parse(getCellValue(row.getCell(15)),DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 record.setUpdateTime(LocalDateTime.now());
                 record.setUpdateUserId("1");
                 result.add(record);
@@ -1926,6 +1929,19 @@ public class CustomExcelImportUtil {
         }
     }
 
+    private static Integer getYt(String stringCellValue) {
+        if (StringUtils.isBlank(stringCellValue)) {
+            return 1;
+        }
+        if ("设备配件".equals(stringCellValue)) {
+            return 1;
+        } else if ("工程物资".equals(stringCellValue)) {
+            return 2;
+        }else {
+            return 1;
+        }
+    }
+
     /**
      * 导入总需求计划明细-设备型号类
      *

platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartInfoVO.java

@@ -26,83 +26,101 @@ public class ExportSparePartInfoVO implements Serializable {
     @Excel(name = "主键", orderNum = "1")
     private String id;
 
+    /**
+     * 大类编码名称
+     */
+    @Excel(name = "备件类别", orderNum = "2")
+    private String typeName;
+
     /**
      * 备件编码
      */
-    @Excel(name = "编码", orderNum = "2")
+    @Excel(name = "备件编码", orderNum = "3")
     private String no;
 
     /**
      * 名称
      */
-    @Excel(name = "名称", orderNum = "3")
+    @Excel(name = "备件名称", orderNum = "4")
     private String name;
+
     /**
-     * 大类编码名称
+     * 规格型号：使用的sb_guige
      */
-    @Excel(name = "类别", orderNum = "4")
-    private String typeName;
+    @Excel(name = "规格型号", orderNum = "5")
+    private String ggxh;
+
+    @Excel(name = "品牌", orderNum = "6")
+    private String brand;
+
     /**
      * 单价
      */
-    @Excel(name = "单价", orderNum = "5")
+    @Excel(name = "备件价值", orderNum = "7")
     private Double initialValue;
 
     /**
      * 计量单位: 1-件;2-台;3-条; 4-个
      */
-    @Excel(name = "计量单位", orderNum = "6")
+    @Excel(name = "计量单位", orderNum = "8")
     private String unit;
 
     /**
-     * 规格型号：使用的sb_guige
+     * 当前库存
      */
-    @Excel(name = "规格型号", orderNum = "7")
-    private String ggxh;
+    @Excel(name = "当前库存", orderNum = "9")
+    private BigDecimal currentStock;
 
     /**
-     * 规格型号：使用的sb_guige
+     * 最高库存
+     */
+    @Excel(name = "最高库存", orderNum = "10")
+    private BigDecimal maxStock;
+
+    /**
+     * 最低库存
      */
-    @Excel(name = "原厂编号", orderNum = "8")
-    private String initNo;
+    @Excel(name = "最低库存", orderNum = "11")
+    private BigDecimal minStock;
+
+
+//    /**
+//     * 寿命周期:月
+//     */
+//    @Excel(name = "寿命周期(月)", orderNum = "11")
+//    private BigDecimal agePeriod;
+
    /**
      * 备件等级:1-一级; 2-二级;3-三级
      */
-    @Excel(name = "备件等级", orderNum = "9", dicCode = "SPARE_PART_INFO_LEVEL")
+    @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
     private Integer level;
     /**
      * 使用周期:月
      */
-    @Excel(name = "使用周期(月)", orderNum = "10")
-    private BigDecimal usePeriod;
-    /**
-     * 寿命周期:月
-     */
-    @Excel(name = "寿命周期(月)", orderNum = "11")
-    private BigDecimal agePeriod;
-    /**
-     * 采购到货周期:天
-     */
-    @Excel(name = "采购到货周期(天)", orderNum = "12")
-    private BigDecimal purchasePeriod;
+//    @Excel(name = "使用周期(月)", orderNum = "10")
+//    private BigDecimal usePeriod;
+
+//    /**
+//     * 采购到货周期:天
+//     */
+//    @Excel(name = "采购到货周期(天)", orderNum = "12")
+//    private BigDecimal purchasePeriod;
     /**
      * 生产商
      */
     @Excel(name = "生产商", orderNum = "13")
     private String producerName;
-    /**
-     * 最高库存
-     */
-    @Excel(name = "最高库存", orderNum = "14")
-    private BigDecimal maxStock;
-    /**
-     * 最低库存
-     */
-    @Excel(name = "最低库存", orderNum = "15")
-    private BigDecimal minStock;
-    /**
-     * 当前库存
-     */
-    @Excel(name = "当前库存", orderNum = "16")
-    private BigDecimal currentStock;
+
+    @Excel(name = "用途", orderNum = "14")
+    private String yt;
+
+    @Excel(name = "备注", orderNum = "15")
+    private String remark;
+
+//    @Excel(name = "创建时间", orderNum = "16")
+//    private LocalDateTime createdTime;
+
+
+
 }