kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor(入库任务): 实体修改

Browse Source
This commit is contained in:
LJW 2024-11-08 14:42:53 +08:00
parent 17e93ace05
commit bc0aa1e44a
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java
View File

@ -16,7 +16,7 @@ public class WmsInTask extends BaseEntity
private static final long serialVersionUID = 1L;
/** 主键 */
private String id;
private Long id;
/** 任务编码 */
@Excel(name = "任务编码")
@ -44,7 +44,7 @@ public class WmsInTask extends BaseEntity
/** 是否激活 */
@Excel(name = "是否激活")
private String isActivy;
private String isActive;
/** 是否删除 */
@Excel(name = "是否删除")
@ -74,12 +74,16 @@ public class WmsInTask extends BaseEntity
@Excel(name = "物料编码")
private String materialCode;
public void setId(String id)
/** 入库明细ID */
@Excel(name = "入库明细ID")
private Long detailInId;
public void setId(Long id)
{
this.id = id;
}
public String getId()
public Long getId()
{
return id;
}
@ -137,14 +141,14 @@ public class WmsInTask extends BaseEntity
{
return cellOrig;
}
public void setIsActivy(String isActivy)
public void setIsActive(String isActivy)
{
this.isActivy = isActivy;
this.isActive = isActivy;
}
public String getIsActivy()
public String getIsActive()
{
return isActivy;
return isActive;
}
public void setIsDelete(String isDelete)
{
@ -210,6 +214,14 @@ public class WmsInTask extends BaseEntity
return materialCode;
}
public Long getDetailInId() {
return detailInId;
}
public void setDetailInId(Long detailInId) {
this.detailInId = detailInId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -225,7 +237,7 @@ public class WmsInTask extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("isActivy", getIsActivy())
.append("isActive", getIsActive())
.append("isDelete", getIsDelete())
.append("batch", getBatch())
.append("materialId", getMaterialId())
@ -233,6 +245,7 @@ public class WmsInTask extends BaseEntity
.append("planInStatus", getPlanInStatus())
.append("planInCode", getPlanInCode())
.append("materialCode", getMaterialCode())
.append("detailInId", getDetailInId())
.toString();
}
}

20
ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml
View File

@ -17,7 +17,7 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="isActivy" column="IS_ACTIVY"/>
<result property="isActive" column="IS_ACTIVE"/>
<result property="isDelete" column="IS_DELETE"/>
<result property="batch" column="BATCH"/>
<result property="materialId" column="MATERIAL_ID"/>
@ -25,6 +25,7 @@
<result property="planInStatus" column="PLAN_IN_STATUS"/>
<result property="planInCode" column="PLAN_IN_CODE"/>
<result property="materialCode" column="MATERIAL_CODE"/>
<result property="detailInId" column="DETAIL_IN_ID"/>
</resultMap>
<sql id="selectWmsInTaskVo">
@ -40,14 +41,15 @@
CREATE_TIME,
UPDATE_BY,
UPDATE_TIME,
IS_ACTIVY,
IS_ACTIVE,
IS_DELETE,
BATCH,
MATERIAL_ID,
PLAN_TYPE_ID,
PLAN_IN_STATUS,
PLAN_IN_CODE,
MATERIAL_CODE
MATERIAL_CODE,
DETAIL_IN_ID
from WMS_IN_TASK
</sql>
@ -67,7 +69,7 @@
<if test="createTime != null and createTime != ''">and CREATE_TIME = #{createTime}</if>
<if test="updateBy != null and updateBy != ''">and UPDATE_BY = #{updateBy}</if>
<if test="updateTime != null and updateTime != ''">and UPDATE_TIME = #{updateTime}</if>
<if test="isActivy != null and isActivy != ''">and IS_ACTIVY = #{isActivy}</if>
<if test="isActive != null and isActive != ''">and IS_ACTIVE = #{isActive}</if>
<if test="isDelete != null and isDelete != ''">and IS_DELETE = #{isDelete}</if>
<if test="batch != null and batch != ''">and BATCH = #{batch}</if>
<if test="materialId != null and materialId != ''">and MATERIAL_ID = #{materialId}</if>
@ -75,6 +77,7 @@
<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 = #{materialCode}</if>
<if test="detailInId != null and detailInId != ''">and DETAIL_IN_ID = #{detailInId}</if>
</where>
</select>
@ -97,7 +100,7 @@
<if test="createTime != null">CREATE_TIME,</if>
<if test="updateBy != null">UPDATE_BY,</if>
<if test="updateTime != null">UPDATE_TIME,</if>
<if test="isActivy != null">IS_ACTIVY,</if>
<if test="isActive != null">IS_ACTIVE,</if>
<if test="isDelete != null">IS_DELETE,</if>
<if test="batch != null">BATCH,</if>
<if test="materialId != null">MATERIAL_ID,</if>
@ -105,6 +108,7 @@
<if test="planInStatus != null">PLAN_IN_STATUS,</if>
<if test="planInCode != null">PLAN_IN_CODE,</if>
<if test="materialCode != null">MATERIAL_CODE,</if>
<if test="detailInId != null">DETAIL_IN_ID,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskInCode != null">#{taskInCode},</if>
@ -118,7 +122,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isActivy != null">#{isActivy},</if>
<if test="isActive != null">#{isActive},</if>
<if test="isDelete != null">#{isDelete},</if>
<if test="batch != null">#{batch},</if>
<if test="materialId != null">#{materialId},</if>
@ -126,6 +130,7 @@
<if test="planInStatus != null">#{planInStatus},</if>
<if test="planInCode != null">#{planInCode},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="detailInId != null">#{detailInId},</if>
</trim>
</insert>
@ -143,7 +148,7 @@
<if test="createTime != null">CREATE_TIME = #{createTime},</if>
<if test="updateBy != null">UPDATE_BY = #{updateBy},</if>
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
<if test="isActivy != null">IS_ACTIVY = #{isActivy},</if>
<if test="isActive != null">IS_ACTIVE = #{isActive},</if>
<if test="isDelete != null">IS_DELETE = #{isDelete},</if>
<if test="batch != null">BATCH = #{batch},</if>
<if test="materialId != null">MATERIAL_ID = #{materialId},</if>
@ -151,6 +156,7 @@
<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>
<if test="detailInId != null">DETAIL_IN_ID = #{detailInId},</if>
</trim>
where ID = #{id}
</update>