From 94891dbea2ac6a46d89523e51cb56258ddbf93b3 Mon Sep 17 00:00:00 2001 From: Ledo Date: Thu, 16 Jan 2025 00:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E6=9F=A5=E8=AF=A2=E3=80=81=E7=9B=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/pgmaster/PgMasterController.java | 8 + .../storagelog/vo/StorageNowAllReqVO.java | 6 +- .../zjpgmaster/ZjPgMasterController.java | 7 + .../mysql/pgmaster/PgMasterLineMapper.java | 22 ++- .../dal/mysql/pgmaster/PgMasterMapper.java | 40 +++- .../zjpgmaster/ZjPgMasterLineMapper.java | 26 ++- .../service/pgmaster/PgMasterService.java | 2 +- .../service/pgmaster/PgMasterServiceImpl.java | 5 +- .../storagelog/StorageLogServiceImpl.java | 6 +- .../taskdispatch/TaskDispatchServiceImpl.java | 26 ++- .../service/zjpgmaster/ZjPgMasterService.java | 2 +- .../zjpgmaster/ZjPgMasterServiceImpl.java | 5 +- .../mapper/storagelog/StorageLogNowMapper.xml | 5 +- .../heli/storagecheck/StorageCheckForm.vue | 22 ++- .../views/heli/storagecheck/checkdetail.vue | 135 +++++++++---- .../views/heli/storagecheck/materialsNew.vue | 179 ++++++++++++++++++ .../pages/pgMaster/components/dataItem.vue | 4 +- .../pages/zjPgMaster/components/dataItem.vue | 4 +- mes-ui/mini-app/src/services/pgMaster.ts | 8 +- mes-ui/mini-app/src/services/zjPgMaster.ts | 7 + 20 files changed, 447 insertions(+), 72 deletions(-) create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue 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 c6e75af..a1a75f6 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 @@ -127,6 +127,14 @@ public class PgMasterController { PageResult pageResult = pgMasterService.getTaskDispatchDetailPage(pageReqVO); return success(pageResult); } + + @GetMapping("/task-dispatch-detail/pageWx") + @Operation(summary = "获得派工明细分页") + @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") + public CommonResult> getTaskDispatchPageDetailWx(@Valid PgMasterLinePageReqVO pageReqVO) { + PageResult pageResult = pgMasterService.getTaskDispatchDetailPageWx(pageReqVO); + return success(pageResult); + } @GetMapping("/task-dispatch-detail/pages") @Operation(summary = "获得质量派工单过程检验行分页") @PreAuthorize("@ss.hasPermission('heli:pg-master-line:query')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageNowAllReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageNowAllReqVO.java index c3e79bf..08f5cae 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageNowAllReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageNowAllReqVO.java @@ -24,7 +24,7 @@ public class StorageNowAllReqVO { @Schema(description = "仓库id") private Integer whId; + //是否全部数据 + private boolean isALL; - - -} \ 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/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 15e43f6..d2593b2 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 @@ -123,6 +123,13 @@ public class ZjPgMasterController { return success(pageResult); } + @GetMapping("/task-dispatch-detail/pageWx") + @Operation(summary = "获得派工明细分页") + @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") + public CommonResult> getTaskDispatchPageDetailWx(@Valid ZjPgMasterLinePageReqVO pageReqVO) { + PageResult pageResult = zjPgMasterService.getTaskDispatchDetailPageWx(pageReqVO); + return success(pageResult); + } @GetMapping("/task-dispatch-detail/get") @Operation(summary = "获得派工明细分页") @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") 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 68d3b40..c92afbc 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 @@ -11,6 +11,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.PgMasterLin import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; @@ -72,7 +73,26 @@ public interface PgMasterLineMapper extends BaseMapperX { return selectPage(reqVO, query); } + default PageResult selectPageWx(PgMasterLinePageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(PgMasterLineDO.class) + .select("d.amounts,d.workTime") + .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id") + .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PgMasterLineDO::getProjectSubId) + .leftJoin(PlanDO.class,"pl",PlanDO::getProjectId,ProjectOrderSubDO::getProjectOrderId) + .eq(PlanDO::getStatus,2) + .orderByDesc(PlanDO::getId) + .disableSubLogicDel(); + query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + .eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType()) + .eq(reqVO.getDispatchStatus() != null, PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) + + + ; + + return selectPage(reqVO, query); + } default PageResult selectPages(PgMasterLinePageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); @@ -124,4 +144,4 @@ public interface PgMasterLineMapper extends BaseMapperX { } -} \ 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/PgMasterMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java index 4390b94..7244528 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java @@ -7,8 +7,11 @@ 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.module.heli.dal.dataobject.pgmaster.PgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.*; @@ -33,8 +36,43 @@ public interface PgMasterMapper extends BaseMapperX { .betweenIfPresent(PgMasterDO::getPgDatetime, reqVO.getPgDatetime()) .orderByDesc(PgMasterDO::getId)); } + default PageResult selectPageWx(PgMasterPageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query. + leftJoin(PlanDO.class,"p",PlanDO::getProjectId,PgMasterDO::getProjectId) + .eq(PlanDO::getStatus,2) + .orderByDesc(PgMasterDO::getId); + if (reqVO.getCreateTime() != null) { + query.between(PgMasterDO::getCreateTime, reqVO.getCreateTime()[0],reqVO.getCreateTime()[1]); + } + if (reqVO.getPgNumber() != null) { + query.eq(PgMasterDO::getPgNumber, reqVO.getPgNumber()); + } + if (reqVO.getTaskNo() != null) { + query.eq(PgMasterDO::getTaskNo, reqVO.getTaskNo()); + } + if (reqVO.getTaskId() != null) { + query.eq(PgMasterDO::getTaskId, reqVO.getTaskId()); + } + if (reqVO.getProjectId() != null) { + query.eq(PgMasterDO::getProjectId, reqVO.getProjectId()); + } + if (reqVO.getProjectNo() != null) { + query.eq(PgMasterDO::getProjectNo, reqVO.getProjectNo()); + } + if (reqVO.getProjectName() != null) { + query.like(PgMasterDO::getProjectName, reqVO.getProjectName()); + } + if (reqVO.getPgUser() != null) { + query.eq(PgMasterDO::getPgUser, reqVO.getPgUser()); + } + if (reqVO.getPgDatetime() != null) { + query.between(PgMasterDO::getPgDatetime, reqVO.getPgDatetime()[0], reqVO.getPgDatetime()[1]); + } + return selectPage(reqVO, query); + } List selectgcjinsert(Long id); List selectgcjinsertzj(Long id); -} \ 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/zjpgmaster/ZjPgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java index 660e772..4e9f28c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java @@ -10,6 +10,8 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.PgMasterLin import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMasterLinePageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -53,7 +55,11 @@ public interface ZjPgMasterLineMapper extends BaseMapperX { query.selectAll(ZjPgMasterLineDO.class) .select("d.amounts,d.workTime") .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id") - .orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber) + .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,ZjPgMasterLineDO::getProjectSubId) + .leftJoin(PlanDO.class,"pl",PlanDO::getProjectId,ProjectOrderSubDO::getProjectOrderId) + .eq(PlanDO::getStatus,2) + .orderByDesc(PlanDO::getId) + .disableSubLogicDel(); query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser()) @@ -65,8 +71,24 @@ public interface ZjPgMasterLineMapper extends BaseMapperX { return selectPage(reqVO, query); } + default PageResult selectPageWx(ZjPgMasterLinePageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(ZjPgMasterLineDO.class) + .select("d.amounts,d.workTime") + .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id") + .orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber) + .disableSubLogicDel(); + + query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + .eq(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType()) + .eq(reqVO.getDispatchStatus()!=null,ZjPgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) + + ; + + return selectPage(reqVO, query); + } default int deleteByZlPgId(Integer zlPgId) { return delete(ZjPgMasterLineDO::getZlPgId, zlPgId); } -} \ 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/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 63e430d..2998cb6 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 @@ -65,7 +65,7 @@ public interface PgMasterService { PageResult getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO); - + PageResult getTaskDispatchDetailPageWx(PgMasterLinePageReqVO pageReqVO); PageResult getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO); PgMasterLineDO getLine(Integer id); 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 2af4974..1c54cff 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 @@ -245,7 +245,10 @@ public class PgMasterServiceImpl implements PgMasterService { public PageResult getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO) { return pgMasterLineMapper.selectPage(pageReqVO); } - + @Override + public PageResult getTaskDispatchDetailPageWx(PgMasterLinePageReqVO pageReqVO) { + return pgMasterLineMapper.selectPageWx(pageReqVO); + } @Override public PgMasterLineDO getLine(Integer id) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java index 522c380..dd7d71d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java @@ -127,7 +127,11 @@ public class StorageLogServiceImpl implements StorageLogService { return storageLogNowMapper.selectNoZero(queryReqVO); }else{ // 筛选全部的实时库存数据，包含未分配仓库的物料信息和已分配仓库的物料信息 - return storageLogNowMapper.selectNowList(queryReqVO); + if(queryReqVO.isALL()){ + return storageLogNowMapper.selectNowList(queryReqVO); + }else{ + return storageLogNowMapper.selectNowList(queryReqVO); + } } // } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index 629cbfd..c347484 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -345,7 +345,24 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { List list = taskDispatchDetailDOPageResult.getList(); List afterList = new ArrayList<>(); if (CollUtil.isNotEmpty(list)){ - Map> collect = list.stream().collect(Collectors.groupingBy(TaskDispatchDetailDO::getDispatchCode)); + Map> collect ; + if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){ + collect = list.stream() + .collect(Collectors.groupingBy( + TaskDispatchDetailDO::getDispatchCode, + () -> new TreeMap<>(Comparator.reverseOrder()), + Collectors.toList() + )); + + }else { + collect = list.stream() + .collect(Collectors.groupingBy( + TaskDispatchDetailDO::getDispatchCode, + TreeMap::new, + Collectors.toList() + )); + } + collect.forEach((code,list2)->{ list2.sort(Comparator.comparing(TaskDispatchDetailDO::getSort, Comparator.nullsLast(Integer::compareTo))); afterList.addAll(list2); @@ -477,7 +494,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { .eq(TaskDispatchDO::getDispatchType,"ASSEMBLE")); //零件是否生产完成 List taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchId(taskDispatchDO.getId()); - List productionList = taskDispatchDetailDOS.stream().filter(e -> e.getDispatchType().equals("PRODUCTION") && !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList()); + List productionList = taskDispatchDetailDOS.stream().filter(e -> !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList()); //过程检 零件所有生产派工完成生成 boolean isBomDetailProductionOver = true; //终检 子项目装配派工都完成 @@ -485,7 +502,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { //生产零件派工判断是否生成过程检 if (CollUtil.isNotEmpty(productionList)){ for (TaskDispatchDetailDO dispatchDetailDO : productionList) { - if (dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ + if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) && + dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ isBomDetailProductionOver = false; break; } @@ -502,7 +520,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } } if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){ - pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId()); + pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId()); }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver){ zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId()); } 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 80d077f..a94975e 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 @@ -81,7 +81,7 @@ public interface ZjPgMasterService { List searchZXMMx(Long task_id,Long project_id); PageResult getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO); - + PageResult getTaskDispatchDetailPageWx(ZjPgMasterLinePageReqVO pageReqVO); ZjPgMasterLineDO getTaskDispatchDetail(ZjPgMasterLinePageReqVO pageReqVO); } 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 6f9d264..fb415e4 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 @@ -67,7 +67,10 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { public PageResult getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO) { return zjPgMasterLineMapper.selectPage(pageReqVO); } - + @Override + public PageResult getTaskDispatchDetailPageWx(ZjPgMasterLinePageReqVO pageReqVO) { + return zjPgMasterLineMapper.selectPageWx(pageReqVO); + } @Override public Boolean insertZjList(Long task_id,Long project_id){ //查询BOM明细 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml index 276500d..818c3ca 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml @@ -47,7 +47,7 @@ + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue index 55937d6..bb0ba31 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue @@ -17,12 +17,16 @@ - - - - {{ dict.label }} - - + + + @@ -47,7 +51,7 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const router = useRouter() - +const noZeroSwich = ref(false) const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 @@ -104,6 +108,10 @@ const submitForm = async () => { // 提交请求 formLoading.value = true try { + console.log(noZeroSwich.value) + if(noZeroSwich.value == true){ + formData.value.noZero = 1; + } const data = formData.value as unknown as StorageCheckApi.StorageCheckVO data.status = 1 if (formType.value === 'create') { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue index ab0aa2a..58f57cb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue @@ -55,17 +55,24 @@ - - --> + @@ -92,7 +99,7 @@ - 获取物料 + 获取物料 @@ -107,7 +114,7 @@