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

进一步完善盘点

Browse Source
This commit is contained in:
liumingxiy 2024-11-13 11:41:48 +08:00
parent d8289eb4f0
commit 9f42ebb884
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsInventoryPlan.java
View File

@ -3,8 +3,7 @@ package com.ktg.mes.md.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
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 com.ktg.mes.wm.domain.WmWarehouse;
import java.util.Date;
@ -104,6 +103,8 @@ public class WmsInventoryPlan extends BaseEntity {
*/
private String attr4;
private WmWarehouse mWarehouse;
public Long getWmsStockPlanId() {
return wmsStockPlanId;
}
@ -224,28 +225,33 @@ public class WmsInventoryPlan extends BaseEntity {
this.attr4 = attr4;
}
public WmWarehouse getmWarehouse() {
return mWarehouse;
}
public void setmWarehouse(WmWarehouse mWarehouse) {
this.mWarehouse = mWarehouse;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("wmsStockPlanId", getWmsStockPlanId())
.append("wmsInventoryConfigureId", getWmsInventoryConfigureId())
.append("planCode", getPlanCode())
.append("planName", getPlanName())
.append("dataType", getDataType())
.append("mWarehouseId", getmWarehouseId())
.append("beginTime", getBeginTime())
.append("endTime", getEndTime())
.append("isag", getIsag())
.append("status", getStatus())
.append("description", getDescription())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
return "WmsInventoryPlan{" +
"wmsStockPlanId=" + wmsStockPlanId +
", wmsInventoryConfigureId=" + wmsInventoryConfigureId +
", planCode='" + planCode + '\'' +
", planName='" + planName + '\'' +
", dataType='" + dataType + '\'' +
", mWarehouseId=" + mWarehouseId +
", beginTime=" + beginTime +
", endTime=" + endTime +
", isag='" + isag + '\'' +
", status='" + status + '\'' +
", description='" + description + '\'' +
", attr1='" + attr1 + '\'' +
", attr2='" + attr2 + '\'' +
", attr3='" + attr3 + '\'' +
", attr4='" + attr4 + '\'' +
", mWarehouse=" + mWarehouse +
'}';
}
}

14
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsInventoryPlanServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.ktg.common.utils.DateUtils;
import com.ktg.mes.md.domain.WmsInventoryPlan;
import com.ktg.mes.md.mapper.WmsInventoryPlanMapper;
import com.ktg.mes.md.service.IWmsInventoryPlanService;
import com.ktg.mes.wm.mapper.WmWarehouseMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -20,6 +21,9 @@ public class WmsInventoryPlanServiceImpl implements IWmsInventoryPlanService {
@Autowired
private WmsInventoryPlanMapper wmsInventoryPlanMapper;
@Autowired
private WmWarehouseMapper wmWarehouseMapper;
/**
* 查询盘点计划
*
@ -28,7 +32,9 @@ public class WmsInventoryPlanServiceImpl implements IWmsInventoryPlanService {
*/
@Override
public WmsInventoryPlan selectWmsInventoryPlanByWmsStockPlanId(Long wmsStockPlanId) {
return wmsInventoryPlanMapper.selectWmsInventoryPlanByWmsStockPlanId(wmsStockPlanId);
WmsInventoryPlan wmsInventoryPlan = wmsInventoryPlanMapper.selectWmsInventoryPlanByWmsStockPlanId(wmsStockPlanId);
wmsInventoryPlan.setmWarehouse(wmWarehouseMapper.selectWmWarehouseByWarehouseId(wmsInventoryPlan.getmWarehouseId()));
return wmsInventoryPlan;
}
/**
@ -39,7 +45,11 @@ public class WmsInventoryPlanServiceImpl implements IWmsInventoryPlanService {
*/
@Override
public List<WmsInventoryPlan> selectWmsInventoryPlanList(WmsInventoryPlan wmsInventoryPlan) {
return wmsInventoryPlanMapper.selectWmsInventoryPlanList(wmsInventoryPlan);
List<WmsInventoryPlan> wmsInventoryPlanList = wmsInventoryPlanMapper.selectWmsInventoryPlanList(wmsInventoryPlan);
wmsInventoryPlanList.forEach(item -> {
item.setmWarehouse(wmWarehouseMapper.selectWmWarehouseByWarehouseId(item.getmWarehouseId()));
});
return wmsInventoryPlanList;
}
/**