物料导入按照客户模板匹配字段

ruoyi-admin-vue/src/views/inventory/materials/index.vue

@@ -654,7 +654,7 @@ export default {
           .map(item => ({
             ...item,
             // 兜底：如果映射表中没有，显示原始code并标注
-            displayCategory: this.categoryMap[item.categoryCode] || `${item.categoryCode}（未匹配分类）`
+            displayCategory: this.categoryMap[item.categoryCode] || `未匹配分类`
           }));
         this.total = total;
       } catch (error) {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Materials.java

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2025-11-28
  */
+
 public class Materials extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -18,94 +19,115 @@ public class Materials extends BaseEntity
     /** 编号 */
     private String id;
 
-    /** 物料编码 检索条件 */
-    private String materialCode;
+    @Excel(name = "NO.")
+    private Long no;
+
+    /** 货主 数据库暂无字段  */
+    @Excel(name = "货主")
+    private String ownerId;
+
     /** SAP物料号 检索条件 */
-    @Excel(name = "SAP物料号")
+    @Excel(name = "产品代码")
     private String sapNo;
 
+    /** 是否激活 Y-是 N-否 */
+    @Excel(name = "激活")
+    private Long isActive;
+
     /** 物料名称 检索条件 */
-    @Excel(name = "物料名称")
+    @Excel(name = "中文描述")
     private String materialName;
 
+
+    /** 物料名称 检索条件 */
+    @Excel(name = "英文描述")
+    private String materialEname;
+
+    /** 总重量 */
+    @Excel(name = "毛重")
+    private Long totalWeight;
+
+    /** 单位重量 */
+    @Excel(name = "净重")
+    private Long unitWeight;
+
+    /** 包装重量 */
+    @Excel(name = "皮重")
+    private Long packageWeight;
+
+    /** 体积 */
+    @Excel(name = "体积")
+    private Long volume;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long unitPrice;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 物料编码 检索条件 */
+    private String materialCode;
+
     /** TS Code 检索条件 */
-    @Excel(name = "TS Code")
+//    @Excel(name = "TS Code")
     private String tsCode;
 
     /** 物料分类 检索条件 */
-    @Excel(name = "物料分类")
+//    @Excel(name = "物料分类")
     private String categoryCode;
 
     /** 危险类别ID 字典 */
-    @Excel(name = "危险类别ID")
+//    @Excel(name = "危险类别ID")
     private String hazardId;
 
     /** 规格型号 检索条件 */
-    @Excel(name = "规格型号")
+//    @Excel(name = "规格型号")
     private String specification;
 
     /** 计量单位 字典 */
-    @Excel(name = "计量单位")
+//    @Excel(name = "计量单位")
     private String materialUnit;
 
-    /** 单位重量 */
-    @Excel(name = "单位重量")
-    private Long unitWeight;
-
-    /** 包装重量 */
-    @Excel(name = "包装重量")
-    private Long packageWeight;
-
-    /** 总重量 */
-    @Excel(name = "总重量")
-    private Long totalWeight;
-
-    /** 体积 */
-    @Excel(name = "体积")
-    private Long volume;
-
     /** 保质期天数 */
-    @Excel(name = "保质期天数")
+//    @Excel(name = "保质期天数")
     private Long shelfLifeDays;
 
     /** 存储温度要求 */
-    @Excel(name = "存储温度要求")
+//    @Excel(name = "存储温度要求")
     private String storageTemperature;
 
     /** 特殊存储要求 */
-    @Excel(name = "特殊存储要求")
+//    @Excel(name = "特殊存储要求")
     private String specialRequirements;
 
     /** 是否批次管理 1-是 0-否 */
-    @Excel(name = "是否批次管理 1-是 0-否")
+//    @Excel(name = "是否批次管理 1-是 0-否")
     private Long isBatchManaged;
 
     /** 是否序列号管理 1-是 0-否 */
-    @Excel(name = "是否序列号管理 1-是 0-否")
+//    @Excel(name = "是否序列号管理 1-是 0-否")
     private Long isSerialManaged;
 
     /** 最低库存 */
-    @Excel(name = "最低库存")
+//    @Excel(name = "最低库存")
     private Long minStockLevel;
 
     /** 最高库存 */
-    @Excel(name = "最高库存")
+//    @Excel(name = "最高库存")
     private Long maxStockLevel;
 
     /** 是否正在使用 1-是 0-否 */
-    @Excel(name = "是否正在使用 1-是 0-否")
+//    @Excel(name = "是否正在使用 1-是 0-否")
     private Long isUsed;
 
-    /** 是否激活 1-是 0-否 */
-    @Excel(name = "是否激活 1-是 0-否")
-    private Long isActive;
-
     /** 风险等级 字典 */
-    @Excel(name = "风险等级")
+//    @Excel(name = "风险等级")
     private String riskLevel;
 
     /** 排序 */
-    @Excel(name = "排序")
+//    @Excel(name = "排序")
     private Long sortNo;
 
     /** 创建日期 */
@@ -114,291 +136,290 @@ public class Materials extends BaseEntity
     /** 排序号 */
     private String updateUserCode;
 
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
+    public String getId() {
         return id;
     }
 
-    public void setMaterialCode(String materialCode) 
-    {
-        this.materialCode = materialCode;
+    public void setId(String id) {
+        this.id = id;
     }
 
-    public String getMaterialCode() 
-    {
-        return materialCode;
+    public Long getNo() {
+        return no;
     }
 
-    public void setMaterialName(String materialName) 
-    {
-        this.materialName = materialName;
+    public void setNo(Long no) {
+        this.no = no;
     }
 
-    public String getMaterialName() 
-    {
-        return materialName;
+    public String getOwnerId() {
+        return ownerId;
     }
 
-    public void setSapNo(String sapNo) 
-    {
-        this.sapNo = sapNo;
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
     }
 
-    public String getSapNo() 
-    {
+    public String getSapNo() {
         return sapNo;
     }
 
-    public void setTsCode(String tsCode) 
-    {
-        this.tsCode = tsCode;
+    public void setSapNo(String sapNo) {
+        this.sapNo = sapNo;
     }
 
-    public String getTsCode() 
-    {
-        return tsCode;
+    public Long getIsActive() {
+        return isActive;
     }
 
-    public void setCategoryCode(String categoryCode) 
-    {
-        this.categoryCode = categoryCode;
+    public void setIsActive(Long isActive) {
+        this.isActive = isActive;
     }
 
-    public String getCategoryCode() 
-    {
-        return categoryCode;
+    public String getMaterialName() {
+        return materialName;
     }
 
-    public void setHazardId(String hazardId) 
-    {
-        this.hazardId = hazardId;
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
     }
 
-    public String getHazardId() 
-    {
-        return hazardId;
+    public String getMaterialEname() {
+        return materialEname;
     }
 
-    public void setSpecification(String specification) 
-    {
-        this.specification = specification;
+    public void setMaterialEname(String materialEname) {
+        this.materialEname = materialEname;
     }
 
-    public String getSpecification() 
-    {
-        return specification;
+    public Long getTotalWeight() {
+        return totalWeight;
     }
 
-    public void setMaterialUnit(String materialUnit) 
-    {
-        this.materialUnit = materialUnit;
+    public void setTotalWeight(Long totalWeight) {
+        this.totalWeight = totalWeight;
     }
 
-    public String getMaterialUnit() 
-    {
-        return materialUnit;
+    public Long getUnitWeight() {
+        return unitWeight;
     }
 
-    public void setUnitWeight(Long unitWeight) 
-    {
+    public void setUnitWeight(Long unitWeight) {
         this.unitWeight = unitWeight;
     }
 
-    public Long getUnitWeight() 
-    {
-        return unitWeight;
+    public Long getPackageWeight() {
+        return packageWeight;
     }
 
-    public void setPackageWeight(Long packageWeight) 
-    {
+    public void setPackageWeight(Long packageWeight) {
         this.packageWeight = packageWeight;
     }
 
-    public Long getPackageWeight() 
-    {
-        return packageWeight;
+    public Long getVolume() {
+        return volume;
     }
 
-    public void setTotalWeight(Long totalWeight) 
-    {
-        this.totalWeight = totalWeight;
+    public void setVolume(Long volume) {
+        this.volume = volume;
     }
 
-    public Long getTotalWeight() 
-    {
-        return totalWeight;
+    public Long getUnitPrice() {
+        return unitPrice;
     }
 
-    public void setVolume(Long volume) 
-    {
-        this.volume = volume;
+    public void setUnitPrice(Long unitPrice) {
+        this.unitPrice = unitPrice;
     }
 
-    public Long getVolume() 
-    {
-        return volume;
+    @Override
+    public String getRemark() {
+        return remark;
     }
 
-    public void setShelfLifeDays(Long shelfLifeDays) 
-    {
-        this.shelfLifeDays = shelfLifeDays;
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getTsCode() {
+        return tsCode;
+    }
+
+    public void setTsCode(String tsCode) {
+        this.tsCode = tsCode;
+    }
+
+    public String getCategoryCode() {
+        return categoryCode;
+    }
+
+    public void setCategoryCode(String categoryCode) {
+        this.categoryCode = categoryCode;
+    }
+
+    public String getHazardId() {
+        return hazardId;
+    }
+
+    public void setHazardId(String hazardId) {
+        this.hazardId = hazardId;
+    }
+
+    public String getSpecification() {
+        return specification;
     }
 
-    public Long getShelfLifeDays() 
-    {
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public String getMaterialUnit() {
+        return materialUnit;
+    }
+
+    public void setMaterialUnit(String materialUnit) {
+        this.materialUnit = materialUnit;
+    }
+
+    public Long getShelfLifeDays() {
         return shelfLifeDays;
     }
 
-    public void setStorageTemperature(String storageTemperature) 
-    {
-        this.storageTemperature = storageTemperature;
+    public void setShelfLifeDays(Long shelfLifeDays) {
+        this.shelfLifeDays = shelfLifeDays;
     }
 
-    public String getStorageTemperature() 
-    {
+    public String getStorageTemperature() {
         return storageTemperature;
     }
 
-    public void setSpecialRequirements(String specialRequirements) 
-    {
-        this.specialRequirements = specialRequirements;
+    public void setStorageTemperature(String storageTemperature) {
+        this.storageTemperature = storageTemperature;
     }
 
-    public String getSpecialRequirements() 
-    {
+    public String getSpecialRequirements() {
         return specialRequirements;
     }
 
-    public void setIsBatchManaged(Long isBatchManaged) 
-    {
-        this.isBatchManaged = isBatchManaged;
+    public void setSpecialRequirements(String specialRequirements) {
+        this.specialRequirements = specialRequirements;
     }
 
-    public Long getIsBatchManaged() 
-    {
+    public Long getIsBatchManaged() {
         return isBatchManaged;
     }
 
-    public void setIsSerialManaged(Long isSerialManaged) 
-    {
-        this.isSerialManaged = isSerialManaged;
+    public void setIsBatchManaged(Long isBatchManaged) {
+        this.isBatchManaged = isBatchManaged;
     }
 
-    public Long getIsSerialManaged() 
-    {
+    public Long getIsSerialManaged() {
         return isSerialManaged;
     }
 
-    public void setMinStockLevel(Long minStockLevel) 
-    {
-        this.minStockLevel = minStockLevel;
+    public void setIsSerialManaged(Long isSerialManaged) {
+        this.isSerialManaged = isSerialManaged;
     }
 
-    public Long getMinStockLevel() 
-    {
+    public Long getMinStockLevel() {
         return minStockLevel;
     }
 
-    public void setMaxStockLevel(Long maxStockLevel) 
-    {
-        this.maxStockLevel = maxStockLevel;
+    public void setMinStockLevel(Long minStockLevel) {
+        this.minStockLevel = minStockLevel;
     }
 
-    public Long getMaxStockLevel() 
-    {
+    public Long getMaxStockLevel() {
         return maxStockLevel;
     }
 
-    public Long getIsUsed() { return isUsed; }
-
-    public void setIsUsed(Long isUsed) { this.isUsed = isUsed; }
-
-    public void setIsActive(Long isActive)
-    {
-        this.isActive = isActive;
+    public void setMaxStockLevel(Long maxStockLevel) {
+        this.maxStockLevel = maxStockLevel;
     }
 
-    public Long getIsActive() 
-    {
-        return isActive;
+    public Long getIsUsed() {
+        return isUsed;
     }
 
-    public void setRiskLevel(String riskLevel) 
-    {
-        this.riskLevel = riskLevel;
+    public void setIsUsed(Long isUsed) {
+        this.isUsed = isUsed;
     }
 
-    public String getRiskLevel() 
-    {
+    public String getRiskLevel() {
         return riskLevel;
     }
 
-    public void setSortNo(Long sortNo) 
-    {
-        this.sortNo = sortNo;
+    public void setRiskLevel(String riskLevel) {
+        this.riskLevel = riskLevel;
     }
 
-    public Long getSortNo() 
-    {
+    public Long getSortNo() {
         return sortNo;
     }
 
-    public void setCreateUserCode(String createUserCode) 
-    {
-        this.createUserCode = createUserCode;
+    public void setSortNo(Long sortNo) {
+        this.sortNo = sortNo;
     }
 
-    public String getCreateUserCode() 
-    {
+    public String getCreateUserCode() {
         return createUserCode;
     }
 
-    public void setUpdateUserCode(String updateUserCode) 
-    {
-        this.updateUserCode = updateUserCode;
+    public void setCreateUserCode(String createUserCode) {
+        this.createUserCode = createUserCode;
     }
 
-    public String getUpdateUserCode() 
-    {
+    public String getUpdateUserCode() {
         return updateUserCode;
     }
 
+    public void setUpdateUserCode(String updateUserCode) {
+        this.updateUserCode = updateUserCode;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("materialCode", getMaterialCode())
-            .append("materialName", getMaterialName())
-            .append("sapNo", getSapNo())
-            .append("tsCode", getTsCode())
-            .append("categoryCode", getCategoryCode())
-            .append("hazardId", getHazardId())
-            .append("specification", getSpecification())
-            .append("materialUnit", getMaterialUnit())
-            .append("unitWeight", getUnitWeight())
-            .append("packageWeight", getPackageWeight())
-            .append("totalWeight", getTotalWeight())
-            .append("volume", getVolume())
-            .append("shelfLifeDays", getShelfLifeDays())
-            .append("storageTemperature", getStorageTemperature())
-            .append("specialRequirements", getSpecialRequirements())
-            .append("isBatchManaged", getIsBatchManaged())
-            .append("isSerialManaged", getIsSerialManaged())
-            .append("minStockLevel", getMinStockLevel())
-            .append("maxStockLevel", getMaxStockLevel())
-            .append("isUsed",getIsUsed())
-            .append("isActive", getIsActive())
-            .append("riskLevel", getRiskLevel())
-            .append("sortNo", getSortNo())
-            .append("createTime", getCreateTime())
-            .append("createUserCode", getCreateUserCode())
-            .append("updateTime", getUpdateTime())
-            .append("updateUserCode", getUpdateUserCode())
-            .toString();
+        return "Materials{" +
+                "id='" + id + '\'' +
+                ", no=" + no +
+                ", ownerId='" + ownerId + '\'' +
+                ", sapNo='" + sapNo + '\'' +
+                ", isActive=" + isActive +
+                ", materialName='" + materialName + '\'' +
+                ", materialEname='" + materialEname + '\'' +
+                ", totalWeight=" + totalWeight +
+                ", unitWeight=" + unitWeight +
+                ", packageWeight=" + packageWeight +
+                ", volume=" + volume +
+                ", unitPrice=" + unitPrice +
+                ", remark='" + remark + '\'' +
+                ", materialCode='" + materialCode + '\'' +
+                ", tsCode='" + tsCode + '\'' +
+                ", categoryCode='" + categoryCode + '\'' +
+                ", hazardId='" + hazardId + '\'' +
+                ", specification='" + specification + '\'' +
+                ", materialUnit='" + materialUnit + '\'' +
+                ", shelfLifeDays=" + shelfLifeDays +
+                ", storageTemperature='" + storageTemperature + '\'' +
+                ", specialRequirements='" + specialRequirements + '\'' +
+                ", isBatchManaged=" + isBatchManaged +
+                ", isSerialManaged=" + isSerialManaged +
+                ", minStockLevel=" + minStockLevel +
+                ", maxStockLevel=" + maxStockLevel +
+                ", isUsed=" + isUsed +
+                ", riskLevel='" + riskLevel + '\'' +
+                ", sortNo=" + sortNo +
+                ", createUserCode='" + createUserCode + '\'' +
+                ", updateUserCode='" + updateUserCode + '\'' +
+                '}';
     }
 }