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

优化自动生成终检和过程检验代码，优化小程序作废功能

Browse Source
This commit is contained in:
think 2025-01-15 16:52:39 +08:00
parent 5f6844bfa6
commit 237dcff610
17 changed files with 378 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java
View File

@ -62,8 +62,8 @@ public class PgMasterController {
@PostMapping("/zfPgMaster") @PostMapping("/zfPgMaster")
@Operation(summary = "作废过程检验派工单") @Operation(summary = "作废过程检验派工单")
@PreAuthorize("@ss.hasPermission('heli:pg-master:create')") @PreAuthorize("@ss.hasPermission('heli:pg-master:create')")
public CommonResult<Integer> zfPgMaster(@Valid @RequestBody PgMasterSaveReqVO createReqVO) { public CommonResult<Integer> zfPgMaster(@RequestParam("id") Integer id) {
return success(pgMasterService.zfPgMaster(createReqVO)); return success(pgMasterService.zfPgMaster(id));
} }
@PostMapping("/create") @PostMapping("/create")
@ -143,7 +143,14 @@ public class PgMasterController {
return success(pageResult); return success(pageResult);
} }
@GetMapping("/task-dispatch-detail/getLine")
@Operation(summary = "获得派工明细分页")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
public CommonResult<PgMasterLineDO> getLine(@RequestParam("id") Integer id) {
PgMasterLineDO pageResult = pgMasterService.getLine(id);
return success(pageResult);
}
// ==================== 子表（质量派工单过程检验行） ==================== // ==================== 子表（质量派工单过程检验行） ====================
@ -155,4 +162,6 @@ public class PgMasterController {
return success(pgMasterService.getPgMasterLineListByZlPgId(zlPgId)); return success(pgMasterService.getPgMasterLineListByZlPgId(zlPgId));
} }
} }

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java
View File

@ -55,8 +55,8 @@ public class ZjPgMasterController {
@PostMapping("/zfZjPgMaster") @PostMapping("/zfZjPgMaster")
@Operation(summary = "作废终检派工单") @Operation(summary = "作废终检派工单")
@PreAuthorize("@ss.hasPermission('heli:zj-pg-master:create')") @PreAuthorize("@ss.hasPermission('heli:zj-pg-master:create')")
public CommonResult<Integer> zfZjPgMaster(@Valid @RequestBody ZjPgMasterSaveReqVO createReqVO) { public CommonResult<Integer> zfZjPgMaster(@RequestParam("id") Integer id) {
return success(zjPgMasterService.zfZjPgMaster(createReqVO)); return success(zjPgMasterService.zfZjPgMaster(id));
} }
@PostMapping("/create") @PostMapping("/create")

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

@ -153,4 +153,7 @@ public class PgMasterLineDO extends BaseDO {
@TableField(exist = false) @TableField(exist = false)
private BigDecimal workTime; private BigDecimal workTime;
@TableField(exist = false)
private String nickName;
} }

37
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java
View File

@ -78,7 +78,9 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
MPJLambdaWrapper<PgMasterLineDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PgMasterLineDO> query = new MPJLambdaWrapper<>();
query.select("t.id,t.task_no as taskNo,t.project_name as projectName,t.project_sub_name as projectSubName, " + query.select("t.id,t.task_no as taskNo,t.project_name as projectName,t.project_sub_name as projectSubName, " +
"t.material_name as materialName, t.blueprint_no as blueprintNo, t.amount, t.spec ,t.unit, t.detil_user as detilUser, " + "t.material_name as materialName, t.blueprint_no as blueprintNo, t.amount, t.spec ,t.unit, t.detil_user as detilUser, " +
"t.pg_number as pgNumber ,t.start_time as startTime ,t.ent_time as entTime ,t.dispatch_status as dispatchStatus,t.pg_type as pgType ") "t.pg_number as pgNumber ,t.start_time as startTime ,t.ent_time as entTime ,t.dispatch_status as dispatchStatus, t.pg_type as pgType ")
.select("u2.nickname as nickName")
.leftJoin("system_users u2 on u2.id = t.detil_user")
.orderByAsc(PgMasterLineDO::getTaskNo,PgMasterLineDO::getPgNumber) .orderByAsc(PgMasterLineDO::getTaskNo,PgMasterLineDO::getPgNumber)
; ;
@ -119,38 +121,7 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
; ;
return selectPage(reqVO, query); return selectPage(reqVO, query);
/*return selectPage(reqVO, new LambdaQueryWrapperX<PgMasterLineDO>()
.betweenIfPresent(PgMasterLineDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PgMasterLineDO::getBomId, reqVO.getBomId())
.eqIfPresent(PgMasterLineDO::getBomNumber, reqVO.getBomNumber())
.likeIfPresent(PgMasterLineDO::getBomName, reqVO.getBomName())
.eqIfPresent(PgMasterLineDO::getBomNo, reqVO.getBomNo())
.eqIfPresent(PgMasterLineDO::getProjectSubId, reqVO.getProjectSubId())
.likeIfPresent(PgMasterLineDO::getProjectSubName, reqVO.getProjectSubName())
.eqIfPresent(PgMasterLineDO::getProjectSubNumber, reqVO.getProjectSubNumber())
.eqIfPresent(PgMasterLineDO::getType, reqVO.getType())
.eqIfPresent(PgMasterLineDO::getMaterialId, reqVO.getMaterialId())
.eqIfPresent(PgMasterLineDO::getMaterialCode, reqVO.getMaterialCode())
.likeIfPresent(PgMasterLineDO::getMaterialName, reqVO.getMaterialName())
.eqIfPresent(PgMasterLineDO::getCompositionId, reqVO.getCompositionId())
.eqIfPresent(PgMasterLineDO::getSpec, reqVO.getSpec())
.eqIfPresent(PgMasterLineDO::getUnit, reqVO.getUnit())
.eqIfPresent(PgMasterLineDO::getBlueprintNo, reqVO.getBlueprintNo())
.eqIfPresent(PgMasterLineDO::getAmount, reqVO.getAmount())
.eqIfPresent(PgMasterLineDO::getDetilUser, reqVO.getDetilUser())
.eqIfPresent(PgMasterLineDO::getGongShi, reqVO.getGongShi())
.eqIfPresent(PgMasterLineDO::getZlPgId, reqVO.getZlPgId())
.eqIfPresent(PgMasterLineDO::getPgType, reqVO.getPgType())
.betweenIfPresent(PgMasterLineDO::getStartTime, reqVO.getStartTime())
.betweenIfPresent(PgMasterLineDO::getEntTime, reqVO.getEntTime())
.eqIfPresent(PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus())
.eqIfPresent(PgMasterLineDO::getTaskNo, reqVO.getTaskNo())
.eqIfPresent(PgMasterLineDO::getTaskId, reqVO.getTaskId())
.eqIfPresent(PgMasterLineDO::getProjectId, reqVO.getProjectId())
.likeIfPresent(PgMasterLineDO::getProjectName, reqVO.getProjectName())
.eqIfPresent(PgMasterLineDO::getPgNumber, reqVO.getPgNumber())
.eqIfPresent(PgMasterLineDO::getActive, reqVO.getActive())
.orderByDesc(PgMasterLineDO::getId));*/
} }
} }

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java
View File

@ -36,7 +36,7 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
.select("b.project_sub_id as projectSubId,b.project_sub_code as projectSubCode,b.mould_id as mouldId") .select("b.project_sub_id as projectSubId,b.project_sub_code as projectSubCode,b.mould_id as mouldId")
.select("d.name as projectSubName,d.composition_id as compositionId,d.unit,d.amount") .select("d.name as projectSubName,d.composition_id as compositionId,d.unit,d.amount")
.select("e.name as compositionName") .select("e.name as compositionName")
.select("c.projectName") .select("c.project_name as projectName")
//.select("f.name as mouldName") //.select("f.name as mouldName")
.leftJoin(PlanSubDO.class, "b", PlanSubDO::getProjectPlanId, PlanDO::getId) .leftJoin(PlanSubDO.class, "b", PlanSubDO::getProjectPlanId, PlanDO::getId)
.leftJoin(ProjectOrderDO.class, "c", ProjectOrderDO::getId, PlanSubDO::getProjectId) .leftJoin(ProjectOrderDO.class, "c", ProjectOrderDO::getId, PlanSubDO::getProjectId)

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java
View File

@ -37,8 +37,8 @@ public interface ProcessBomMapper extends BaseMapperX<ProcessBomDO> {
"b.spec as spec,b.unit as unit,b.blueprint_no as blueprintNo ") "b.spec as spec,b.unit as unit,b.blueprint_no as blueprintNo ")
.select("c.project_sub_short_name as projectSubShortName,c.project_sub_code as projectSubCode ") .select("c.project_sub_short_name as projectSubShortName,c.project_sub_code as projectSubCode ")
.select("d.amount as projectSubAmount ") .select("d.amount as projectSubAmount ")
.select("e.planCode ") .select("e.plan_no as planCode ")
.select("f.projectName") .select("f.project_name as projectName")
.leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getBomId,ProcessBomDO::getId) .leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getBomId,ProcessBomDO::getId)
.leftJoin(PlanSubDO.class,"c",PlanSubDO::getProjectSubId,ProcessBomDO::getProjectSubId) .leftJoin(PlanSubDO.class,"c",PlanSubDO::getProjectSubId,ProcessBomDO::getProjectSubId)
.leftJoin(ProjectOrderSubDO.class,"d",ProjectOrderSubDO::getId,ProcessBomDO::getProjectSubId) .leftJoin(ProjectOrderSubDO.class,"d",ProjectOrderSubDO::getId,ProcessBomDO::getProjectSubId)

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

@ -20,10 +20,10 @@ public interface PgMasterService {
/** /**
* 创建质量过程检派工单主 * 创建质量过程检派工单主
* *
* @param createReqVO 创建信息 * @param id 创建信息
* @return 编号 * @return 编号
*/ */
Integer zfPgMaster(@Valid PgMasterSaveReqVO createReqVO); Integer zfPgMaster(Integer id);
/** /**
* 创建质量过程检派工单主 * 创建质量过程检派工单主
* *
@ -68,6 +68,8 @@ public interface PgMasterService {
PageResult<PgMasterLineDO> getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO); PageResult<PgMasterLineDO> getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO);
PgMasterLineDO getLine(Integer id);
PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO); PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO);
/** /**
* 获得质量派工单过程检验行列表 * 获得质量派工单过程检验行列表

11
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java
View File

@ -152,10 +152,10 @@ public class PgMasterServiceImpl implements PgMasterService {
@Override @Override
public Integer zfPgMaster(PgMasterSaveReqVO createReqVO) { public Integer zfPgMaster(Integer id) {
//作废先判断是否已经报工 //作废先判断是否已经报工
BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(createReqVO.getId()); BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectSum(id);
//判断是否有报工数量 //判断是否有报工数量
if(bgMasterLineDO != null){ if(bgMasterLineDO != null){
@ -163,7 +163,7 @@ public class PgMasterServiceImpl implements PgMasterService {
throw exception(TASK_REPORT_PARAMS_ERRORSZF); throw exception(TASK_REPORT_PARAMS_ERRORSZF);
}else{ }else{
//没有报工的情况下执行作废 //没有报工的情况下执行作废
PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(createReqVO.getId()); PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(id);
pgMasterLineDO.setDispatchStatus(3); pgMasterLineDO.setDispatchStatus(3);
int a = pgMasterLineMapper.updateById(pgMasterLineDO); int a = pgMasterLineMapper.updateById(pgMasterLineDO);
// 返回 // 返回
@ -243,6 +243,11 @@ public class PgMasterServiceImpl implements PgMasterService {
return pgMasterLineMapper.selectPage(pageReqVO); return pgMasterLineMapper.selectPage(pageReqVO);
} }
@Override
public PgMasterLineDO getLine(Integer id) {
return pgMasterLineMapper.selectById(id);
}
@Override @Override
public PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO) { public PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO) {
return pgMasterLineMapper.selectMx(pageReqVO); return pgMasterLineMapper.selectMx(pageReqVO);

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java
View File

@ -11,6 +11,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLine
import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO;
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.pojo.PageParam;
import org.springframework.web.bind.annotation.RequestParam;
/** /**
* 质量终检派工单主 Service 接口 * 质量终检派工单主 Service 接口
@ -25,7 +26,7 @@ public interface ZjPgMasterService {
* @param createReqVO 作废 * @param createReqVO 作废
* @return 编号 * @return 编号
*/ */
Integer zfZjPgMaster(@Valid ZjPgMasterSaveReqVO createReqVO); Integer zfZjPgMaster(Integer id);
/** /**
* 创建质量终检派工单主 * 创建质量终检派工单主
* *

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

@ -187,9 +187,9 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService {
@Override @Override
public Integer zfZjPgMaster(ZjPgMasterSaveReqVO createReqVO) { public Integer zfZjPgMaster(Integer id) {
//作废先判断是否已经报工 //作废先判断是否已经报工
ZjBgMasterLineDO zjBgMasterLineDOS = zjBgMasterLineMapper.selectSum(createReqVO.getId()); ZjBgMasterLineDO zjBgMasterLineDOS = zjBgMasterLineMapper.selectSum(id);
//判断是否有报工数量 //判断是否有报工数量
if(zjBgMasterLineDOS != null){ if(zjBgMasterLineDOS != null){
@ -197,7 +197,7 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService {
throw exception(TASK_REPORT_PARAMS_ERRORSZF); throw exception(TASK_REPORT_PARAMS_ERRORSZF);
}else{ }else{
//没有报工的情况下执行作废 //没有报工的情况下执行作废
ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(createReqVO.getId()); ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(id);
zjPgMasterLineDO.setDispatchStatus(3); zjPgMasterLineDO.setDispatchStatus(3);
int a = zjPgMasterLineMapper.updateById(zjPgMasterLineDO); int a = zjPgMasterLineMapper.updateById(zjPgMasterLineDO);
// 返回 // 返回

10
mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts
View File

@ -35,6 +35,11 @@ export const getPgMaster = async (id: number) => {
return await request.get({ url: `/heli/pg-master/get?id=` + id }) return await request.get({ url: `/heli/pg-master/get?id=` + id })
} }
//作废质量过程检派工单主
export const zfPgMaster = async (id: number) => {
return await request.post({ url: `/heli/pg-master/zfPgMaster?id=` + id })
}
// 新增质量过程检派工单主 // 新增质量过程检派工单主
export const createPgMaster = async (data: PgMasterVO) => { export const createPgMaster = async (data: PgMasterVO) => {
return await request.post({ url: `/heli/pg-master/create`, data }) return await request.post({ url: `/heli/pg-master/create`, data })
@ -61,3 +66,8 @@ export const exportPgMaster = async (params) => {
export const getPgMasterLineListByZlPgId = async (zlPgId) => { export const getPgMasterLineListByZlPgId = async (zlPgId) => {
return await request.get({ url: `/heli/pg-master/pg-master-line/list-by-zl-pg-id?zlPgId=` + zlPgId }) return await request.get({ url: `/heli/pg-master/pg-master-line/list-by-zl-pg-id?zlPgId=` + zlPgId })
} }
// 获得质量派工单过程检验行列表
export const getPgMasterLineListByZlPgIdLine = async (zlPgId) => {
return await request.get({ url: `/heli/pg-master/task-dispatch-detail/getLine?id=` + zlPgId })
}

255
mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue
View File

@ -1,133 +1,173 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="1700px">
<el-form <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
ref="formRef" <!-- <el-form-item label="bomID" prop="bomId">
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="bomID" prop="bomId">
<el-input v-model="formData.bomId" placeholder="请输入bomID" /> <el-input v-model="formData.bomId" placeholder="请输入bomID" />
</el-form-item> -->
<el-row>
<el-col :span="6">
<el-form-item label="生产计划单号" prop="taskNo">
<el-input v-model="formData.taskNo" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="bom编号" prop="bomNumber">
<el-input v-model="formData.bomNumber" placeholder="请输入bom编号" /> </el-col>
</el-form-item> <el-col :span="6">
<el-form-item label="bom名称" prop="bomName"> <el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.bomName" placeholder="请输入bom名称" /> <el-input v-model="formData.projectName" placeholder="" />
</el-form-item>
<el-form-item label="bom版本号" prop="bomNo">
<el-input v-model="formData.bomNo" placeholder="请输入bom版本号" />
</el-form-item>
<el-form-item label="子项目id" prop="projectSubId">
<el-input v-model="formData.projectSubId" placeholder="请输入子项目id" />
</el-form-item>
<el-form-item label="子项目名称" prop="projectSubName">
<el-input v-model="formData.projectSubName" placeholder="请输入子项目名称" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="子项目编号" prop="projectSubNumber"> <el-form-item label="子项目编号" prop="projectSubNumber">
<el-input v-model="formData.projectSubNumber" placeholder="请输入子项目编号" /> <el-input v-model="formData.projectSubNumber" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="是否标准件" prop="type"> </el-col>
<el-select v-model="formData.type" placeholder="请选择是否标准件"> <el-col :span="6">
<el-option label="请选择字典生成" value="" /> <el-form-item label="子项目名称" prop="projectSubName">
</el-select> <el-input v-model="formData.projectSubName" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="物料id" prop="materialId"> </el-col>
<el-input v-model="formData.materialId" placeholder="请输入物料id" />
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="BOM名称" prop="bomName">
<el-input v-model="formData.bomName" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="BOM版本号" prop="bomNo">
<el-input v-model="formData.bomNo" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="派工单号" prop="pgNumber">
<el-input v-model="formData.pgNumber" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="物料编码" prop="materialCode">
<el-input v-model="formData.materialCode" placeholder="请输入物料编码" /> <el-input v-model="formData.materialCode" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="formData.materialName" placeholder="请输入物料名称" /> <el-input v-model="formData.materialName" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="材质id" prop="compositionId"> </el-col>
<el-input v-model="formData.compositionId" placeholder="请输入材质id" /> <el-col :span="6">
<el-form-item label="材质" prop="compositionId">
<el-input v-model="formData.compositionId" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格" prop="spec"> <el-form-item label="规格" prop="spec">
<el-input v-model="formData.spec" placeholder="请输入规格" /> <el-input v-model="formData.spec" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input v-model="formData.unit" placeholder="请输入单位" /> <el-input v-model="formData.unit" placeholder="请输入单位" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="图号" prop="blueprintNo"> <el-form-item label="图号" prop="blueprintNo">
<el-input v-model="formData.blueprintNo" placeholder="请输入图号" /> <el-input v-model="formData.blueprintNo" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="数量" prop="amount"> <el-form-item label="数量" prop="amount">
<el-input v-model="formData.amount" placeholder="请输入数量" /> <el-input v-model="formData.amount" placeholder="" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验人" prop="detilUser"> <el-form-item label="检验人" prop="detilUser">
<el-input v-model="formData.detilUser" placeholder="请输入检验人" /> <el-input v-model="formData.detilUser" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="预计工时" prop="gongShi"> </el-col>
<el-input v-model="formData.gongShi" placeholder="请输入预计工时" /> <el-col :span="6">
</el-form-item> <el-form-item label="单据状态" prop="pgType">
<el-form-item label="质量派工id" prop="zlPgId"> <el-select v-model="formData.pgType" placeholder="">
<el-input v-model="formData.zlPgId" placeholder="请输入质量派工id" /> <el-option
</el-form-item> v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PGTYPE)"
<el-form-item label="是否完成 0未完成 1已完成" prop="pgType"> :key="dict.value"
<el-select v-model="formData.pgType" placeholder="请选择是否完成 0未完成 1已完成"> :label="dict.label"
<el-option label="请选择字典生成" value="" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="开始日期" prop="startTime"> <el-form-item label="开始日期" prop="startTime">
<el-date-picker <el-date-picker v-model="formData.startTime" type="date" value-format="x" placeholder="" />
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始日期"
/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束日期" prop="entTime"> <el-form-item label="结束日期" prop="entTime">
<el-date-picker <el-date-picker v-model="formData.entTime" type="date" value-format="x" placeholder="选择结束日期" />
v-model="formData.entTime"
type="date"
value-format="x"
placeholder="选择结束日期"
/>
</el-form-item> </el-form-item>
<el-form-item label="派工状态 已保存|已提交|已终止 1|2|3" prop="dispatchStatus"> </el-col>
<el-radio-group v-model="formData.dispatchStatus"> <el-col :span="6">
<el-radio label="1">请选择字典生成</el-radio> <el-form-item label="派工状态" prop="dispatchStatus">
</el-radio-group> <el-select v-model="formData.dispatchStatus" placeholder="">
</el-form-item> <el-option
<el-form-item label="生产计划单号" prop="taskNo"> v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DISPATCH_STATUS)"
<el-input v-model="formData.taskNo" placeholder="请输入生产计划单号" /> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="生产计划id" prop="taskId"> :value="dict.value" />
<el-input v-model="formData.taskId" placeholder="请输入生产计划id" />
</el-form-item> </el-select>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" />
</el-form-item>
<el-form-item label="派工单号" prop="pgNumber">
<el-input v-model="formData.pgNumber" placeholder="请输入派工单号" />
</el-form-item>
<el-form-item label="报工状态" prop="active">
<el-input v-model="formData.active" placeholder="请输入报工状态" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> -->
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import * as PgMasterApi from '@/api/heli/pgmaster' import * as PgMasterApi from '@/api/heli/pgmaster'
import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
const {
t
} = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const dialogVisible = ref(false) // 弹窗的是否展示
const message = useMessage() // 消息弹窗 const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const dialogVisible = ref(false) // 弹窗的是否展示 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const dialogTitle = ref('') // 弹窗的标题 const formData = ref({
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined, id: undefined,
bomId: undefined, bomId: undefined,
bomNumber: undefined, bomNumber: undefined,
@ -158,13 +198,12 @@ const formData = ref({
projectName: undefined, projectName: undefined,
pgNumber: undefined, pgNumber: undefined,
active: undefined, active: undefined,
}) })
const formRules = reactive({ const formRules = reactive({})
}) const formRef = ref() // 表单 Ref
const formRef = ref() // 表单 Ref
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id ? : number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
@ -173,17 +212,19 @@ const open = async (type: string, id?: number) => {
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await PgMasterLineApi.getPgMasterLine(id) formData.value = await PgMasterApi.getPgMasterLineListByZlPgIdLine(id)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({
open
}) // 提供 open 方法，用于打开弹窗
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => { const submitForm = async () => {
// 校验表单 // 校验表单
await formRef.value.validate() await formRef.value.validate()
// 提交请求 // 提交请求
@ -203,10 +244,10 @@ const submitForm = async () => {
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
/** 重置表单 */ /** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
bomId: undefined, bomId: undefined,
@ -240,5 +281,5 @@ const resetForm = () => {
active: undefined, active: undefined,
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

53
mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue
View File

@ -63,6 +63,10 @@
</el-form-item> </el-form-item>
<el-form-item label="检验人" prop="detilUser"> <el-form-item label="检验人" prop="detilUser">
<UserSelect v-model="queryParams.detilUser" @update:newValue="handleSelectedUser1" class="!w-265px"/>
</el-form-item>
<!-- <el-form-item label="检验人" prop="detilUser">
<el-input <el-input
v-model="queryParams.detilUser" v-model="queryParams.detilUser"
placeholder="请输入检验人" placeholder="请输入检验人"
@ -70,16 +74,24 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="单据状态" prop="pgType"> <el-form-item label="单据状态" prop="pgType">
<el-select <el-select
v-model="queryParams.pgType" v-model="queryParams.pgType"
placeholder="请选择是否完成 0未完成 1已完成" placeholder="请选择是否完成 0未完成 1已完成"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option label="请选择字典生成" value="" />
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PGTYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="开始日期" prop="startTime"> <!-- <el-form-item label="开始日期" prop="startTime">
@ -161,24 +173,38 @@
<el-table-column label="数量" align="center" prop="amount" /> <el-table-column label="数量" align="center" prop="amount" />
<el-table-column label="规格" align="center" prop="spec" /> <el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="检验人" align="center" prop="detilUser" /> <el-table-column label="检验人" align="center" prop="nickName" />
<el-table-column label="派工单号" align="center" prop="pgNumber" /> <el-table-column label="派工单号" align="center" prop="pgNumber" />
<el-table-column <el-table-column
label="开始日期" label="开始日期"
align="center" align="center"
prop="startTime" prop="startTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="200px"
/> />
<el-table-column <el-table-column
label="结束日期" label="结束日期"
align="center" align="center"
prop="entTime" prop="entTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="200px"
/> />
<el-table-column label="派工状态" align="center" prop="dispatchStatus" /> <!-- <el-table-column label="派工状态" align="center" prop="dispatchStatus" /> -->
<el-table-column label="是否完成" align="center" prop="pgType" /> <el-table-column label="派工状态" min-width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_DISPATCH_STATUS" :value="scope.row.dispatchStatus" />
</template>
</el-table-column>
<!-- <el-table-column label="是否完成" align="center" prop="pgType" /> -->
<el-table-column label="单据状态" min-width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_PGTYPE" :value="scope.row.pgType" />
</template>
</el-table-column>
<!-- <el-table-column label="bomID" align="center" prop="bomId" /> <!-- <el-table-column label="bomID" align="center" prop="bomId" />
<el-table-column label="bom编号" align="center" prop="bomNumber" /> <el-table-column label="bom编号" align="center" prop="bomNumber" />
<el-table-column label="bom名称" align="center" prop="bomName" /> <el-table-column label="bom名称" align="center" prop="bomName" />
@ -246,9 +272,12 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import * as PgMasterApi from '@/api/heli/pgmaster' import * as PgMasterApi from '@/api/heli/pgmaster'
import PgMasterLineForm from './PgMasterLineForm.vue' import PgMasterLineForm from './PgMasterLineForm.vue'
import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
defineOptions({ name: 'PgMasterLine' }) defineOptions({ name: 'PgMasterLine' })
const handleSelectedUser1 = (newValue: any) => {
queryParams.detilUser = newValue?.id
}
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -326,10 +355,10 @@ const openForm = (type: string, id?: number) => {
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
// 删除的二次确认 // 删除的二次确认
await message.delConfirm() await message.confirm("是否要作废该派工单","")
// 发起删除 // 发起删除
await PgMasterApi.deletePgMasterLine(id) await PgMasterApi.zfPgMaster(id)
message.success(t('common.delSuccess')) message.success("作废成功")
// 刷新列表 // 刷新列表
await getList() await getList()
} catch {} } catch {}

2
mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue
View File

@ -84,7 +84,7 @@ const viewClick = async (item) => {
const params = { const params = {
id: item.id id: item.id
}; };
const data = await postOperateAPIZF(params); const data = await postOperateAPIZF(item.id);
console.log('返回数据'); console.log('返回数据');
console.log(data.id); console.log(data.id);
console.log(data); console.log(data);

2
mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue
View File

@ -95,7 +95,7 @@ const viewClick = async (item) => {
const params = { const params = {
id: item.id id: item.id
}; };
const data = await postOperateAPIZF(params); const data = await postOperateAPIZF(item.id);
if(data >0){ if(data >0){
const url = `/pages/zjPgMaster/zjPgMaster` const url = `/pages/zjPgMaster/zjPgMaster`

6
mes-ui/mini-app/src/services/pgMaster.ts
View File

@ -73,10 +73,10 @@ export const postOperateAPIEnd = (data: Object) => {
/** /**
* 操作生产任务-作废 * 操作生产任务-作废
*/ */
export const postOperateAPIZF = (data: Object) => { export const postOperateAPIZF = (id: Number) => {
return http<any[]>({ return http<any[]>({
method: 'POST', method: 'POST',
url: '/heli/pg-master/zfPgMaster', url: '/heli/pg-master/zfPgMaster?id='+id,
data,
}) })
} }

6
mes-ui/mini-app/src/services/zjPgMaster.ts
View File

@ -57,10 +57,10 @@ export const postOperateAPIEnd = (data: Object) => {
/** /**
* 操作生产任务-作废 * 操作生产任务-作废
*/ */
export const postOperateAPIZF = (data: Object) => { export const postOperateAPIZF = (id: number) => {
return http<any[]>({ return http<any[]>({
method: 'POST', method: 'POST',
url: '/heli/zj-pg-master/zfZjPgMaster', url: '/heli/zj-pg-master/zfZjPgMaster?id=' + id
data,
}) })
} }