diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java index 57c2554..293de8d 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java @@ -57,6 +57,10 @@ public class MesBaseMaterialInfo extends BaseEntity @Excel(name = "批次标识,(0否,1是)") private String batchFlag; + /** 批次数量,例如一袋螺丝有60个 */ + @Excel(name = "批次数量,例如一袋螺丝有60个") + private BigDecimal batchAmount; + /** 计量单位ID;对应FBaseUnitId */ @Excel(name = "计量单位ID;对应FBaseUnitId") private Long materialUnitId; @@ -81,6 +85,10 @@ public class MesBaseMaterialInfo extends BaseEntity @Excel(name = "毛重;FGROSSWEIGHT") private BigDecimal grossWeight; + /** 绑定标识(1是,0否),如果需要绑定,则需要将销售订单绑定具体的采购订单明细 */ + @Excel(name = "绑定标识(1是,0否),如果需要绑定,则需要将销售订单绑定具体的采购订单明细") + private String bindFlag; + /** 所属工厂,关联mes_base_factory_info的factory_id */ @Excel(name = "所属工厂,关联mes_base_factory_info的factory_id") private Long factoryId; @@ -206,6 +214,15 @@ public class MesBaseMaterialInfo extends BaseEntity { return batchFlag; } + + public BigDecimal getBatchAmount() { + return batchAmount; + } + + public void setBatchAmount(BigDecimal batchAmount) { + this.batchAmount = batchAmount; + } + public void setMaterialUnitId(Long materialUnitId) { this.materialUnitId = materialUnitId; @@ -260,6 +277,15 @@ public class MesBaseMaterialInfo extends BaseEntity { return grossWeight; } + + public String getBindFlag() { + return bindFlag; + } + + public void setBindFlag(String bindFlag) { + this.bindFlag = bindFlag; + } + public void setFactoryId(Long factoryId) { this.factoryId = factoryId; diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml index 5cc219a..5cb5d7a 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml @@ -15,12 +15,14 @@ + + @@ -207,6 +209,8 @@ update_time = #{updateTime}, approve_date = #{approveDate}, erp_modify_date = #{erpModifyDate}, + bind_flag = #{bindFlag}, + batch_amount = #{batchAmount}, where material_id = #{materialId}