From 646e866fc82c70bfc5325106e3d829e9cd6204a3 Mon Sep 17 00:00:00 2001 From: Ledo Date: Sun, 19 Jan 2025 14:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8E=8B=E5=B7=A5=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/framework/common/pojo/PageParam.java | 4 +- .../ProcessDesignController.java | 4 +- .../vo/ProcessDesignSaveReqSubVO.java | 3 +- .../projectorder/ProjectOrderController.java | 7 +++ .../projectorder/ProjectOrderDO.java | 3 +- .../mysql/pgmaster/PgMasterLineMapper.java | 10 ++-- .../projectorder/ProjectOrderMapper.java | 30 ++++++++++- .../zjpgmaster/ZjPgMasterLineMapper.java | 7 ++- .../processdesign/ProcessDesignService.java | 4 +- .../ProcessDesignServiceImpl.java | 54 ++++++++++++++++++- .../projectorder/ProjectOrderService.java | 1 + .../projectorder/ProjectOrderServiceImpl.java | 5 +- .../zjpgmaster/ZjPgMasterServiceImpl.java | 10 +++- .../heli/pgmasterline/PgMasterLineForm.vue | 37 ++++++++++--- .../src/views/heli/pgmasterline/index.vue | 15 +++--- .../zjpgmasterline/ZjPgMasterLineForm.vue | 35 +++++++++--- .../src/views/heli/zjpgmasterline/index.vue | 17 +++--- .../moJuSheJiReport/components/dataItem.vue | 15 +++--- .../moJuSheJiReport/components/popup.vue | 21 +++++--- .../moJuSheJiReport-detail.vue | 8 +-- .../src/pages/pgMaster/pgMaster-detail.vue | 19 +++++++ .../components/detailPanel.vue | 13 ++--- .../pages/zjPgMaster/zjPgMaster-detail.vue | 17 ++++++ mes-ui/mini-app/src/services/approveOrder.ts | 8 ++- mes-ui/mini-app/src/services/constants.ts | 4 +- .../mini-app/src/services/moJuSheJiReport.ts | 5 +- 26 files changed, 280 insertions(+), 76 deletions(-) diff --git a/mes-framework/mes-common/src/main/java/com/chanko/yunxi/mes/framework/common/pojo/PageParam.java b/mes-framework/mes-common/src/main/java/com/chanko/yunxi/mes/framework/common/pojo/PageParam.java index cacc0d9..bf5b9ae 100644 --- a/mes-framework/mes-common/src/main/java/com/chanko/yunxi/mes/framework/common/pojo/PageParam.java +++ b/mes-framework/mes-common/src/main/java/com/chanko/yunxi/mes/framework/common/pojo/PageParam.java @@ -27,10 +27,10 @@ public class PageParam implements Serializable { @Min(value = 1, message = "页码最小值为 1") private Integer pageNo = PAGE_NO; - @Schema(description = "每页条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + @Schema(description = "每页条数，最大值为 999", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @NotNull(message = "每页条数不能为空") @Min(value = 1, message = "每页条数最小值为 1") - @Max(value = 100, message = "每页条数最大值为 100") + @Max(value = 999, message = "每页条数最大值为 999") private Integer pageSize = PAGE_SIZE; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java index b770f67..a31881f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java @@ -48,8 +48,8 @@ public class ProcessDesignController { @Operation(summary = "报工") @PreAuthorize("@ss.hasPermission('heli:process-design:create')") public CommonResult updateBaoGong(@Valid @RequestBody ProcessDesignSaveReqSubVO processDesignSaveReqSubVO) { - - return success(processDesignService.updateBaoGong(processDesignSaveReqSubVO.getZid(),processDesignSaveReqSubVO.getProgress(),processDesignSaveReqSubVO.getImageLink())); + return success(processDesignService.updateBaoGong(processDesignSaveReqSubVO)); + // return success(processDesignService.updateBaoGong(processDesignSaveReqSubVO.getZid(),processDesignSaveReqSubVO.getProgress(),processDesignSaveReqSubVO.getImageLink(),processDesignSaveReqSubVO.getRemark())); } @PostMapping("/create") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqSubVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqSubVO.java index 37d4bc7..17e385f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqSubVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqSubVO.java @@ -22,7 +22,8 @@ public class ProcessDesignSaveReqSubVO { @Schema(description = "图纸链接", example = "随便") private String imageLink; - + @Schema(description = "备注", example = "随便") + private String remark; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java index c46eebc..6e92f28 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java @@ -150,6 +150,13 @@ public class ProjectOrderController { PageResult pageResult = projectOrderService.getProjectOrderPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProjectOrderRespVO.class)); } + @GetMapping("/pageWX") + @Operation(summary = "获得项目订单分页") + @PreAuthorize("@ss.hasPermission('heli:project-order:query')") + public CommonResult> getProjectOrderPageWX(@Valid ProjectOrderPageReqVO pageReqVO) { + PageResult pageResult = projectOrderService.getProjectOrderPageWx(pageReqVO); + return success(BeanUtils.toBean(pageResult, ProjectOrderRespVO.class)); + } @GetMapping("/export-excel") @Operation(summary = "导出项目订单 Excel") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java index 96b328c..a02e754 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java @@ -269,7 +269,8 @@ public class ProjectOrderDO extends BaseDO { @TableField(exist = false) private String projectSubName; - + @TableField(exist = false) + private String unitName; /** * 变更的字段列表 * */ 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 9ec81e7..1251ed2 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 @@ -80,10 +80,14 @@ public interface PgMasterLineMapper extends BaseMapperX { .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(); + .eq(PlanDO::getStatus,2) + .disableSubLogicDel(); + if (reqVO.getPgType() == 1){ + query.orderByDesc(PgMasterLineDO::getPgNumber); + }else{ + query.orderByDesc(PlanDO::getId); + } 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()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java index be324c6..d2718ca 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java @@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderCostPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO; @@ -79,7 +80,34 @@ public interface ProjectOrderMapper extends BaseMapperX { ; return selectPage(reqVO, query); } - + default PageResult selectPageWx(ProjectOrderPageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(ProjectOrderDO.class) + .select("u.nickname as businessManName", "d.name as businessDeptName", "e.name as customerName") + .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, ProjectOrderDO::getBusinessMan) + .leftJoin(DeptDO.class, "d", DeptDO::getId, ProjectOrderDO::getBusinessDeptId) + .leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId) + .leftJoin(PlanDO.class,"p",PlanDO::getProjectId,ProjectOrderDO::getId) + .eq(PlanDO::getStatus,2) + .disableSubLogicDel() + .orderByDesc(ProjectOrderDO::getId); + query.like(!StringUtils.isEmpty(reqVO.getCode()), ProjectOrderDO::getCode, reqVO.getCode()) + .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName()) + .like(!StringUtils.isEmpty(reqVO.getBusinessManName()), "u.nickname", reqVO.getBusinessManName()) + .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) + .like(!StringUtils.isEmpty(reqVO.getContractNo()), ProjectOrderDO::getContractNo, reqVO.getContractNo()) + .eq(reqVO.getHasPrice() != null, ProjectOrderDO::getHasPrice, reqVO.getHasPrice()) + .eq(reqVO.getOrderStatus() != null, ProjectOrderDO::getOrderStatus, reqVO.getOrderStatus()) + .eq(reqVO.getDeliveryStatus() != null, ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatus()) + .in(reqVO.getOrderStatusList() != null && !reqVO.getOrderStatusList().isEmpty(), ProjectOrderDO::getOrderStatus, reqVO.getOrderStatusList()) + .in(reqVO.getDeliveryStatusList() != null && !reqVO.getDeliveryStatusList().isEmpty(), ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatusList()) + .eq(reqVO.getIsSnapshot() != null, ProjectOrderDO::getIsSnapshot, reqVO.getIsSnapshot()) + .eq(reqVO.getHasAlter() != null, ProjectOrderDO::getHasAlter, reqVO.getHasAlter()) + .like(!StringUtils.isEmpty(reqVO.getSnapshotCode()), ProjectOrderDO::getSnapshotCode, reqVO.getSnapshotCode()) + .in(CollUtil.isNotEmpty(reqVO.getIdList()), ProjectOrderDO::getId, reqVO.getIdList()) + ; + return selectPage(reqVO, query); + } default ProjectOrderDO selectById(Long id) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProjectOrderDO.class) 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 bb8aa77..30d4035 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 @@ -105,9 +105,12 @@ 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) .disableSubLogicDel(); - + if(reqVO.getPgType() == 1){ + query.orderByDesc(ZjPgMasterLineDO::getPgNumber); + }else { + query.orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber); + } 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()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java index 6bb252f..ff939e5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java @@ -31,8 +31,8 @@ public interface ProcessDesignService { */ Long createProcessDesign(@Valid ProcessDesignSaveReqVO createReqVO); - - Long updateBaoGong(Long zid, BigDecimal progress, String imageLink); + Long updateBaoGong( ProcessDesignSaveReqSubVO processDesignSaveReqSubVO); + Long updateBaoGong(Long zid, BigDecimal progress, String imageLink,String remark); /** * 更新工艺设计 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java index 2e88a1a..a845ece 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java @@ -7,6 +7,7 @@ import com.chanko.yunxi.mes.framework.common.util.object.ObjectUtils; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.ProcessDesignPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.ProcessDesignProgressPageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.ProcessDesignSaveReqSubVO; import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.ProcessDesignSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.zjbgmasterline.vo.ZjBgMasterLinePageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO; @@ -51,9 +52,57 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { public PageResult getProcessPage(ProcessDesignProgressPageReqVO pageReqVO) { return processDesignProgressMapper.selectPage(pageReqVO); } - @Override - public Long updateBaoGong(Long zid, BigDecimal progress, String imageLink){ + public Long updateBaoGong(ProcessDesignSaveReqSubVO reqVO){ + //先取出主ID下的所有报工百分比判断不能报工不能超过100 + ProcessDesignProgressDO processDesignProgressDOS = processDesignProgressMapper.selectSumJinDu(reqVO.getZid()); + BigDecimal value1 = reqVO.getProgress(); + BigDecimal threshold = new BigDecimal("100"); + if(processDesignProgressDOS != null){ + //相加判断是否大于100，大于时返回前端并给用户提示 + + BigDecimal value2 = processDesignProgressDOS.getProgress(); + BigDecimal sum = value1.add(value2); + + if (value1.compareTo(threshold) > 0) { + //大于100时不执行,并返回给用户，提示设计进度不能超过100 + throw exception(TASK_REPORT_PARAMS_ERRORJD); + } else { + if(processDesignProgressDOS.getProgress().compareTo(value1)>0){ + throw exception(TASK_REPORT_PARAMS_ERRORSJBG); + }else{ + //反之插入数据库数据 + ProcessDesignProgressDO processDesignProgressDO = new ProcessDesignProgressDO(); + processDesignProgressDO.setProcessDesignId(reqVO.getZid()); + processDesignProgressDO.setProgress(reqVO.getProgress()); + processDesignProgressDO.setBlueprintLink(reqVO.getImageLink()); + if (reqVO.getRemark() != null && !reqVO.getRemark().trim().equals("")){ + processDesignProgressDO.setRemark(reqVO.getRemark()); + } + + processDesignProgressMapper.insert(processDesignProgressDO); + } + } + }else{ + if(value1.compareTo(threshold) > 0){ + throw exception(TASK_REPORT_PARAMS_ERRORJD); + }else{ + //反之插入数据库数据 + ProcessDesignProgressDO processDesignProgressDO = new ProcessDesignProgressDO(); + processDesignProgressDO.setProcessDesignId(reqVO.getZid()); + processDesignProgressDO.setProgress(reqVO.getProgress()); + processDesignProgressDO.setBlueprintLink(reqVO.getImageLink()); + processDesignProgressMapper.insert(processDesignProgressDO); + } + + } + + + + return null; + } + @Override + public Long updateBaoGong(Long zid, BigDecimal progress, String imageLink,String remark){ //先取出主ID下的所有报工百分比判断不能报工不能超过100 ProcessDesignProgressDO processDesignProgressDOS = processDesignProgressMapper.selectSumJinDu(zid); BigDecimal value1 = progress; @@ -76,6 +125,7 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { processDesignProgressDO.setProcessDesignId(zid); processDesignProgressDO.setProgress(progress); processDesignProgressDO.setBlueprintLink(imageLink); + processDesignProgressDO.setRemark(remark); processDesignProgressMapper.insert(processDesignProgressDO); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java index 9c1d05f..4e584f6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java @@ -55,6 +55,7 @@ public interface ProjectOrderService { * @return 项目订单分页 */ PageResult getProjectOrderPage(ProjectOrderPageReqVO pageReqVO); + PageResult getProjectOrderPageWx(ProjectOrderPageReqVO pageReqVO); PageResult getProjectOrderCostPage(ProjectOrderCostPageReqVO pageReqVO); ProjectOrderDO getProjectOrderCost(Long id,Long projectSubId); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index b5c75b4..b552bc8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -367,7 +367,10 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { return projectOrderMapper.selectPage(pageReqVO); } - + @Override + public PageResult getProjectOrderPageWx(ProjectOrderPageReqVO pageReqVO) { + return projectOrderMapper.selectPageWx(pageReqVO); + } @Override public PageResult getProjectOrderCostPage(ProjectOrderCostPageReqVO 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 ef3e249..d790a47 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 @@ -12,6 +12,8 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.zjbgmasterline.ZjBgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.enums.TaskDispatchTypeEnum; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -57,11 +59,15 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { @Resource private MouldTypeMapper mouldTypeMapper; - + @Resource + private AdminUserMapper adminUserMapper; @Override public ZjPgMasterLineDO getLine(Integer id) { - return zjPgMasterLineMapper.selectById(id); + ZjPgMasterLineDO zjPgMasterLineDO = zjPgMasterLineMapper.selectById(id); + AdminUserDO adminUserDO = adminUserMapper.selectById(zjPgMasterLineDO.getDetilUser()); + zjPgMasterLineDO.setNickName(adminUserDO.getNickname()); + return zjPgMasterLineDO; } @Override public ZjPgMasterLineDO getTaskDispatchDetail(ZjPgMasterLinePageReqVO pageReqVO){ 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 d49a9c0..7fbd74b 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 @@ -70,7 +70,8 @@ - + + @@ -80,7 +81,8 @@ - + + @@ -98,7 +100,7 @@ - + @@ -119,12 +121,14 @@ - + + - + + @@ -158,6 +162,7 @@ diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue index df08d76..9c0823c 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue @@ -211,8 +211,8 @@ const handleStop = async () => { --> 上报时间：{{ item.createTime }} - - + 报工进度：{{ item.progress+'%' }} + + 图纸链接：{{item.blueprintLink }} + 备注：{{ item.remark }} diff --git a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue index d766e5d..d9ae8c8 100644 --- a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue +++ b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue @@ -163,6 +163,25 @@ const handleStart = async () => { } // 结束生产 const handleStop = async () => { + + //算时间和数量 + //算时间 + var lastIndex = historyList.value.length-1; + var lastItem = historyList.value[lastIndex]; + console.log( historyList.value) + workTime.value = Math.floor(Math.abs(lastItem.createTime - Date.now()) / (1000 * 60 * 60)).toString(); + //算数量 + if(historyList.value.length == 1){ + amount.value = 0; + }else{ + var beforeAmount = 0; + for (var i = 0 ; i < historyList.value.length-1;i++){ + beforeAmount += historyList.value[i].amount + } + var finalamount = detailInfo.value.amount -beforeAmount + if(finalamount < 0){finalamount = 0} + amount.value = finalamount.toString(); + } popup.value.open(); } diff --git a/mes-ui/mini-app/src/pages/unqualifiedNotification/components/detailPanel.vue b/mes-ui/mini-app/src/pages/unqualifiedNotification/components/detailPanel.vue index 04315eb..255c7b7 100644 --- a/mes-ui/mini-app/src/pages/unqualifiedNotification/components/detailPanel.vue +++ b/mes-ui/mini-app/src/pages/unqualifiedNotification/components/detailPanel.vue @@ -1,7 +1,7 @@