feat(入库计划): 增加 计划类型编码字段

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java

@@ -150,8 +150,13 @@ public class WmsInPlan extends BaseEntity {
     /**
      * 入库类型
      */
-    @Excel(name = "入库类型")
+    @Excel(name = "入库类型ID")
-    private String planTypeId;
+    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<WmsInPlanDetails> 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();
     }

ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml

@@ -33,6 +33,7 @@
         <result property="isDelete" column="IS_DELETE"/>
         <result property="planCode" column="PLAN_CODE"/>
         <result property="planTypeId" column="PLAN_TYPE_ID"/>
+        <result property="planTypeCode" column="PLAN_TYPE_CODE"/>
     </resultMap>
 
     <resultMap id="WmsInPlanWmsInPlanDetailsResult" type="WmsInPlan" extends="WmsInPlanResult">
@@ -105,6 +106,7 @@
                IS_DELETE,
                PLAN_CODE,
                PLAN_TYPE_ID
+               PLAN_TYPE_CODE
         from WMS_IN_PLAN
     </sql>
 
@@ -140,6 +142,7 @@
             <if test="isDelete != null  and isDelete != ''">and IS_DELETE = #{isDelete}</if>
             <if test="planCode != null  and planCode != ''">and PLAN_CODE = #{planCode}</if>
             <if test="planTypeId != null  and planTypeId != ''">and PLAN_TYPE_ID = #{planTypeId}</if>
+            <if test="planTypeCode != null  and planTypeCode != ''">and PLAN_TYPE_CODE = #{planTypeCode}</if>
         </where>
         order by CREATE_TIME desc
     </select>
@@ -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 @@
             <if test="isDelete != null">IS_DELETE,</if>
             <if test="planCode != null">PLAN_CODE,</if>
             <if test="planTypeId != null">PLAN_TYPE_ID,</if>
+            <if test="planTypeCode != null">PLAN_TYPE_CODE,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="state != null">#{state},</if>
@@ -301,6 +307,7 @@
             <if test="isDelete != null">#{isDelete},</if>
             <if test="planCode != null">#{planCode},</if>
             <if test="planTypeId != null">#{planTypeId},</if>
+            <if test="planTypeCode != null">#{planTypeCode},</if>
         </trim>
     </insert>
 
@@ -334,6 +341,7 @@
             <if test="isDelete != null">IS_DELETE = #{isDelete},</if>
             <if test="planCode != null">PLAN_CODE = #{planCode},</if>
             <if test="planTypeId != null">PLAN_TYPE_ID = #{planTypeId},</if>
+            <if test="planTypeCode != null">PLAN_TYPE_CODE = #{planTypeCode},</if>
         </trim>
         where PLAN_ID = #{planId}
     </update>