diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java index f167e5c..ae5253b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java @@ -150,8 +150,13 @@ public class WmsInPlan extends BaseEntity { /** * 入库类型 */ - @Excel(name = "入库类型") - private String planTypeId; + @Excel(name = "入库类型ID") + private Long planTypeId; + + /** + * 入库类型编码 + */ + private String planTypeCode; /** * 入库计划明细信息 @@ -334,14 +339,22 @@ public class WmsInPlan extends BaseEntity { return planCode; } - public void setPlanTypeId(String planTypeId) { + public void setPlanTypeId(Long planTypeId) { this.planTypeId = planTypeId; } - public String getPlanTypeId() { + public Long getPlanTypeId() { return planTypeId; } + public String getPlanTypeCode() { + return planTypeCode; + } + + public void setPlanTypeCode(String planTypeCode) { + this.planTypeCode = planTypeCode; + } + public List getWmsInPlanDetailsList() { return wmsInPlanDetailsList; } @@ -381,6 +394,7 @@ public class WmsInPlan extends BaseEntity { .append("isDelete", getIsDelete()) .append("planCode", getPlanCode()) .append("planTypeId", getPlanTypeId()) + .append("planTypeCode", getPlanTypeCode()) .append("wmsInPlanDetailsList", getWmsInPlanDetailsList()) .toString(); } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml index 663c528..70789ed 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml @@ -33,6 +33,7 @@ + @@ -105,6 +106,7 @@ IS_DELETE, PLAN_CODE, PLAN_TYPE_ID + PLAN_TYPE_CODE from WMS_IN_PLAN @@ -140,6 +142,7 @@ and IS_DELETE = #{isDelete} and PLAN_CODE = #{planCode} and PLAN_TYPE_ID = #{planTypeId} + and PLAN_TYPE_CODE = #{planTypeCode} order by CREATE_TIME desc @@ -173,6 +176,7 @@ a.IS_DELETE, a.PLAN_CODE, a.PLAN_TYPE_ID, + a.PLAN_TYPE_CODE, b.DETAILS_ID as sub_DETAILS_ID, b.PLAN_ID as sub_PLAN_ID, b.MATERIAL_ID as sub_MATERIAL_ID, @@ -222,6 +226,7 @@ a.IS_DELETE, a.PLAN_CODE, a.PLAN_TYPE_ID, + a.PLAN_TYPE_CODE, b.DETAILS_ID as sub_DETAILS_ID, b.PLAN_ID as sub_PLAN_ID, b.MATERIAL_ID as sub_MATERIAL_ID, @@ -272,6 +277,7 @@ IS_DELETE, PLAN_CODE, PLAN_TYPE_ID, + PLAN_TYPE_CODE, #{state}, @@ -301,6 +307,7 @@ #{isDelete}, #{planCode}, #{planTypeId}, + #{planTypeCode}, @@ -334,6 +341,7 @@ IS_DELETE = #{isDelete}, PLAN_CODE = #{planCode}, PLAN_TYPE_ID = #{planTypeId}, + PLAN_TYPE_CODE = #{planTypeCode}, where PLAN_ID = #{planId}