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:
Kelvin 2024-12-05 17:49:39 +08:00
parent c454bbf94c
commit 3f9cac0982
4 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java
View File

@ -206,6 +206,30 @@ public class WmsInTaskController extends BaseController {
baseKnifeService.insertBaseKnife(baseKnife);
});
mdItemService.updateMdItem(mbbBdMrlMitm);
} else if (Objects.equals(wmsInTask.getPlanTypeCode(), "CGRK")) {
wmsInPlanDetailEntityList.forEach(planDetailEntity -> {
BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId());
// 设置状态为 解锁
baseKnife.setIsLocked(0);
// 设置工具状态 已入库
baseKnife.setKnifeFineState(1);
// 状态为生效
baseKnife.setIsValid(0);
// 更新台账状态
baseKnifeService.updateBaseKnife(baseKnife);
});
} else if (Objects.equals(wmsInTask.getPlanTypeCode(), "GJHK")) {
wmsInPlanDetailEntityList.forEach(planDetailEntity -> {
BaseKnife baseKnife = baseKnifeService.selectBaseKnifeByBaseKnifeId(planDetailEntity.getKnifeId());
// 设置状态为 解锁
baseKnife.setIsLocked(0);
// 设置工具状态 已入库
baseKnife.setKnifeFineState(1);
// 状态为生效
baseKnife.setIsValid(0);
// 更新台账状态
baseKnifeService.updateBaseKnife(baseKnife);
});
} else {
for (int i = 0; i < wmsInTask.getActualInQuantity(); i++) {
// 生成台账

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

@ -31,7 +31,7 @@ public class WmsInTask extends BaseEntity {
* 入库计划id
*/
@Excel(name = "入库计划id")
private String planInId;
private Long planInId;
/**
* 任务数量
@ -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) {
@ -152,11 +157,11 @@ public class WmsInTask extends BaseEntity {
return taskInCode;
}
public void setPlanInId(String planInId) {
public void setPlanInId(Long planInId) {
this.planInId = planInId;
}
public String getPlanInId() {
public Long getPlanInId() {
return planInId;
}
@ -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())

4
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmsInTaskMapper.java
View File

@ -3,6 +3,7 @@ package com.ktg.mes.wm.mapper;
import java.util.List;
import com.ktg.mes.wm.domain.WmsInTask;
import com.ktg.mes.wm.domain.WmsZdTask;
import org.apache.ibatis.annotations.Mapper;
/**
* 入库任务Mapper接口
@ -10,7 +11,8 @@ import com.ktg.mes.wm.domain.WmsZdTask;
* @author yinjinlu
* @date 2024-11-01
*/
public interface WmsInTaskMapper
@Mapper
public interface WmsInTaskMapper
{
/**
* 查询入库任务

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

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