diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsZdTask.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsZdTask.java index a4f0cf4..ecb10ff 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsZdTask.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsZdTask.java @@ -1,5 +1,6 @@ package com.ktg.mes.wm.domain; +import com.ktg.mes.md.domain.BaseTechnologyBom; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ktg.common.annotation.Excel; @@ -53,6 +54,8 @@ public class WmsZdTask extends BaseEntity @Excel(name = "预留字段1") private Long attr1; + private String planSheet; + /** 预留字段2 */ @Excel(name = "预留字段2") private String attr2; @@ -196,6 +199,14 @@ public class WmsZdTask extends BaseEntity return status; } + public String getPlanSheet() { + return planSheet; + } + + public void setPlanSheet(String planSheet) { + this.planSheet = planSheet; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml index 3dd0850..d27d504 100644 --- a/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml @@ -83,7 +83,6 @@ BK.IS_LOCKED, BK.LOCKED_START_TIME, BK.LOCKED_END_TIME, - BK.PLAN_SHEET, BK.RESET_COUNT, BK.ITEM_OR_PRODUCT, BK.REMARK, @@ -94,10 +93,12 @@ BK.CREATE_BY, BK.CREATE_TIME, BK.UPDATE_BY, - BK.UPDATE_TIME + BK.UPDATE_TIME, + BTB.FIGURE_CODE PLAN_SHEET from BASE_KNIFE BK LEFT JOIN MD_ITEM MI on BK.MBB_BD_MRL_ID = MI.ITEM_ID LEFT JOIN MD_ITEM_TYPE MIT ON MI.ITEM_TYPE_ID = MIT.ITEM_TYPE_ID + LEFT JOIN BASE_TECHNOLOGY_BOM BTB ON BTB.TECHNOLOGY_BOM_ID = BK.PLAN_SHEET