yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【需求】工艺设计接口完善

Browse Source
dev
zengchenxi 6 months ago
parent 8b998324a8
commit 883d2d40ab
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File

3
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignRespVO.java
Unescape View File

@ -126,4 +126,7 @@ public class ProcessDesignRespVO {
@Schema(description = "项目状态")
private Integer planStatus;
@Schema(description = "项目状态")
private Integer spec;
}

2
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/processdesign/ProcessDesignDO.java
Unescape View File

@ -132,4 +132,6 @@ public class ProcessDesignDO extends BaseDO {
@TableField(exist = false)
private Integer planStatus;
@TableField(exist = false)
private String spec;
}

14
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java
Unescape View File

@ -4,6 +4,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignPageReqVO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.plan.PlanDO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignDO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
@ -32,13 +33,14 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.select("u1.nickname as projectOwnerName")
.select("b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate")
.select("u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName")
.select("c.name as projectSubName", "b.project_sub_code as projectSubCode")
.select("f.name as projectSubName", "f.code as projectSubCode", "f.spec")
.select("z.progress")
.leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId)
.leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id")
.leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId)
.leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId)
.leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId)
.leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId)
.leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanDO::getProjectOwner)
.leftJoin("system_users u4 on u4.id = b.two_dim_owner")
.leftJoin("system_users u5 on u5.id = b.three_dim_owner")
@ -53,7 +55,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.eq(reqVO.getProperty() != null, ProjectOrderDO::getProperty, reqVO.getProperty())
.like(!StringUtils.isEmpty(reqVO.getThreeDimOwnerName()), "u5.nickname", reqVO.getThreeDimOwnerName())
.like(!StringUtils.isEmpty(reqVO.getTwoDimOwnerName()), "u4.nickname", reqVO.getTwoDimOwnerName())
.like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName())
.and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName()))
.eq(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType())
.in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList())
.eq(reqVO.getProjectId() != null, ProcessDesignDO::getProjectId, reqVO.getProjectId())
@ -82,12 +84,13 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.select("u1.nickname as projectOwnerName")
.select("b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate")
.select("u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName")
.select("c.name as projectSubName", "b.project_sub_code as projectSubCode")
.select("f.name as projectSubName", "f.code as projectSubCode", "f.spec")
.leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId)
.leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id")
.leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId)
.leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId)
.leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId)
.leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId)
.leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanDO::getProjectOwner)
.leftJoin("system_users u4 on u4.id = b.two_dim_owner")
.leftJoin("system_users u5 on u5.id = b.three_dim_owner")
@ -101,13 +104,14 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
MPJLambdaWrapper<ProcessDesignDO> query = new MPJLambdaWrapper<>();
query.select(ProcessDesignDO::getProjectId, ProcessDesignDO::getProjectSubId)
.select("a.status as planStatus")
.select("c.name as projectSubName")
.select("e.name as customerName")
.select("d.code as projectCode", "d.project_name as projectName", "d.business_line as businessLine", "d.property","d.is_urgency as isUrgency")
.select("f.name as projectSubName", "f.code as projectSubCode", "f.spec")
.leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId)
.leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId)
.leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId)
.leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId)
.leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId)
.groupBy("d.id,c.id")
.orderByDesc(ProjectOrderDO::getId)
.disableSubLogicDel();
@ -116,7 +120,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode())
.like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName())
.like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName())
.like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName())
.and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName()))
;
return selectPage(reqVO, query);
}

10
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/processdesign/ProcessDesignServiceImpl.java
Unescape View File

@ -3,12 +3,12 @@ package com.chanko.yunxi.mes.module.biz.service.processdesign;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils;
import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignMapper;
import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignProgressMapper;
import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignPageReqVO;
import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignSaveReqVO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignDO;
import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignProgressDO;
import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignMapper;
import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignProgressMapper;
import com.chanko.yunxi.mes.module.biz.enums.ProcessDesignTypeEnum;
import com.chanko.yunxi.mes.module.biz.enums.WarningEnum;
import com.chanko.yunxi.mes.module.biz.vo.WarningMessageVO;
@ -107,11 +107,7 @@ public class ProcessDesignServiceImpl implements ProcessDesignService {
PageResult<ProcessDesignDO> detailResult = processDesignMapper.selectPage(reqVO);
if(detailResult.getTotal() > 0){
detailResult.getList().forEach(processDesign -> {
if(ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name().equals(processDesign.getProcessDesignType())){
processDesignDO.setBlankDate(processDesign.getBlankDate())
.setBlankOwnerName(processDesign.getBlankOwnerName())
.setProgressBlank(processDesign.getProgress());
}else if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){
if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){
processDesignDO.setThreeDimDate(processDesign.getThreeDimDate())
.setThreeDimOwnerName(processDesign.getThreeDimOwnerName())
.setProgress3d(processDesign.getProgress());

8
mes-ui/mes-ui-admin-vue3/src/views/biz/processdesign/3d.vue
Unescape View File

@ -59,18 +59,18 @@
</el-table-column>
<el-table-column label="客户名称" align="center" prop="customerName" min-width="240" />
<!-- 新增产品编码 -->
<el-table-column label="产品编码" align="center" prop="" min-width="120" />
<el-table-column label="产品编码" align="center" prop="projectSubCode" min-width="120" />
<!-- 项目名称修改产品名称 -->
<el-table-column label="产品名称" align="center" prop="projectName" min-width="180" />
<el-table-column label="产品名称" align="center" prop="projectSubName" min-width="180" />
<!-- 新增规格/型号 -->
<el-table-column label="规格/型号" align="center" prop="" min-width="120" />
<el-table-column label="规格/型号" align="center" prop="spec" min-width="120" />
<el-table-column label="所属业务线" align="center" prop="businessLine" min-width="150">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_BUSINESS_LINE" :value="scope.row.businessLine" />
</template>
</el-table-column>
<!-- 新增计划负责人 -->
<el-table-column fixed="right" label="计划负责人" align="center" prop="threeDimOwnerName" min-width="120" />
<el-table-column fixed="right" label="计划负责人" align="center" prop="projectOwnerName" min-width="120" />
<el-table-column fixed="right" label="3D负责人" align="center" prop="threeDimOwnerName" min-width="120" />
<el-table-column fixed="right" label="3D截止日期" align="center" prop="threeDimDate" :formatter="dateFormatter2" min-width="140" />
<el-table-column fixed="right" label="最新进度" align="center" prop="progress" min-width="120">

Write Preview
Loading…
Cancel
Save