Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageBomErpExportVo.java

@@ -23,7 +23,7 @@ public class InOutStorageBomErpExportVo {
     /**
      * 序号
      */
-    private Integer serialNumber;
+    private String serialNumber;
 
     /**
      * 产品规格品号
@@ -43,7 +43,7 @@ public class InOutStorageBomErpExportVo {
     /**
      * 数量
      */
-    private BigDecimal quantity;
+    private String quantity;
 
     /**
      * 仓库编号
@@ -58,10 +58,10 @@ public class InOutStorageBomErpExportVo {
     /**
      * 单位成本
      */
-    private BigDecimal unitCost;
+    private String unitCost;
 
     /**
      * 成本金额
      */
-    private BigDecimal costAmt;
+    private String costAmt;
 }

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -141,13 +141,13 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
             InOutStorageBomErpExportVo inOutStorageBomErpExportVo = new InOutStorageBomErpExportVo();
             inOutStorageBomErpExportVo.setCode(map.get(item.getInOutStorageId()));
             inOutStorageBomErpExportVo.setBomSpecCode(item.getBomSpecCode());
-            inOutStorageBomErpExportVo.setQuantity(item.getQuantity());
+            inOutStorageBomErpExportVo.setQuantity(item.getQuantity().toPlainString());
             inOutStorageBomErpExportVo.setWarehouseCode(item.getWarehouseCode());
             inOutStorageBomErpExportVo.setUnit("PCS");
             inOutStorageBomErpExportVo.setPieces("0");
             inOutStorageBomErpExportVo.setSourceRtk("OTHER");
-            inOutStorageBomErpExportVo.setUnitCost(BigDecimal.ZERO);
-            inOutStorageBomErpExportVo.setCostAmt(BigDecimal.ZERO);
+            inOutStorageBomErpExportVo.setUnitCost("0");
+            inOutStorageBomErpExportVo.setCostAmt("0");
             return inOutStorageBomErpExportVo;
         })
                 .sorted(comparing(InOutStorageBomErpExportVo::getCode))
@@ -159,7 +159,7 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
                     } else {
                         serialNumberMap.put(item.getCode(), serialNumber+=1);
                     }
-                    item.setSerialNumber(serialNumber);
+                    item.setSerialNumber(serialNumber.toString());
                 }).collect(Collectors.toList());
         String fileName;
         if (Objects.equals(dto.getType(), 1)) {