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

完善页面UI

Browse Source
This commit is contained in:
liumingxiy 2024-11-13 15:05:16 +08:00
parent efa65b6327
commit 3c6b110b63
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutPlan.java
View File

@ -2,8 +2,6 @@ package com.ktg.mes.md.domain;
import com.ktg.common.annotation.Excel;
import com.ktg.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.List;
@ -71,6 +69,8 @@ public class WmsOutPlan extends BaseEntity {
*/
private Integer attr4;
private WmsBusinessType wmsBusinessType;
/**
* 出库计划明细信息
*/
@ -164,25 +164,29 @@ public class WmsOutPlan extends BaseEntity {
this.wmsOutPlanDetailList = wmsOutPlanDetailList;
}
public WmsBusinessType getWmsBusinessType() {
return wmsBusinessType;
}
public void setWmsBusinessType(WmsBusinessType wmsBusinessType) {
this.wmsBusinessType = wmsBusinessType;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("wmsOutPlanId", getWmsOutPlanId())
.append("planCode", getPlanCode())
.append("wmsBusinessTypeId", getWmsBusinessTypeId())
.append("planState", getPlanState())
.append("planType", getPlanType())
.append("recipientUsername", getRecipientUsername())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("wmsOutPlanDetailList", getWmsOutPlanDetailList())
.toString();
return "WmsOutPlan{" +
"wmsOutPlanId=" + wmsOutPlanId +
", planCode='" + planCode + '\'' +
", wmsBusinessTypeId=" + wmsBusinessTypeId +
", planState='" + planState + '\'' +
", planType='" + planType + '\'' +
", recipientUsername='" + recipientUsername + '\'' +
", attr1='" + attr1 + '\'' +
", attr2='" + attr2 + '\'' +
", attr3=" + attr3 +
", attr4=" + attr4 +
", wmsBusinessType=" + wmsBusinessType +
", wmsOutPlanDetailList=" + wmsOutPlanDetailList +
'}';
}
}

10
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
View File

@ -52,7 +52,9 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
*/
@Override
public WmsOutPlan selectWmsOutPlanByWmsOutPlanId(Long wmsOutPlanId) {
return wmsOutPlanMapper.selectWmsOutPlanByWmsOutPlanId(wmsOutPlanId);
WmsOutPlan wmsOutPlan = wmsOutPlanMapper.selectWmsOutPlanByWmsOutPlanId(wmsOutPlanId);
wmsOutPlan.setWmsBusinessType(wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsOutPlan.getWmsBusinessTypeId().toString()));
return wmsOutPlan;
}
/**
@ -63,7 +65,11 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
*/
@Override
public List<WmsOutPlan> selectWmsOutPlanList(WmsOutPlan wmsOutPlan) {
return wmsOutPlanMapper.selectWmsOutPlanList(wmsOutPlan);
List<WmsOutPlan> wmsOutPlanList = wmsOutPlanMapper.selectWmsOutPlanList(wmsOutPlan);
wmsOutPlanList.forEach(item -> {
item.setWmsBusinessType(wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(item.getWmsBusinessTypeId().toString()));
});
return wmsOutPlanList;
}
/**