diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/TaskDispatchStatusEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/TaskDispatchStatusEnum.java index e28d352..f05eb6a 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/TaskDispatchStatusEnum.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/TaskDispatchStatusEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @Getter public enum TaskDispatchStatusEnum { + Unedited(0, "未编辑"), SAVE(1, "已保存"), SUBMIT(2, "已提交"), CANCEL_SUBMIT(1, "取消提交"), diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 4551002..864fa23 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -161,7 +161,7 @@ public class bdgzsomthingController { public void init() { selectHasPrice(); selectSafeStorageAndDeliverOneYear(); - bdgzsomthingService.selectds(); +// bdgzsomthingService.selectds(); } @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/ProcessBomController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/ProcessBomController.java index 03fa146..4893d7a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/ProcessBomController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processbom/ProcessBomController.java @@ -247,8 +247,6 @@ public class ProcessBomController { PageResult pageResult = processBomService.getStandardPage(pageReqVO); return success(pageResult); } - - @PostMapping("/submit") @Operation(summary = "提交") @PreAuthorize("@ss.hasPermission('heli:process-bom:create')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java index 0e6b1d6..7314a7c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java @@ -10,6 +10,7 @@ import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.module.heli.config.HeliWebConfiguration; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationSaveReqVO; @@ -176,9 +177,19 @@ public class UnqualifiedNotificationController { @GetMapping("/statisticPage") @Operation(summary = "获得品质异常单统计分页") @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')") - public CommonResult> getUnqualifiedNotificationStatisticPage(@Valid UnqualifiedNotificationPageReqVO pageReqVO) { - PageResult pageResult = unqualifiedNotificationService.getUnqualifiedNotificationStatisticPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, UnqualifiedNotificationRespVO.class)); + public CommonResult> getUnqualifiedNotificationStatisticPage(@Valid UnqualifiedNotificationPageReqVO pageReqVO) { + PageResult pageResult = unqualifiedNotificationService.getUnqualifiedNotificationStatisticPage(pageReqVO); + return success(pageResult); + } + @GetMapping("/exportStatisticPage") + @Operation(summary = "导出质量异常统计 Excel") + @OperateLog(type = EXPORT) + public void exportStatisticPage(@Valid UnqualifiedNotificationPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = unqualifiedNotificationService.getUnqualifiedNotificationStatisticPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质量异常统计.xls", "数据", QualityStatistics.class, + BeanUtils.toBean(list, QualityStatistics.class)); } - } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/QualityStatistics.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/QualityStatistics.java new file mode 100644 index 0000000..d6f5683 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/QualityStatistics.java @@ -0,0 +1,60 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; +import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + + +@Data +@ToString(callSuper = true) +public class QualityStatistics { + + @ExcelProperty("项目名称") + private String projectName; + + @ExcelProperty("客户名称") + private String customerName; + @ExcelProperty("子项目名称") + private String projectSubName; + @ExcelProperty("零件名称") + private String bomName; + @ExcelProperty(value = "质检类型", converter = DictConvert.class) + @DictFormat("heli_inspection_type") + private Integer type; + @ExcelProperty("是否合格") + private String isQua; + @ExcelProperty("数量") + private BigDecimal amount; + @ExcelProperty("检验人") + private String userName; + @ExcelProperty("检验时间") + private String testingTime; + @ExcelProperty("工序") + private String procedureName; + @ExcelProperty("审核人") + private String auditorName; + @ExcelProperty("审核时间") + private String auditTime; + @ExcelProperty(value = "审核意见", converter = DictConvert.class) + @DictFormat("heli_unqualified_notification_opinion") + private Integer auditOpinion; + @ExcelProperty("项目编码") + private String projectCode; + @ExcelProperty("子项目编码") + private String projectSubNumber; + + + + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java index 6a0095d..25da791 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java @@ -175,7 +175,8 @@ public class TaskDispatchDO extends BaseDO { public boolean canOperate(OperateTypeEnum operateTypeEnum) { switch (operateTypeEnum){ case SAVE: - return canSave(); + return true; +// return canSave(); case SUBMIT: return canSubmit(); case CANCEL_SUBMIT: diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java index 7a0cd5a..c321fc6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java @@ -1,7 +1,9 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.unqualifiednotification; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO; @@ -15,8 +17,11 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.U import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.util.StringUtils; +import java.util.List; + /** * 品质异常通知单审核 Mapper * @@ -119,4 +124,6 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX QualityStatistics(@Param("page") Page page, @Param("pageReqVO") UnqualifiedNotificationPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/manager/CrossOrderManager.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/manager/CrossOrderManager.java index fc399fb..97dc150 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/manager/CrossOrderManager.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/manager/CrossOrderManager.java @@ -584,7 +584,7 @@ public class CrossOrderManager { .setBomDetailId(planTaskBomDO.getBomDetailId()) .setBomBlueprintNo(planTaskBomDO.getBomBlueprintNo() == null ?"":planTaskBomDO.getBomBlueprintNo()) .setActive(OperateTypeEnum.SAVE.name()) - .setDispatchStatus(TaskDispatchStatusEnum.SAVE.getCode()) + .setDispatchStatus(TaskDispatchStatusEnum.Unedited.getCode()) .setStatus(ValidStatusEnum.VALID.getCode()); taskDispatchService.createTaskDispatch(taskDispatchSaveReqVO); } @@ -617,7 +617,7 @@ public class CrossOrderManager { .setBomBlueprintNo(planTaskBomDO.getBomBlueprintNo() == null ?"":planTaskBomDO.getBomBlueprintNo()) .setBomDetailId(planTaskBomDO.getBomDetailId()) .setActive(OperateTypeEnum.SAVE.name()) - .setDispatchStatus(TaskDispatchStatusEnum.SAVE.getCode()) + .setDispatchStatus(TaskDispatchStatusEnum.Unedited.getCode()) .setStatus(ValidStatusEnum.VALID.getCode()); taskDispatchService.createTaskDispatch(taskDispatchSaveReqVO); }); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index 9fa93a7..6932c3c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -334,6 +334,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { BdgzsomthingDO.setThings("物料需求计划单号:" + planDO.getProjectMaterialPlanNo() + "已提交");//事件名称 BdgzsomthingDO.setAttr2(planDO.getProjectMaterialPlanNo());//跳转携带参数 BdgzsomthingDO.setAttr3(planDO.getProjectMaterialPlanNo());//独特标识 + BdgzsomthingDO.setAttr14("1");//独特标识 // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 // BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index c101733..d81136c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -1136,6 +1136,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { BdgzsomthingDO.setThings("物料需求计划单号:"+planDO.getProjectMaterialPlanNo()+"已提交");//事件名称 BdgzsomthingDO.setAttr2(planDO.getProjectMaterialPlanNo());//跳转携带参数 BdgzsomthingDO.setAttr3(planDO.getProjectMaterialPlanNo());//独特标识 + BdgzsomthingDO.setAttr14("0"); // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 // BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 if(attentiontodoRespVO.getAttr5().equals("1")){//提醒状态 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 08bd5e9..2063189 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 @@ -115,7 +115,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { SerialNumberDO serialNumberDO = serialNumberService.getSerialNumber(taskDispatchTypeEnum.getBusinesTypeEnum().name(), new SimpleDateFormat("yyyyMMdd").format(new Date())); serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); taskDispatch.setCode(taskDispatchTypeEnum.getCodeEnum().getCode(serialNumberDO.getSerialNumber().toString())); - taskDispatch.setDispatchStatus(TaskDispatchStatusEnum.valueOf(createReqVO.getActive()).getCode()); +// taskDispatch.setDispatchStatus(TaskDispatchStatusEnum.valueOf(createReqVO.getActive()).getCode()); taskDispatch.setCreator(getLoginUser().getId().toString()); taskDispatchMapper.insert(taskDispatch); @@ -147,8 +147,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } } if (!ObjectUtil.equal(v1, v2)) { - System.out.println(v1); - System.out.println(v2); return true; } } @@ -195,7 +193,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } } } - + if (operateTypeEnum == OperateTypeEnum.SAVE){ + updateObj.setDispatchStatus(1); + } // 明细工序状态更新 if(operateTypeEnum == OperateTypeEnum.SUBMIT){ if (updateReqVO.getDispatchType() != null && updateReqVO.getDispatchType().equals("ASSEMBLE")){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java index 4d10644..f4ac46e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java @@ -1,11 +1,9 @@ package com.chanko.yunxi.mes.module.heli.service.unqualifiednotification; -import java.util.*; import javax.validation.*; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.*; import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; /** * 品质异常通知单审核 Service 接口 @@ -54,5 +52,5 @@ public interface UnqualifiedNotificationService { void operate(UnqualifiedNotificationSaveReqVO operateReqVO); - PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO); + PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index d4270e0..bc223ed 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -1,15 +1,16 @@ package com.chanko.yunxi.mes.module.heli.service.unqualifiednotification; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotificationfile.UnqualifiedNotificationFileDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; @@ -225,8 +226,11 @@ try { } @Override - public PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO) { - return unqualifiedNotificationMapper.getStatisticPage(pageReqVO); + public PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO) { + Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + List qualityStatistics = unqualifiedNotificationMapper.QualityStatistics(page, pageReqVO); +// return new PageResult<>(qualityStatistics, page.getTotal()); + return null; } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml index d244f16..799a0f7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml @@ -9,4 +9,103 @@ 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/unqualifiednotification/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/unqualifiednotification/index.ts index 35ee1d5..cc0f65e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/unqualifiednotification/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/unqualifiednotification/index.ts @@ -53,3 +53,7 @@ export async function operateUnqualifiedNotification(data: UnqualifiedNotificati export const getUnqualifiedNotificationStatisticPage = async (params) => { return await request.get({ url: `/heli/unqualified-notification/statisticPage`, params }) } +// 导出品质异常通知单审核 Excel +export const exportStatisticPage = async (params) => { + return await request.download({ url: `/heli/unqualified-notification/exportStatisticPage`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index 1c9ce4a..1c22a7b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -295,5 +295,6 @@ export enum DICT_TYPE { HELI_STORAGEIN_STATUS='heli_storagein_status', MATERIAL_PLAN_BOOM_MPLAN_STATUS='material_plan_boom_mplan_status', HELI_PROJECT_PURCHASE_ORDER_NO_TYPE = 'heli_project_purchase_order_no_type',//采购单类型 + HELI_DISPATCH_PRODUCTION_STATUS = 'heli_dispatch_production_status', // 派工单状态 } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue index 8c5036b..8250eb8 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue @@ -546,7 +546,8 @@ const getList = async () => { jibie: item.level, dbsx: '', yesorno:item.yesorno, - sctime: formatTime(item.createTime, 'yyyy-MM-dd HH:mm:ss') + sctime: formatTime(item.createTime, 'yyyy-MM-dd HH:mm:ss'), + attr14:item.attr14 }; switch (item.thingname) { @@ -662,8 +663,16 @@ const handlePay =async (row: any) => { // router.push({ path: '/order/project', state: { idid: row.idid } }); } if (row.type == '《物料需求计划》提交后') { - await bdgzsomthingApi.deleteByIdNew(row.id); - router.push({ path: '/purchase/MaterialPlanAudit', state: { idid: row.idid } }); + // await bdgzsomthingApi.deleteByIdNew(row.id); + + if (row.attr14=='0'){ + router.push({ path: '/purchase/buy', state: { idid: row.idid } }); + }else { + + router.push({ path: '/purchase/PartPurchase', state: { idid: row.idid } }); + + } + // router.push({ path: '/purchase/MaterialPlanAudit', state: { idid: row.idid } }); // router.push({ path: '/purchase/MaterialPlanAudit', query: { idid: row.idid } }); } if (row.type == 'BOM变更审核') { @@ -763,6 +772,11 @@ const handlePaysee =async (row: any) => { // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 } + if (row.type == '《采购订单》到货时通知检验') { + // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); + // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); + await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 + } if (row.type == '装配任务到期'){ await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/management.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/management.vue index 3f4e63a..b536ad6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/management.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/management.vue @@ -1,7 +1,7 @@ + + + + + + - + @@ -425,6 +425,21 @@ v-model="row.deviceModel" @@ -445,24 +460,24 @@ v-model="row.deviceModel" - + + + + + + + + + + + + + + + +
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/index.vue index 84a9af5..338fd3e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/index.vue @@ -29,7 +29,7 @@ - + @@ -78,7 +78,7 @@ @@ -175,7 +175,7 @@ const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } const openDispatching = (type,id,ownerId,taskCode) => { - Dispatchingref.value.open(id,type,queryParams,ownerId,taskCode) + Dispatchingref.value.open(id,type,queryParams,ownerId,taskCode) } /** 删除按钮操作 */ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/unqualifiednotification/statistic.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/unqualifiednotification/statistic.vue index bce53de..06f6343 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/unqualifiednotification/statistic.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/unqualifiednotification/statistic.vue @@ -41,6 +41,14 @@ 重置 + + 导出 + @@ -49,23 +57,32 @@ - - + + + + + + + + + + + + + + + + - - - - - - - - + { queryParams.pageNo = 1 getList() } +const getDictLabel = (dictType, value) => { + var intDictOptions = getIntDictOptions(dictType); + const dict = intDictOptions.find(item => item.value == value) + return dict?.label || value // 找不到时显示原始值 +} +/** 导出按钮操作 */ +const handleExportDetail = async () => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出 + exportLoading.value = true + const data = await UnqualifiedNotificationApi.exportStatisticPage(queryParams) + download.excel(data, '质量异常统计.xlsx') + } catch { + } finally { + exportLoading.value = false + } +} /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields()