diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
index 2d9716a..8fb0307 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
@@ -596,7 +596,7 @@ public class BaseKnifeController extends BaseController {
         productionArrangements.setCreateTime(DateUtils.getNowDate());
         productionArrangementsMapper.insertProductionArrangements(productionArrangements);
 
-        if (!msg.contains("缺少物料已生成组装任务！")){
+        if (!msg.contains("缺少物料已生成组装任务！")) {
             // 生成出库计划单
             WmsOutPlan outPlan = new WmsOutPlan();
             outPlan.setPlanCode(productionArrangements.getPlanSheet());
@@ -905,7 +905,8 @@ public class BaseKnifeController extends BaseController {
             wmsInPlanTemp.setCellCode(zdTask.getAttr3());
             wmsInPlanTemp.setPlanCode(zdTask.getAttr4() == null ? zdTask.getCode() : zdTask.getAttr4());
             wmsInPlanTemp.setRelBillCode("组装单据");
-            wmsInPlanTemp.setPlanTypeId("13");
+            wmsInPlanTemp.setPlanTypeId(13L);
+            wmsInPlanTemp.setPlanTypeCode("ZDRK");
             wmsInPlanTemp.setCreateBy(getUsername());
             wmsInPlanTemp.setCreateTime(DateUtils.getNowDate());
 
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<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();
     }
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<WmsInPlanDetailEntity> 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/java/com/ktg/mes/wm/service/impl/WmsInPlanDetailEntityServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsInPlanDetailEntityServiceImpl.java
index 9182d82..bdf379c 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsInPlanDetailEntityServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsInPlanDetailEntityServiceImpl.java
@@ -68,7 +68,7 @@ public class WmsInPlanDetailEntityServiceImpl implements IWmsInPlanDetailEntityS
             // 获取入库计划信息
             WmsInPlan wmsInPlan = wmsInPlanMapper.selectWmsInPlanByPlanId(entity.getPlanId().toString());
             // 获取入库计划
-            WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsInPlan.getPlanTypeId());
+            WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsInPlan.getPlanTypeId().toString());
 
             for (WmsInPlanDetails detail : wmsInPlan.getWmsInPlanDetailsList()) {
                 // 匹配入库明细
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java
index 07f8142..151b1c4 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java
@@ -386,7 +386,7 @@ public class WmsZdTaskServiceImpl implements IWmsZdTaskService
             wmsInPlanTemp.setCellCode(wmStorageArea.getAreaCode());
             wmsInPlanTemp.setPlanCode(zdTask.getPlanSheet() != null ? zdTask.getPlanSheet() : zdTask.getCode());
             wmsInPlanTemp.setRelBillCode("组装单据");
-            wmsInPlanTemp.setPlanTypeId("13");
+            wmsInPlanTemp.setPlanTypeId(13L);
             wmsInPlanTemp.setCreateBy(getUsername());
             wmsInPlanTemp.setCreateTime(DateUtils.getNowDate());
 
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 @@
         <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>
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 @@
         <result property="batch" column="BATCH"/>
         <result property="materialId" column="MATERIAL_ID"/>
         <result property="planTypeId" column="PLAN_TYPE_ID"/>
+        <result property="planTypeCode" column="PLAN_TYPE_CODE"/>
         <result property="planInStatus" column="PLAN_IN_STATUS"/>
         <result property="planInCode" column="PLAN_IN_CODE"/>
         <result property="materialCode" column="MATERIAL_CODE"/>
@@ -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 @@
             <if test="batch != null  and batch != ''">and BATCH like concat('%', #{batch}, '%')</if>
             <if test="materialId != null  and materialId != ''">and MATERIAL_ID = #{materialId}</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>
             <if test="planInStatus != null  and planInStatus != ''">and PLAN_IN_STATUS = #{planInStatus}</if>
             <if test="planInCode != null  and planInCode != ''">and PLAN_IN_CODE = #{planInCode}</if>
             <if test="materialCode != null  and materialCode != ''">and MATERIAL_CODE like concat('%', #{materialCode}, '%')</if>
@@ -116,6 +119,7 @@
             <if test="batch != null">BATCH,</if>
             <if test="materialId != null">MATERIAL_ID,</if>
             <if test="planTypeId != null">PLAN_TYPE_ID,</if>
+            <if test="planTypeCode != null">PLAN_TYPE_CODE,</if>
             <if test="planInStatus != null">PLAN_IN_STATUS,</if>
             <if test="planInCode != null">PLAN_IN_CODE,</if>
             <if test="materialCode != null">MATERIAL_CODE,</if>
@@ -138,6 +142,7 @@
             <if test="batch != null">#{batch},</if>
             <if test="materialId != null">#{materialId},</if>
             <if test="planTypeId != null">#{planTypeId},</if>
+            <if test="planTypeCode != null">#{planTypeCode},</if>
             <if test="planInStatus != null">#{planInStatus},</if>
             <if test="planInCode != null">#{planInCode},</if>
             <if test="materialCode != null">#{materialCode},</if>
@@ -164,6 +169,7 @@
             <if test="batch != null">BATCH = #{batch},</if>
             <if test="materialId != null">MATERIAL_ID = #{materialId},</if>
             <if test="planTypeId != null">PLAN_TYPE_ID = #{planTypeId},</if>
+            <if test="planTypeCode != null">PLAN_TYPE_CODE = #{planTypeCode},</if>
             <if test="planInStatus != null">PLAN_IN_STATUS = #{planInStatus},</if>
             <if test="planInCode != null">PLAN_IN_CODE = #{planInCode},</if>
             <if test="materialCode != null">MATERIAL_CODE = #{materialCode},</if>