diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 22c81ff62..22ba6574a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -346,6 +346,16 @@ public class BaseEquipment extends BaseEntity { @Excel(name = "计量单位") private String unitMeasurement; + //新增SAP字段 + /** + * SAP线体编码 + */ + private String sapCode; + /** + * SAP线体名称 + */ + private String sapName; + private String imageFileList; private String barCodeFileList; @@ -1134,6 +1144,22 @@ public class BaseEquipment extends BaseEntity { return unitMeasurement; } + //SAP线体编码 + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } + public String getSapCode() { + return sapCode; + } + + //SAP线体名称 + public void setSapName(String sapName) { + this.sapName = sapName; + } + public String getSapName() { + return sapName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index a4fbd98f0..cf87e858f 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -54,7 +54,8 @@ - + + @@ -175,7 +176,9 @@ asset_description, equipment_number, inventory_number, - unit_measurement + unit_measurement, + sap_code, + sap_name from base_equipment @@ -251,6 +254,8 @@ and equipment_number = #{equipmentNumber} and inventory_number = #{inventoryNumber} and unit_measurement = #{unitMeasurement} + and sap_code = #{sapCode} + and sap_name = #{sapName} and del_flag ='0' @@ -318,6 +323,8 @@ equipment_number, inventory_number, unit_measurement, + sap_code, + sap_name, #{equipmentCode}, @@ -368,6 +375,8 @@ #{equipmentNumber}, #{inventoryNumber}, #{unitMeasurement}, + #{sapCode}, + #{sapName}, @@ -427,6 +436,8 @@ equipment_number = #{equipmentNumber}, inventory_number = #{inventoryNumber}, unit_measurement = #{unitMeasurement}, + sap_code = #{sapCode}, + sap_name = #{sapName}, where equipment_id = #{equipmentId}