licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报价记录表问题修改

Browse Source
This commit is contained in:
z 2025-01-21 14:30:21 +08:00
parent f97cf8d705
commit d609be3717
15 changed files with 108 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterPageReqVO.java
View File

@ -33,7 +33,7 @@ public class MasterPageReqVO extends PageParam {
private String jyMaster; private String jyMaster;
@Schema(description = "借用人") @Schema(description = "借用人")
private Long jyUser; private String jyUser;
@Schema(description = "借用类型", example = "1") @Schema(description = "借用类型", example = "1")
private Integer jyType; private Integer jyType;

9
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/master/vo/MasterRespVO.java
View File

@ -53,4 +53,13 @@ public class MasterRespVO {
@ExcelProperty("借用日期") @ExcelProperty("借用日期")
private LocalDateTime jyDate; private LocalDateTime jyDate;
@Schema(description = "借用人")
@ExcelProperty("借用人")
private String jyUsers;
@Schema(description = "借用部门")
@ExcelProperty("借用部门")
private String jyBms;
@Schema(description = "借用物料名称")
@ExcelProperty("借用物料名称")
private String jyMasters;
} }

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/PricequoterecordController.java
View File

@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*; import javax.validation.*;
import javax.servlet.http.*; import javax.servlet.http.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pricequoterecord/vo/PricequoterecordSaveReqVO.java
View File

@ -2,10 +2,7 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Schema(description = "管理后台 - 基础信息-报价记录新增/修改 Request VO") @Schema(description = "管理后台 - 基础信息-报价记录新增/修改 Request VO")

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskPlanJDBaoBiaoPageReqVO.java
View File

@ -40,6 +40,8 @@ public class TaskPlanJDBaoBiaoPageReqVO extends PageParam {
@Schema(description = "工序名称") @Schema(description = "工序名称")
private String procdureName; private String procdureName;
@Schema(description = "类型")
private String type;
@Schema(description = "总预计工时") @Schema(description = "总预计工时")
private BigDecimal workTime; private BigDecimal workTime;

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/master/MasterDO.java
View File

@ -60,5 +60,11 @@ public class MasterDO extends BaseDO {
* 借用时间 * 借用时间
*/ */
private LocalDateTime jyDate; private LocalDateTime jyDate;
@TableField(exist = false)
private String jyUsers;
@TableField(exist = false)
private String jyBms;
@TableField(exist = false)
private String jyMasters;
} }

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java
View File

@ -125,7 +125,8 @@ public class TaskDispatchDetailDO extends BaseDO {
private String planCode; private String planCode;
@TableField(exist = false) @TableField(exist = false)
private String procdureName; private String procdureName;
@TableField(exist = false)
private String type;
/** /**
* 预计工时 * 预计工时
*/ */

29
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/master/MasterMapper.java
View File

@ -2,12 +2,19 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.master;
import java.util.*; import java.util.*;
import cn.hutool.core.util.ObjectUtil;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.master.MasterDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*; import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*;
import org.springframework.util.StringUtils;
/** /**
* 借用主 Mapper * 借用主 Mapper
@ -18,16 +25,18 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.master.vo.*;
public interface MasterMapper extends BaseMapperX<MasterDO> { public interface MasterMapper extends BaseMapperX<MasterDO> {
default PageResult<MasterDO> selectPage(MasterPageReqVO reqVO) { default PageResult<MasterDO> selectPage(MasterPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MasterDO>() MPJLambdaWrapper<MasterDO> query = new MPJLambdaWrapper<>();
.betweenIfPresent(MasterDO::getCreateTime, reqVO.getCreateTime()) query.selectAll(MasterDO.class)
.eqIfPresent(MasterDO::getJyBm, reqVO.getJyBm()) .select("b.nickname as jyUsers,c.name as jyBms,d.name as jyMasters")
.eqIfPresent(MasterDO::getJyYt, reqVO.getJyYt()) .leftJoin(AdminUserDO.class,"b",AdminUserDO::getId,MasterDO::getJyUser)
.eqIfPresent(MasterDO::getRem, reqVO.getRem()) .leftJoin(DeptDO.class,"c",DeptDO::getId,MasterDO::getJyBm)
.eqIfPresent(MasterDO::getJyMaster, reqVO.getJyMaster()) .leftJoin(MaterialDO.class,"d",MaterialDO::getId,MasterDO::getJyMaster);
.eqIfPresent(MasterDO::getJyUser, reqVO.getJyUser()) query.eq(!ObjectUtil.isEmpty(reqVO.getJyYt()), MasterDO::getJyYt, reqVO.getJyYt())
.eqIfPresent(MasterDO::getJyType, reqVO.getJyType()) .eq(!ObjectUtil.isEmpty(reqVO.getJyType()), MasterDO::getJyType, reqVO.getJyType())
.eqIfPresent(MasterDO::getNum, reqVO.getNum()) .like(!ObjectUtil.isEmpty(reqVO.getJyBm()), DeptDO::getName, reqVO.getJyBm())
.orderByDesc(MasterDO::getId)); .like(!ObjectUtil.isEmpty(reqVO.getJyMaster()), MaterialDO::getName, reqVO.getJyMaster())
.like(!ObjectUtil.isEmpty(reqVO.getJyUser()), AdminUserDO::getNickname, reqVO.getJyUser());
return selectPage(reqVO,query);
} }
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordService.java
View File

@ -1,13 +1,11 @@
package com.chanko.yunxi.mes.module.heli.service.pricequoterecord; package com.chanko.yunxi.mes.module.heli.service.pricequoterecord;
import java.util.*;
import javax.validation.*; import javax.validation.*;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*; import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
/** /**
* 基础信息-报价记录 Service 接口 * 基础信息-报价记录 Service 接口

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pricequoterecord/PricequoterecordServiceImpl.java
View File

@ -5,16 +5,16 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*; import com.chanko.yunxi.mes.module.heli.controller.admin.pricequoterecord.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pricequoterecord.PricequoterecordDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.module.heli.dal.mysql.pricequoterecord.PricequoterecordMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.pricequoterecord.PricequoterecordMapper;

1
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
View File

@ -23,6 +23,7 @@
f.name AS procdureName, f.name AS procdureName,
t.work_time AS workTime, t.work_time AS workTime,
t.owner, t.owner,
b.dispatch_type as type,
t.amount AS amount, t.amount AS amount,
COALESCE(SUM(CASE WHEN h.work_time IS NULL THEN 0 ELSE h.work_time END), 0) AS bgWorkTime, COALESCE(SUM(CASE WHEN h.work_time IS NULL THEN 0 ELSE h.work_time END), 0) AS bgWorkTime,
COALESCE(SUM(CASE WHEN h.amount IS NULL THEN 0 ELSE h.amount END), 0) AS bgAmount, COALESCE(SUM(CASE WHEN h.amount IS NULL THEN 0 ELSE h.amount END), 0) AS bgAmount,

5
mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
View File

@ -212,7 +212,7 @@ const formData = ref({
projectName: undefined, projectName: undefined,
salesman: undefined, salesman: undefined,
clientActuality: undefined, clientActuality: undefined,
winTheBiddingTime: [], winTheBiddingTime: undefined,
winTheResult: undefined, winTheResult: undefined,
winTheGrasp: undefined, winTheGrasp: undefined,
craftInfos: [], craftInfos: [],
@ -344,6 +344,9 @@ const submitForm = async (active) => {
// 校验表单 // 校验表单
formData.value.active = active formData.value.active = active
await formRef.value.validate() await formRef.value.validate()
if (formData.value.winTheBiddingTime.length==0){
formData.value.winTheBiddingTime=''
}
// 提交请求 // 提交请求
formLoading.value = true formLoading.value = true

24
mes-ui/mes-ui-admin-vue3/src/views/heli/master/index.vue
View File

@ -94,15 +94,15 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="借用人" align="center" prop="jyUser" > <el-table-column label="借用人" align="center" prop="jyUsers" >
<template #default="scope"> <!-- <template #default="scope">-->
{{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }} <!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="借用部门" align="center" prop="jyBm" > <el-table-column label="借用部门" align="center" prop="jyBms" >
<template #default="scope"> <!-- <template #default="scope">-->
{{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}} <!-- {{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单据日期" label="单据日期"
@ -122,10 +122,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" prop="num" /> <el-table-column label="数量" align="center" prop="num" />
<el-table-column label="借用物料名称" align="center" prop="jyMaster" width="180"> <el-table-column label="借用物料名称" align="center" prop="jyMasters" width="180">
<template #default="scope"> <!-- <template #default="scope">-->
{{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}} <!-- {{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="rem" /> <el-table-column label="备注" align="center" prop="rem" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">

68
mes-ui/mes-ui-admin-vue3/src/views/heli/master/indexBb.vue
View File

@ -94,15 +94,15 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="借用人" align="center" prop="jyUser" > <el-table-column label="借用人" align="center" prop="jyUsers" >
<template #default="scope"> <!-- <template #default="scope">-->
{{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }} <!-- {{ userList.find((user) => user.id === scope.row.jyUser)?.nickname }}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="借用部门" align="center" prop="jyBm" > <el-table-column label="借用部门" align="center" prop="jyBms" >
<template #default="scope"> <!-- <template #default="scope">-->
{{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}} <!-- {{deptList.find((dept)=>dept.id==scope.row.jyBm)?.name}}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单据日期" label="单据日期"
@ -123,32 +123,32 @@
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" prop="num" /> <el-table-column label="数量" align="center" prop="num" />
<el-table-column label="借出数量" align="center" prop="quantityLent" /> <el-table-column label="借出数量" align="center" prop="quantityLent" />
<el-table-column label="借用物料名称" align="center" prop="jyMaster" width="160"> <el-table-column label="借用物料名称" align="center" prop="jyMasters" width="160">
<template #default="scope"> <!-- <template #default="scope">-->
{{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}} <!-- {{materialList.find((material)=>material.id==scope.row.jyMaster)?.name}}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="rem" /> <el-table-column label="备注" align="center" prop="rem" />
<el-table-column label="操作" align="center" width="140"> <!-- <el-table-column label="操作" align="center" width="140">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-button <!-- <el-button-->
link <!-- link-->
type="primary" <!-- type="primary"-->
@click="openForm('update', scope.row.id)" <!-- @click="openForm('update', scope.row.id)"-->
v-hasPermi="['heli:master:update']" <!-- v-hasPermi="['heli:master:update']"-->
> <!-- >-->
编辑 <!-- 编辑-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
link <!-- link-->
type="danger" <!-- type="danger"-->
@click="handleDelete(scope.row.id)" <!-- @click="handleDelete(scope.row.id)"-->
v-hasPermi="['heli:master:delete']" <!-- v-hasPermi="['heli:master:delete']"-->
> <!-- >-->
删除 <!-- 删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination
@ -207,8 +207,10 @@ const getList = async () => {
list.value.map(item=>{ list.value.map(item=>{
if (item.jyType=="4"){ if (item.jyType=="4"){
item.quantityLent= Number(-Math.abs(item.num)); item.quantityLent= Number(-Math.abs(item.num));
}else { }else if (item.jyType=="1"){
item.quantityLent= Number(item.num); item.quantityLent= Number(item.num);
}else {
item.quantityLent=0
} }
}) })
total.value = data.total total.value = data.total

21
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue
View File

@ -62,7 +62,7 @@
class="!w-240px" class="!w-240px"
/> --> /> -->
<UserSelect v-model="queryParams.owner" @update:newValue="handleSelectedUser1" class="!w-265px"/> <UserSelect v-model="queryParams.owner" @update:newValue="handleSelectedUser1" class="!w-265px"/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
@ -83,14 +83,19 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" border class="hl-table" :row-class-name="tableRowClassName"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" border class="hl-table" :row-class-name="tableRowClassName">
<el-table-column type="index" min-width="60" fixed label="序号" align="center" /> <el-table-column type="index" min-width="60" fixed label="序号" align="center" />
<el-table-column label="项目编号" align="center" prop="projectCode" width="240px" /> <el-table-column label="项目编号" align="center" prop="projectCode" width="240px" />
<el-table-column label="项目名称" align="center" prop="projectName" width="240px"/> <el-table-column label="项目名称" align="center" prop="projectName" width="240px"/>
<el-table-column label="报工类型" align="center" prop="planType" width="160px">
<template #default="scope">
{{scope.row.type=='ASSEMBLE'?"装配任务派工单":"生产任务派工单"}}
</template>
</el-table-column>
<el-table-column label="生产计划号" align="center" prop="taskNo" width="240px"/> <el-table-column label="生产计划号" align="center" prop="taskNo" width="240px"/>
<el-table-column label="生产状态" align="center" prop="planType" > <el-table-column label="生产状态" align="center" prop="planType" >
<template #default="scope"> <template #default="scope">
@ -115,7 +120,7 @@
<el-table-column label="总报工工时" align="center" prop="bgWorkTime" /> <el-table-column label="总报工工时" align="center" prop="bgWorkTime" />
<el-table-column label="总报工数量" align="center" prop="bgAmount" /> <el-table-column label="总报工数量" align="center" prop="bgAmount" />
<el-table-column label="完成标志" align="center" prop="wgType"> <el-table-column label="完成标志" align="center" prop="wgType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_PG_PLANTYPE" :value="1" v-if="scope.row.wgType==2"/> <dict-tag :type="DICT_TYPE.HELI_PG_PLANTYPE" :value="1" v-if="scope.row.wgType==2"/>
<dict-tag :type="DICT_TYPE.HELI_PG_PLANTYPE" :value="0" v-else/> <dict-tag :type="DICT_TYPE.HELI_PG_PLANTYPE" :value="0" v-else/>
@ -133,7 +138,7 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -160,8 +165,8 @@ const queryParams = reactive({
projectSubName: undefined, projectSubName: undefined,
materialName: undefined, materialName: undefined,
owner: undefined, owner: undefined,
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中