From 237dcff61054b20b276082c0ae06dd30c4ce86e0 Mon Sep 17 00:00:00 2001 From: think <1787994136@qq.com> Date: Wed, 15 Jan 2025 16:52:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BB=88=E6=A3=80=E5=92=8C=E8=BF=87=E7=A8=8B=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/pgmaster/PgMasterController.java | 13 +- .../zjpgmaster/ZjPgMasterController.java | 4 +- .../dataobject/pgmaster/PgMasterLineDO.java | 3 + .../mysql/pgmaster/PgMasterLineMapper.java | 37 +- .../heli/dal/mysql/plan/PlanMapper.java | 2 +- .../mysql/processbom/ProcessBomMapper.java | 4 +- .../service/pgmaster/PgMasterService.java | 6 +- .../service/pgmaster/PgMasterServiceImpl.java | 11 +- .../service/zjpgmaster/ZjPgMasterService.java | 3 +- .../zjpgmaster/ZjPgMasterServiceImpl.java | 6 +- .../src/api/heli/pgmaster/index.ts | 12 +- .../heli/pgmasterline/PgMasterLineForm.vue | 513 ++++++++++-------- .../src/views/heli/pgmasterline/index.vue | 55 +- .../pages/pgMaster/components/dataItem.vue | 2 +- .../pages/zjPgMaster/components/dataItem.vue | 2 +- mes-ui/mini-app/src/services/pgMaster.ts | 6 +- mes-ui/mini-app/src/services/zjPgMaster.ts | 6 +- 17 files changed, 378 insertions(+), 307 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java index 46c19f2..c6e75af 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java @@ -62,8 +62,8 @@ public class PgMasterController { @PostMapping("/zfPgMaster") @Operation(summary = "作废过程检验派工单") @PreAuthorize("@ss.hasPermission('heli:pg-master:create')") - public CommonResult zfPgMaster(@Valid @RequestBody PgMasterSaveReqVO createReqVO) { - return success(pgMasterService.zfPgMaster(createReqVO)); + public CommonResult zfPgMaster(@RequestParam("id") Integer id) { + return success(pgMasterService.zfPgMaster(id)); } @PostMapping("/create") @@ -143,7 +143,14 @@ public class PgMasterController { return success(pageResult); } + @GetMapping("/task-dispatch-detail/getLine") + @Operation(summary = "获得派工明细分页") + @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") + public CommonResult 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)); } + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java index c807237..15e43f6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java @@ -55,8 +55,8 @@ public class ZjPgMasterController { @PostMapping("/zfZjPgMaster") @Operation(summary = "作废终检派工单") @PreAuthorize("@ss.hasPermission('heli:zj-pg-master:create')") - public CommonResult zfZjPgMaster(@Valid @RequestBody ZjPgMasterSaveReqVO createReqVO) { - return success(zjPgMasterService.zfZjPgMaster(createReqVO)); + public CommonResult zfZjPgMaster(@RequestParam("id") Integer id) { + return success(zjPgMasterService.zfZjPgMaster(id)); } @PostMapping("/create") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java index d7c0064..99a140f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java @@ -153,4 +153,7 @@ public class PgMasterLineDO extends BaseDO { @TableField(exist = false) private BigDecimal workTime; + @TableField(exist = false) + private String nickName; + } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java index 0476817..68d3b40 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java @@ -78,7 +78,9 @@ public interface PgMasterLineMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); 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.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) ; @@ -119,38 +121,7 @@ public interface PgMasterLineMapper extends BaseMapperX { ; return selectPage(reqVO, query); - /*return selectPage(reqVO, new LambdaQueryWrapperX() - .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));*/ + } } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java index 7592a8b..3c40242 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java @@ -36,7 +36,7 @@ public interface PlanMapper extends BaseMapperX { .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("e.name as compositionName") - .select("c.projectName") + .select("c.project_name as projectName") //.select("f.name as mouldName") .leftJoin(PlanSubDO.class, "b", PlanSubDO::getProjectPlanId, PlanDO::getId) .leftJoin(ProjectOrderDO.class, "c", ProjectOrderDO::getId, PlanSubDO::getProjectId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java index e4a96e4..57fdd0e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java @@ -37,8 +37,8 @@ public interface ProcessBomMapper extends BaseMapperX { "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("d.amount as projectSubAmount ") - .select("e.planCode ") - .select("f.projectName") + .select("e.plan_no as planCode ") + .select("f.project_name as projectName") .leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getBomId,ProcessBomDO::getId) .leftJoin(PlanSubDO.class,"c",PlanSubDO::getProjectSubId,ProcessBomDO::getProjectSubId) .leftJoin(ProjectOrderSubDO.class,"d",ProjectOrderSubDO::getId,ProcessBomDO::getProjectSubId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java index 9ca5a21..e0b938a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java @@ -20,10 +20,10 @@ public interface PgMasterService { /** * 创建质量过程检派工单主 * - * @param createReqVO 创建信息 + * @param id 创建信息 * @return 编号 */ - Integer zfPgMaster(@Valid PgMasterSaveReqVO createReqVO); + Integer zfPgMaster(Integer id); /** * 创建质量过程检派工单主 * @@ -68,6 +68,8 @@ public interface PgMasterService { PageResult getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO); + PgMasterLineDO getLine(Integer id); + PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO); /** * 获得质量派工单过程检验行列表 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index 4e6c87a..9b4d8a6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -152,10 +152,10 @@ public class PgMasterServiceImpl implements PgMasterService { @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){ @@ -163,7 +163,7 @@ public class PgMasterServiceImpl implements PgMasterService { throw exception(TASK_REPORT_PARAMS_ERRORSZF); }else{ //没有报工的情况下执行作废 - PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(createReqVO.getId()); + PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(id); pgMasterLineDO.setDispatchStatus(3); int a = pgMasterLineMapper.updateById(pgMasterLineDO); // 返回 @@ -243,6 +243,11 @@ public class PgMasterServiceImpl implements PgMasterService { return pgMasterLineMapper.selectPage(pageReqVO); } + + @Override + public PgMasterLineDO getLine(Integer id) { + return pgMasterLineMapper.selectById(id); + } @Override public PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO) { return pgMasterLineMapper.selectMx(pageReqVO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java index a3c1da0..80d077f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java @@ -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.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import org.springframework.web.bind.annotation.RequestParam; /** * 质量终检派工单主 Service 接口 @@ -25,7 +26,7 @@ public interface ZjPgMasterService { * @param createReqVO 作废 * @return 编号 */ - Integer zfZjPgMaster(@Valid ZjPgMasterSaveReqVO createReqVO); + Integer zfZjPgMaster(Integer id); /** * 创建质量终检派工单主 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java index 17db31b..4656626 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java @@ -187,9 +187,9 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { @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){ @@ -197,7 +197,7 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { throw exception(TASK_REPORT_PARAMS_ERRORSZF); }else{ //没有报工的情况下执行作废 - ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(createReqVO.getId()); + ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(id); zjPgMasterLineDO.setDispatchStatus(3); int a = zjPgMasterLineMapper.updateById(zjPgMasterLineDO); // 返回 diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts index fee668b..b9320bc 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts @@ -35,6 +35,11 @@ export const getPgMaster = async (id: number) => { 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) => { return await request.post({ url: `/heli/pg-master/create`, data }) @@ -60,4 +65,9 @@ export const exportPgMaster = async (params) => { // 获得质量派工单过程检验行列表 export const getPgMasterLineListByZlPgId = async (zlPgId) => { return await request.get({ url: `/heli/pg-master/pg-master-line/list-by-zl-pg-id?zlPgId=` + zlPgId }) -} \ No newline at end of file +} +// 获得质量派工单过程检验行列表 +export const getPgMasterLineListByZlPgIdLine = async (zlPgId) => { + return await request.get({ url: `/heli/pg-master/task-dispatch-detail/getLine?id=` + zlPgId }) +} + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue index cc7f195..f5f4499 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue @@ -1,244 +1,285 @@ \ No newline at end of file + /** 重置表单 */ + const resetForm = () => { + formData.value = { + id: undefined, + bomId: undefined, + bomNumber: undefined, + bomName: undefined, + bomNo: undefined, + projectSubId: undefined, + projectSubName: undefined, + projectSubNumber: undefined, + type: undefined, + materialId: undefined, + materialCode: undefined, + materialName: undefined, + compositionId: undefined, + spec: undefined, + unit: undefined, + blueprintNo: undefined, + amount: undefined, + detilUser: undefined, + gongShi: undefined, + zlPgId: undefined, + pgType: undefined, + startTime: undefined, + entTime: undefined, + dispatchStatus: undefined, + taskNo: undefined, + taskId: undefined, + projectId: undefined, + projectName: undefined, + pgNumber: undefined, + active: undefined, + } + formRef.value?.resetFields() + } + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue index c6f98aa..c42c990 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue @@ -62,7 +62,11 @@ /> - + + + + + + + + - + + + + + + + + + + + +