Skip to content

M
mini-wms
Commit 88edf56f by yubin
Options

Merge remote-tracking branch 'origin/master'

parents f3d69c31 879deeb8
正在显示 包含 232 行增加 和 211 行删除
ruoyi-admin-vue/src/views/inventory/materials/index.vue
...@@ -654,7 +654,7 @@ export default { ...@@ -654,7 +654,7 @@ export default {
.map(item => ({ .map(item => ({
...item, ...item,
// 兜底：如果映射表中没有，显示原始code并标注 // 兜底：如果映射表中没有，显示原始code并标注
displayCategory: this.categoryMap[item.categoryCode] || `${item.categoryCode}（未匹配分类）` displayCategory: this.categoryMap[item.categoryCode] || `未匹配分类`
})); }));
this.total = total; this.total = total;
} catch (error) { } 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; ...@@ -11,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author ruoyi * @author ruoyi
* @date 2025-11-28 * @date 2025-11-28
*/ */
public class Materials extends BaseEntity public class Materials extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -18,94 +19,115 @@ public class Materials extends BaseEntity ...@@ -18,94 +19,115 @@ public class Materials extends BaseEntity
/** 编号 */ /** 编号 */
private String id; private String id;
/** 物料编码 检索条件 */ @Excel(name = "NO.")
private String materialCode; private Long no;
/** 货主 数据库暂无字段 */
@Excel(name = "货主")
private String ownerId;
/** SAP物料号 检索条件 */ /** SAP物料号 检索条件 */
@Excel(name = "SAP物料号") @Excel(name = "产品代码")
private String sapNo; private String sapNo;
/** 是否激活 Y-是 N-否 */
@Excel(name = "激活")
private Long isActive;
/** 物料名称 检索条件 */ /** 物料名称 检索条件 */
@Excel(name = "物料名称") @Excel(name = "中文描述")
private String materialName; 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 检索条件 */ /** TS Code 检索条件 */
@Excel(name = "TS Code") // @Excel(name = "TS Code")
private String tsCode; private String tsCode;
/** 物料分类 检索条件 */ /** 物料分类 检索条件 */
@Excel(name = "物料分类") // @Excel(name = "物料分类")
private String categoryCode; private String categoryCode;
/** 危险类别ID 字典 */ /** 危险类别ID 字典 */
@Excel(name = "危险类别ID") // @Excel(name = "危险类别ID")
private String hazardId; private String hazardId;
/** 规格型号 检索条件 */ /** 规格型号 检索条件 */
@Excel(name = "规格型号") // @Excel(name = "规格型号")
private String specification; private String specification;
/** 计量单位 字典 */ /** 计量单位 字典 */
@Excel(name = "计量单位") // @Excel(name = "计量单位")
private String materialUnit; 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; private Long shelfLifeDays;
/** 存储温度要求 */ /** 存储温度要求 */
@Excel(name = "存储温度要求") // @Excel(name = "存储温度要求")
private String storageTemperature; private String storageTemperature;
/** 特殊存储要求 */ /** 特殊存储要求 */
@Excel(name = "特殊存储要求") // @Excel(name = "特殊存储要求")
private String specialRequirements; private String specialRequirements;
/** 是否批次管理 1-是 0-否 */ /** 是否批次管理 1-是 0-否 */
@Excel(name = "是否批次管理 1-是 0-否") // @Excel(name = "是否批次管理 1-是 0-否")
private Long isBatchManaged; private Long isBatchManaged;
/** 是否序列号管理 1-是 0-否 */ /** 是否序列号管理 1-是 0-否 */
@Excel(name = "是否序列号管理 1-是 0-否") // @Excel(name = "是否序列号管理 1-是 0-否")
private Long isSerialManaged; private Long isSerialManaged;
/** 最低库存 */ /** 最低库存 */
@Excel(name = "最低库存") // @Excel(name = "最低库存")
private Long minStockLevel; private Long minStockLevel;
/** 最高库存 */ /** 最高库存 */
@Excel(name = "最高库存") // @Excel(name = "最高库存")
private Long maxStockLevel; private Long maxStockLevel;
/** 是否正在使用 1-是 0-否 */ /** 是否正在使用 1-是 0-否 */
@Excel(name = "是否正在使用 1-是 0-否") // @Excel(name = "是否正在使用 1-是 0-否")
private Long isUsed; private Long isUsed;
/** 是否激活 1-是 0-否 */
@Excel(name = "是否激活 1-是 0-否")
private Long isActive;
/** 风险等级 字典 */ /** 风险等级 字典 */
@Excel(name = "风险等级") // @Excel(name = "风险等级")
private String riskLevel; private String riskLevel;
/** 排序 */ /** 排序 */
@Excel(name = "排序") // @Excel(name = "排序")
private Long sortNo; private Long sortNo;
/** 创建日期 */ /** 创建日期 */
...@@ -114,291 +136,290 @@ public class Materials extends BaseEntity ...@@ -114,291 +136,290 @@ public class Materials extends BaseEntity
/** 排序号 */ /** 排序号 */
private String updateUserCode; private String updateUserCode;
public void setId(String id) public String getId() {
{
this.id = id;
}
public String getId()
{
return id; return id;
} }
public void setMaterialCode(String materialCode) public void setId(String id) {
{ this.id = id;
this.materialCode = materialCode;
} }
public String getMaterialCode() public Long getNo() {
{ return no;
return materialCode;
} }
public void setMaterialName(String materialName) public void setNo(Long no) {
{ this.no = no;
this.materialName = materialName;
} }
public String getMaterialName() public String getOwnerId() {
{ return ownerId;
return materialName;
} }
public void setSapNo(String sapNo) public void setOwnerId(String ownerId) {
{ this.ownerId = ownerId;
this.sapNo = sapNo;
} }
public String getSapNo() public String getSapNo() {
{
return sapNo; return sapNo;
} }
public void setTsCode(String tsCode) public void setSapNo(String sapNo) {
{ this.sapNo = sapNo;
this.tsCode = tsCode;
} }
public String getTsCode() public Long getIsActive() {
{ return isActive;
return tsCode;
} }
public void setCategoryCode(String categoryCode) public void setIsActive(Long isActive) {
{ this.isActive = isActive;
this.categoryCode = categoryCode;
} }
public String getCategoryCode() public String getMaterialName() {
{ return materialName;
return categoryCode;
} }
public void setHazardId(String hazardId) public void setMaterialName(String materialName) {
{ this.materialName = materialName;
this.hazardId = hazardId;
} }
public String getHazardId() public String getMaterialEname() {
{ return materialEname;
return hazardId;
} }
public void setSpecification(String specification) public void setMaterialEname(String materialEname) {
{ this.materialEname = materialEname;
this.specification = specification;
} }
public String getSpecification() public Long getTotalWeight() {
{ return totalWeight;
return specification;
} }
public void setMaterialUnit(String materialUnit) public void setTotalWeight(Long totalWeight) {
{ this.totalWeight = totalWeight;
this.materialUnit = materialUnit;
} }
public String getMaterialUnit() public Long getUnitWeight() {
{ return unitWeight;
return materialUnit;
} }
public void setUnitWeight(Long unitWeight) public void setUnitWeight(Long unitWeight) {
{
this.unitWeight = unitWeight; this.unitWeight = unitWeight;
} }
public Long getUnitWeight() public Long getPackageWeight() {
{ return packageWeight;
return unitWeight;
} }
public void setPackageWeight(Long packageWeight) public void setPackageWeight(Long packageWeight) {
{
this.packageWeight = packageWeight; this.packageWeight = packageWeight;
} }
public Long getPackageWeight() public Long getVolume() {
{ return volume;
return packageWeight;
} }
public void setTotalWeight(Long totalWeight) public void setVolume(Long volume) {
{ this.volume = volume;
this.totalWeight = totalWeight;
} }
public Long getTotalWeight() public Long getUnitPrice() {
{ return unitPrice;
return totalWeight;
} }
public void setVolume(Long volume) public void setUnitPrice(Long unitPrice) {
{ this.unitPrice = unitPrice;
this.volume = volume;
} }
public Long getVolume() @Override
{ public String getRemark() {
return volume; return remark;
} }
public void setShelfLifeDays(Long shelfLifeDays) @Override
{ public void setRemark(String remark) {
this.shelfLifeDays = shelfLifeDays; 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; return shelfLifeDays;
} }
public void setStorageTemperature(String storageTemperature) public void setShelfLifeDays(Long shelfLifeDays) {
{ this.shelfLifeDays = shelfLifeDays;
this.storageTemperature = storageTemperature;
} }
public String getStorageTemperature() public String getStorageTemperature() {
{
return storageTemperature; return storageTemperature;
} }
public void setSpecialRequirements(String specialRequirements) public void setStorageTemperature(String storageTemperature) {
{ this.storageTemperature = storageTemperature;
this.specialRequirements = specialRequirements;
} }
public String getSpecialRequirements() public String getSpecialRequirements() {
{
return specialRequirements; return specialRequirements;
} }
public void setIsBatchManaged(Long isBatchManaged) public void setSpecialRequirements(String specialRequirements) {
{ this.specialRequirements = specialRequirements;
this.isBatchManaged = isBatchManaged;
} }
public Long getIsBatchManaged() public Long getIsBatchManaged() {
{
return isBatchManaged; return isBatchManaged;
} }
public void setIsSerialManaged(Long isSerialManaged) public void setIsBatchManaged(Long isBatchManaged) {
{ this.isBatchManaged = isBatchManaged;
this.isSerialManaged = isSerialManaged;
} }
public Long getIsSerialManaged() public Long getIsSerialManaged() {
{
return isSerialManaged; return isSerialManaged;
} }
public void setMinStockLevel(Long minStockLevel) public void setIsSerialManaged(Long isSerialManaged) {
{ this.isSerialManaged = isSerialManaged;
this.minStockLevel = minStockLevel;
} }
public Long getMinStockLevel() public Long getMinStockLevel() {
{
return minStockLevel; return minStockLevel;
} }
public void setMaxStockLevel(Long maxStockLevel) public void setMinStockLevel(Long minStockLevel) {
{ this.minStockLevel = minStockLevel;
this.maxStockLevel = maxStockLevel;
} }
public Long getMaxStockLevel() public Long getMaxStockLevel() {
{
return maxStockLevel; return maxStockLevel;
} }
public Long getIsUsed() { return isUsed; } public void setMaxStockLevel(Long maxStockLevel) {
this.maxStockLevel = maxStockLevel;
public void setIsUsed(Long isUsed) { this.isUsed = isUsed; }
public void setIsActive(Long isActive)
{
this.isActive = isActive;
} }
public Long getIsActive() public Long getIsUsed() {
{ return isUsed;
return isActive;
} }
public void setRiskLevel(String riskLevel) public void setIsUsed(Long isUsed) {
{ this.isUsed = isUsed;
this.riskLevel = riskLevel;
} }
public String getRiskLevel() public String getRiskLevel() {
{
return riskLevel; return riskLevel;
} }
public void setSortNo(Long sortNo) public void setRiskLevel(String riskLevel) {
{ this.riskLevel = riskLevel;
this.sortNo = sortNo;
} }
public Long getSortNo() public Long getSortNo() {
{
return sortNo; return sortNo;
} }
public void setCreateUserCode(String createUserCode) public void setSortNo(Long sortNo) {
{ this.sortNo = sortNo;
this.createUserCode = createUserCode;
} }
public String getCreateUserCode() public String getCreateUserCode() {
{
return createUserCode; return createUserCode;
} }
public void setUpdateUserCode(String updateUserCode) public void setCreateUserCode(String createUserCode) {
{ this.createUserCode = createUserCode;
this.updateUserCode = updateUserCode;
} }
public String getUpdateUserCode() public String getUpdateUserCode() {
{
return updateUserCode; return updateUserCode;
} }
public void setUpdateUserCode(String updateUserCode) {
this.updateUserCode = updateUserCode;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "Materials{" +
.append("id", getId()) "id='" + id + '\'' +
.append("materialCode", getMaterialCode()) ", no=" + no +
.append("materialName", getMaterialName()) ", ownerId='" + ownerId + '\'' +
.append("sapNo", getSapNo()) ", sapNo='" + sapNo + '\'' +
.append("tsCode", getTsCode()) ", isActive=" + isActive +
.append("categoryCode", getCategoryCode()) ", materialName='" + materialName + '\'' +
.append("hazardId", getHazardId()) ", materialEname='" + materialEname + '\'' +
.append("specification", getSpecification()) ", totalWeight=" + totalWeight +
.append("materialUnit", getMaterialUnit()) ", unitWeight=" + unitWeight +
.append("unitWeight", getUnitWeight()) ", packageWeight=" + packageWeight +
.append("packageWeight", getPackageWeight()) ", volume=" + volume +
.append("totalWeight", getTotalWeight()) ", unitPrice=" + unitPrice +
.append("volume", getVolume()) ", remark='" + remark + '\'' +
.append("shelfLifeDays", getShelfLifeDays()) ", materialCode='" + materialCode + '\'' +
.append("storageTemperature", getStorageTemperature()) ", tsCode='" + tsCode + '\'' +
.append("specialRequirements", getSpecialRequirements()) ", categoryCode='" + categoryCode + '\'' +
.append("isBatchManaged", getIsBatchManaged()) ", hazardId='" + hazardId + '\'' +
.append("isSerialManaged", getIsSerialManaged()) ", specification='" + specification + '\'' +
.append("minStockLevel", getMinStockLevel()) ", materialUnit='" + materialUnit + '\'' +
.append("maxStockLevel", getMaxStockLevel()) ", shelfLifeDays=" + shelfLifeDays +
.append("isUsed",getIsUsed()) ", storageTemperature='" + storageTemperature + '\'' +
.append("isActive", getIsActive()) ", specialRequirements='" + specialRequirements + '\'' +
.append("riskLevel", getRiskLevel()) ", isBatchManaged=" + isBatchManaged +
.append("sortNo", getSortNo()) ", isSerialManaged=" + isSerialManaged +
.append("createTime", getCreateTime()) ", minStockLevel=" + minStockLevel +
.append("createUserCode", getCreateUserCode()) ", maxStockLevel=" + maxStockLevel +
.append("updateTime", getUpdateTime()) ", isUsed=" + isUsed +
.append("updateUserCode", getUpdateUserCode()) ", riskLevel='" + riskLevel + '\'' +
.toString(); ", sortNo=" + sortNo +
", createUserCode='" + createUserCode + '\'' +
", updateUserCode='" + updateUserCode + '\'' +
'}';
} }
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论