diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java index 00eeafe..249a693 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java @@ -134,6 +134,11 @@ public class WmsInTask extends BaseEntity { @Excel(name = "入库明细ID") private Long detailInId; + /** + * 计划类型编码 + */ + private String planTypeCode; + private List wmsInPlanDetailEntityList; public void setId(Long id) { @@ -328,6 +333,14 @@ public class WmsInTask extends BaseEntity { this.wmsInPlanDetailEntityList = wmsInPlanDetailEntityList; } + public String getPlanTypeCode() { + return planTypeCode; + } + + public void setPlanTypeCode(String planTypeCode) { + this.planTypeCode = planTypeCode; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -353,6 +366,7 @@ public class WmsInTask extends BaseEntity { .append("batch", getBatch()) .append("materialId", getMaterialId()) .append("planTypeId", getPlanTypeId()) + .append("planTypeCode", getPlanTypeCode()) .append("planInStatus", getPlanInStatus()) .append("planInCode", getPlanInCode()) .append("materialCode", getMaterialCode()) diff --git a/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml index 25319a7..8dc5dc1 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml @@ -24,6 +24,7 @@ + @@ -50,6 +51,7 @@ a.BATCH, a.MATERIAL_ID, a.PLAN_TYPE_ID, + a.PLAN_TYPE_CODE, a.PLAN_IN_STATUS, a.PLAN_IN_CODE, a.MATERIAL_CODE, @@ -84,6 +86,7 @@ and BATCH like concat('%', #{batch}, '%') and MATERIAL_ID = #{materialId} and PLAN_TYPE_ID = #{planTypeId} + and PLAN_TYPE_CODE = #{planTypeCode} and PLAN_IN_STATUS = #{planInStatus} and PLAN_IN_CODE = #{planInCode} and MATERIAL_CODE like concat('%', #{materialCode}, '%') @@ -116,6 +119,7 @@ BATCH, MATERIAL_ID, PLAN_TYPE_ID, + PLAN_TYPE_CODE, PLAN_IN_STATUS, PLAN_IN_CODE, MATERIAL_CODE, @@ -138,6 +142,7 @@ #{batch}, #{materialId}, #{planTypeId}, + #{planTypeCode}, #{planInStatus}, #{planInCode}, #{materialCode}, @@ -164,6 +169,7 @@ BATCH = #{batch}, MATERIAL_ID = #{materialId}, PLAN_TYPE_ID = #{planTypeId}, + PLAN_TYPE_CODE = #{planTypeCode}, PLAN_IN_STATUS = #{planInStatus}, PLAN_IN_CODE = #{planInCode}, MATERIAL_CODE = #{materialCode},