From dabb6a5d7e5295f24c58e1f12239f14e8ebbad70 Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 11 Jul 2025 09:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=BC=82=E5=B8=B8=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnqualifiedNotificationController.java | 8 + .../vo/UnqualifiedNotificationPageReqVO.java | 2 + .../UnqualifiedNotificationDO.java | 4 + .../UnqualifiedNotificationMapper.java | 3 + .../bgmasterline/BgMasterLineServiceImpl.java | 4 +- .../UnqualifiedNotificationService.java | 3 + .../UnqualifiedNotificationServiceImpl.java | 10 + .../ZjBgMasterLineServiceImpl.java | 4 +- .../UnqualifiedNotificationMapper.xml | 70 ++- mes-ui/mini-app/src/pages.json | 8 +- .../components/dataItem.vue | 28 +- .../unqualifiedNotification-detail.vue | 585 ++++++++++++++++++ .../unqualifiedNotification.vue | 4 +- .../src/pages/zjPgMaster/showpicture.vue | 118 ++++ .../src/services/unqualifiedNotification.ts | 7 + 15 files changed, 835 insertions(+), 23 deletions(-) create mode 100644 mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue create mode 100644 mes-ui/mini-app/src/pages/zjPgMaster/showpicture.vue 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 09ca57c..278bb53 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 @@ -185,6 +185,14 @@ public class UnqualifiedNotificationController { return success(unqualifiedNotificationPage); } + + @GetMapping("/detailWx") + @Operation(summary = "获得品质异常通知单审核分页") + @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')") + public CommonResult detailWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) { + return success(unqualifiedNotificationService.getUnqualifiedNotificationWxById(pageReqVO)); + } + @GetMapping("/export-excel") @Operation(summary = "导出品质异常通知单审核 Excel") @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:export')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java index 8a3346f..82fa377 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationPageReqVO.java @@ -17,6 +17,8 @@ import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_Y @ToString(callSuper = true) public class UnqualifiedNotificationPageReqVO extends PageParam { + private Long Id; + @Schema(description = "编号,唯一") private String code; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java index a432df9..cdddaea 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java @@ -146,6 +146,10 @@ public class UnqualifiedNotificationDO extends BaseDO { private String statisticAmount; @TableField(exist = false) private List fileUrlList; + @TableField(exist = false) + private Integer isRepre; + @TableField(exist = false) + private Integer isQua; public boolean canSave(){ return UnqualifiedNotificationStatusEnum.SAVE.getCode() == this.notificationStatus.intValue(); } 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 64a9eec..2fccabb 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 @@ -21,6 +21,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.util.StringUtils; import java.util.List; +import java.util.Map; /** * 品质异常通知单审核 Mapper @@ -72,6 +73,8 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX +