零件采购
This commit is contained in:
parent
d42f96606b
commit
775f03825a
@ -172,4 +172,9 @@ public class MaterialPlanBoomDO extends BaseDO {
|
|||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String duEmpName;
|
private String duEmpName;
|
||||||
|
/**
|
||||||
|
* 客户简称
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String brief;
|
||||||
}
|
}
|
||||||
|
@ -26,6 +26,7 @@ import com.chanko.yunxi.mes.module.heli.enums.BoomDetailTypeEnum;
|
|||||||
import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum;
|
import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum;
|
||||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import com.chanko.yunxi.mes.module.heli.controller.admin.materialplanboom.vo.*;
|
import com.chanko.yunxi.mes.module.heli.controller.admin.materialplanboom.vo.*;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
@ -215,9 +216,11 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
|
|||||||
.like(!StringUtils.isEmpty(pageReqVO.getDuEmpName()), AdminUserDO::getNickname, pageReqVO.getDuEmpName())
|
.like(!StringUtils.isEmpty(pageReqVO.getDuEmpName()), AdminUserDO::getNickname, pageReqVO.getDuEmpName())
|
||||||
.eq(!StringUtils.isEmpty(pageReqVO.getMatType()), MaterialPlanDO::getMatType, pageReqVO.getMatType())
|
.eq(!StringUtils.isEmpty(pageReqVO.getMatType()), MaterialPlanDO::getMatType, pageReqVO.getMatType())
|
||||||
.eq(!StringUtils.isEmpty(pageReqVO.getStatus()), MaterialPlanBoomDO::getIsPurYard, pageReqVO.getStatus())
|
.eq(!StringUtils.isEmpty(pageReqVO.getStatus()), MaterialPlanBoomDO::getIsPurYard, pageReqVO.getStatus())
|
||||||
.eq(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus())
|
.in(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus() != 0 ? Arrays.asList(pageReqVO.getMplanStatus()) : Arrays.asList(0, 3))
|
||||||
.eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo());
|
.eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo());
|
||||||
return selectPage(pageReqVO, query);
|
|
||||||
|
PageResult<MaterialPlanBoomDO> pageResult = selectPage(pageReqVO, query);
|
||||||
|
return pageResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -69,13 +69,21 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="客户简称" align="center" prop="brief" min-width="180" />
|
<el-table-column label="客户简称" align="center" prop="customerBriefName" min-width="180" />
|
||||||
<el-table-column label="项目名称" align="center" prop="projectName" min-width="180" />
|
<el-table-column label="项目名称" align="center" prop="projectName" min-width="180" />
|
||||||
<el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
|
<el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
|
||||||
<el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
|
<el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
|
||||||
<el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
|
<el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
|
||||||
<el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
|
<el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
|
||||||
<el-table-column label="单位" align="center" prop="unit" min-width="120" />
|
<el-table-column label="采购数量" align="center" prop="unit" min-width="120" />
|
||||||
|
<el-table-column min-width="200px" align="center">
|
||||||
|
<template #header>采购数量</template>
|
||||||
|
<template #default="{ row, $index }">
|
||||||
|
<el-form-item :prop="`${$index}.matWeight`" class="mb-0px!" >
|
||||||
|
<el-input-number v-model="row.matWeight" type="number" :precision="0" />
|
||||||
|
</el-form-item>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />
|
<el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />
|
||||||
<el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" />
|
<el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" />
|
||||||
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="120" />
|
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="120" />
|
||||||
|
Loading…
Reference in New Issue
Block a user