From bc336ea47b0df51882e3a8c091e88e4e1a6e7dbf Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Thu, 20 Mar 2025 17:54:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=98=8E?=
 =?UTF-8?q?=E9=92=A2=E9=93=81=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/mjkf/xinke/main/controller/MaterialController.java   | 3 ---
 src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java      | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
index e67871a..90eb348 100644
--- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java
+++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
@@ -1,9 +1,7 @@
 package mjkf.xinke.main.controller;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jgy.xxs.core.common.util.CommonUtil;
 import com.jgy.xxs.core.http.exp.NcHttpException;
 import com.jgy.xxs.core.http.resp.HttpResponse;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +20,6 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
diff --git a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
index 0fd0b8c..590bb1c 100644
--- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
+++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
 /**
@@ -50,6 +51,7 @@ public class SanmingSteel extends Model<SanmingSteel> {
     @TableField("PRICE")
     private BigDecimal price;
 
+    @Deprecated
     @ApiModelProperty("浮动")
     @TableField("FLUCTUATING")
     private BigDecimal fluctuating;
@@ -67,6 +69,8 @@ public class SanmingSteel extends Model<SanmingSteel> {
 
     public SanmingSteel (Row row, MaterialTask task) {
         var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK;
+        row.getCell(0, policy).setCellType(CellType.STRING);
+        row.getCell(3, policy).setCellType(CellType.NUMERIC);
         String material = row.getCell(0, policy).getStringCellValue();
         String name = row.getCell(1, policy).getStringCellValue();
         String spec = row.getCell(2, policy).getStringCellValue();