装配派工单修改责任人选择为装配车间的人
This commit is contained in:
z
parent
ebccf3485c
commit
97ef19ccde
@ -1,5 +1,11 @@
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.procedure;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.workshop.WorkshopController;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.workshop.WorkshopDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.workshop.WorkshopMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.service.workshop.WorkshopService;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@ -37,6 +43,9 @@ public class ProcedureController {
|
||||
|
||||
@Resource
|
||||
private ProcedureService procedureService;
|
||||
@Resource
|
||||
private WorkshopMapper workshopMapper;
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建工序")
|
||||
@ -91,5 +100,14 @@ public class ProcedureController {
|
||||
ExcelUtils.write(response, "工序.xls", "数据", ProcedureRespVO.class,
|
||||
BeanUtils.toBean(list, ProcedureRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/getProcedureZPage")
|
||||
@Operation(summary = "获得装配车间工序分页")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:query')")
|
||||
public CommonResult<List<ProcedureDO>> getProcedureZPage() {
|
||||
WorkshopDO workshopDO = workshopMapper.selectOne(new LambdaQueryWrapper<WorkshopDO>().eq(WorkshopDO::getDeleted, 0).eq(WorkshopDO::getName, "装配车间"));
|
||||
if (ObjectUtil.isNotEmpty(workshopDO)){
|
||||
return success(procedureService.getProcedureZPage(workshopDO.getId()));
|
||||
}
|
||||
return success(null);
|
||||
}
|
||||
}
|
||||
@ -203,6 +203,9 @@ public class PlanSubDO extends BaseDO {
|
||||
* */
|
||||
@TableField(exist = false)
|
||||
private LocalDateTime changeEndTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String businessLine;
|
||||
@TableField(exist = false)
|
||||
private int projectMonth;
|
||||
|
||||
}
|
||||
|
||||
@ -52,4 +52,5 @@ public interface ProcedureService {
|
||||
*/
|
||||
PageResult<ProcedureDO> getProcedurePage(ProcedurePageReqVO pageReqVO);
|
||||
|
||||
List<ProcedureDO> getProcedureZPage(Long id);
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.procedure;
|
||||
|
||||
import cn.hutool.core.lang.UUID;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@ -78,4 +79,9 @@ public class ProcedureServiceImpl implements ProcedureService {
|
||||
return procedureMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ProcedureDO> getProcedureZPage(Long id) {
|
||||
return procedureMapper.selectList(new LambdaQueryWrapper<ProcedureDO>().eq(ProcedureDO::getWid, id));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -17,7 +17,10 @@ export interface ProcedureVO {
|
||||
export const getProcedurePage = async (params) => {
|
||||
return await request.get({ url: `/heli/procedure/page`, params })
|
||||
}
|
||||
|
||||
// 查询装配车间工序分页
|
||||
export const getProcedureZPage = async () => {
|
||||
return await request.get({ url: `/heli/procedure/getProcedureZPage`})
|
||||
}
|
||||
// 查询工序详情
|
||||
export const getProcedure = async (id: number) => {
|
||||
return await request.get({ url: `/heli/procedure/get?id=` + id })
|
||||
|
||||
@ -259,11 +259,17 @@ ref="subFormRef" :model="formData.taskDispatchDetails" :rules="subFormRules"
|
||||
<template #header> <span class="hl-table_header">*</span>工序名称</template>
|
||||
<template #default="{ row, $index }">
|
||||
<el-form-item :prop="`${$index}.procedureId`" :rules="subFormRules.procedureId" class="mb-0px!">
|
||||
<ProcedureSelect
|
||||
:disabled="detailDisabled || row.procedureStatus != 0"
|
||||
v-model="row.procedureId"
|
||||
@update:new-value="(val) => { handleSelectedProcedure(row, val); }" />
|
||||
<!-- <ProcedureSelect-->
|
||||
<!--:disabled="detailDisabled || row.procedureStatus != 0"-->
|
||||
<!-- v-model="row.procedureId"-->
|
||||
<!-- @update:new-value="(val) => { handleSelectedProcedure(row, val); }" />-->
|
||||
<el-select v-model="row.procedureId" :disabled="detailDisabled || row.procedureStatus != 0" @update:new-value="(val) => { handleSelectedProcedure(row, val); }">
|
||||
<el-option
|
||||
v-for="dict in procedureList" :key="dict.id"
|
||||
:label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否报工" prop="isReport" width="100">
|
||||
@ -289,7 +295,7 @@ min="0" :precision="0" class="!w-240px"
|
||||
<!-- <UserSelect-->
|
||||
<!--v-model="row.owner" :disabled="detailDisabled || row.procedureStatus != 0"-->
|
||||
<!-- @update:new-value="handleSelectedUser($index, $event)" />-->
|
||||
<el-select v-model="row.owner" :disabled="detailDisabled || (row.beginProduce != 0 && row.procedureStatus != 0)" @update:new-value="handleSelectedUser($index, $event)">
|
||||
<el-select v-model="row.owner" filterable :disabled="detailDisabled || (row.beginProduce != 0 && row.procedureStatus != 0)" @update:new-value="handleSelectedUser($index, $event)">
|
||||
<el-option
|
||||
v-for="dict in userInit" :key="dict.id"
|
||||
:label="dict.username+' '+dict.nickname" :value="dict.id" />
|
||||
@ -679,6 +685,7 @@ const taskDD = ref(null);
|
||||
//let manufactuId = null;
|
||||
//let maxLongtime = null;
|
||||
const userInit = ref()
|
||||
const procedureList = ref()
|
||||
let watches = [];
|
||||
|
||||
// 清理所有监听器
|
||||
@ -1042,6 +1049,7 @@ onMounted(async () => {
|
||||
detailDisabled.value = true
|
||||
}
|
||||
userInit.value = await UserApi.getDeptName("生产部")
|
||||
procedureList.value = await ProcedureApi.getProcedureZPage()
|
||||
queryData(currentId.value)
|
||||
const data = await ProcedureApi.getProcedurePage(queryParams)
|
||||
procedureSelectList.value=data
|
||||
|
||||
Loading…
Reference in New Issue
Block a user