From 437848ffbe82a549ff7cd645dd8ab928f9c198dd Mon Sep 17 00:00:00 2001
From: Kelvin <luo2692394680@163.com>
Date: Tue, 26 Nov 2024 14:58:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=85=A5=E5=BA=93=E4=BB=BB=E5=8A=A1):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=AE=A1=E5=88=92=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ktg/mes/wm/domain/WmsInTask.java | 14 ++++++++++++++
 .../main/resources/mapper/wm/WmsInTaskMapper.xml   |  6 ++++++
 2 files changed, 20 insertions(+)

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/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>