diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
index 1f4ea83a..09535125 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
@@ -203,6 +203,174 @@ public class SparePartsLedger extends BaseEntity {
@Excel(name = "备件类型", readConverterExp = "备=件用")
private String spareType;
+//////////////////////////////////////////////////////////附属表
+
+ /** id */
+ private String id;
+
+ /** 主表备件编码 */
+ @Excel(name = "主表备件编码")
+ private String primaryCode;
+
+ /** 所属设备名称 */
+ @Excel(name = "所属设备名称")
+ private String ownEquipmentName;
+
+ /** 单机装配数量 */
+ @Excel(name = "单机装配数量")
+ private String unitQuantity;
+
+ /** 安全库存 */
+ @Excel(name = "安全库存")
+ private String safeStock;
+
+ /** 单价 */
+ @Excel(name = "单价")
+ private BigDecimal unitPrice;
+
+ /** 采购方式 */
+ @Excel(name = "采购方式")
+ private String procurementMethod;
+
+ /** 采购周期 */
+ @Excel(name = "采购周期")
+ private String procurementCycle;
+
+ /** 期初结存 */
+ @Excel(name = "期初结存")
+ private String openingBalance;
+
+ /** 出库记录 */
+ @Excel(name = "出库记录")
+ private String outputRecords;
+
+ /** 入库记录 */
+ @Excel(name = "入库记录")
+ private String inputRecords;
+
+ /** 期末盘点 */
+ @Excel(name = "期末盘点")
+ private String endInventory;
+
+ /** 期末金额 */
+ @Excel(name = "期末金额")
+ private BigDecimal endMoney;
+
+ /** 代用件 */
+ @Excel(name = "代用件")
+ private String substituteParts;
+
+ /** 所属设备编码 */
+ @Excel(name = "所属设备编码")
+ private String ownEquipmentCode;
+
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getId() {
+ return id;
+ }
+
+ public void setPrimaryCode(String primaryCode) {
+ this.primaryCode = primaryCode;
+ }
+ public String getPrimaryCode() {
+ return primaryCode;
+ }
+
+ public void setOwnEquipmentName(String ownEquipmentName) {
+ this.ownEquipmentName = ownEquipmentName;
+ }
+ public String getOwnEquipmentName() {
+ return ownEquipmentName;
+ }
+
+ public void setUnitQuantity(String unitQuantity) {
+ this.unitQuantity = unitQuantity;
+ }
+ public String getUnitQuantity() {
+ return unitQuantity;
+ }
+
+ public void setSafeStock(String safeStock) {
+ this.safeStock = safeStock;
+ }
+ public String getSafeStock() {
+ return safeStock;
+ }
+
+ public void setUnitPrice(BigDecimal unitPrice) {
+ this.unitPrice = unitPrice;
+ }
+ public BigDecimal getUnitPrice() {
+ return unitPrice;
+ }
+
+ public void setProcurementMethod(String procurementMethod) {
+ this.procurementMethod = procurementMethod;
+ }
+ public String getProcurementMethod() {
+ return procurementMethod;
+ }
+
+ public void setProcurementCycle(String procurementCycle) {
+ this.procurementCycle = procurementCycle;
+ }
+ public String getProcurementCycle() {
+ return procurementCycle;
+ }
+
+ public void setOpeningBalance(String openingBalance) {
+ this.openingBalance = openingBalance;
+ }
+ public String getOpeningBalance() {
+ return openingBalance;
+ }
+
+ public void setOutputRecords(String outputRecords) {
+ this.outputRecords = outputRecords;
+ }
+ public String getOutputRecords() {
+ return outputRecords;
+ }
+
+ public void setInputRecords(String inputRecords) {
+ this.inputRecords = inputRecords;
+ }
+ public String getInputRecords() {
+ return inputRecords;
+ }
+
+ public void setEndInventory(String endInventory) {
+ this.endInventory = endInventory;
+ }
+ public String getEndInventory() {
+ return endInventory;
+ }
+
+ public void setEndMoney(BigDecimal endMoney) {
+ this.endMoney = endMoney;
+ }
+ public BigDecimal getEndMoney() {
+ return endMoney;
+ }
+
+ public void setSubstituteParts(String substituteParts) {
+ this.substituteParts = substituteParts;
+ }
+ public String getSubstituteParts() {
+ return substituteParts;
+ }
+
+ public void setOwnEquipmentCode(String ownEquipmentCode) {
+ this.ownEquipmentCode = ownEquipmentCode;
+ }
+ public String getOwnEquipmentCode() {
+ return ownEquipmentCode;
+ }
+
+ /////////////////////////////
+
// 领用数量-保养备件领用使用
private BigDecimal applyNum;
public BigDecimal getApplyNum() {
diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
index f1b7a8d6..513363e4 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
@@ -32,6 +32,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,53 +87,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"