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 278bb53..4cb4b92 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 @@ -122,7 +122,15 @@ public class UnqualifiedNotificationController { unqualifiedNotificationService.operate(operateReqVO); return success(operateReqVO.getId()); } - + @PostMapping("/operateWx") + @Operation(summary = "操作更新品质异常通知单") + @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:update')") + @OperateLog(enable = false) + @Transactional(rollbackFor = Exception.class) + public CommonResult operateWx(@Valid @RequestBody UnqualifiedNotificationSaveReqVO operateReqVO) { + unqualifiedNotificationService.operateWx(operateReqVO); + return success(operateReqVO.getId()); + } @DeleteMapping("/delete") @Operation(summary = "删除品质异常通知单审核") @Parameter(name = "id", description = "编号", required = true) @@ -167,21 +175,28 @@ public class UnqualifiedNotificationController { @PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')") public CommonResult> getUnqualifiedNotificationPageWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) { int i = pageReqVO.getPageNo() * pageReqVO.getPageSize(); + if (pageReqVO.getPageNo() == 1) i = 0; pageReqVO.setPageNum(i); PageResult unqualifiedNotificationPage = unqualifiedNotificationService.getUnqualifiedNotificationPageWx(pageReqVO); -// List list = unqualifiedNotificationPage.getList(); -// if(CollUtil.isNotEmpty(list)){ -// for (UnqualifiedNotificationDO unqualifiedNotificationDO : list) { -// List fileUrlList = new ArrayList<>(); -// List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),0); -// if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ -// for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { -// fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); -// } -// unqualifiedNotificationDO.setFileUrlList(fileUrlList); -// } -// } -// } + List list = unqualifiedNotificationPage.getList(); + if(CollUtil.isNotEmpty(list)){ + for (UnqualifiedNotificationDO unqualifiedNotificationDO : list) { + List fileUrlList = new ArrayList<>(); + Integer type = 0; + if (unqualifiedNotificationDO.getTypeName().equals("过程检")){ + type = 2; + }else if (unqualifiedNotificationDO.getTypeName().equals("终检")){ + type = 1; + } + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),type); + if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ + for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { + fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); + } + unqualifiedNotificationDO.setFileUrlList(fileUrlList); + } + } + } return success(unqualifiedNotificationPage); } 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 b6704cf..54b50f4 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 @@ -57,6 +57,6 @@ public interface UnqualifiedNotificationService { PageResult getUnqualifiedNotificationPageWx(UnqualifiedNotificationPageReqVO pageReqVO); void operate(UnqualifiedNotificationSaveReqVO operateReqVO); - + void operateWx(UnqualifiedNotificationSaveReqVO operateReqVO); 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 b2f911c..5546b67 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 @@ -254,7 +254,39 @@ try { } } } - + @Override + public void operateWx(UnqualifiedNotificationSaveReqVO operateReqVO) { + if(operateReqVO.getId() == null){ + createUnqualifiedNotification(operateReqVO); + }else{ + if (operateReqVO.getType().equals("过程检")){ + //过程检 + BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectById(operateReqVO.getId()); + bgMasterLineDO.setNotificationStatus(3); + bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); + bgMasterLineDO.setAudit_time(LocalDateTime.now()); + bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); + bgMasterLineDO.setConStatus(2); + bgMasterLineMapper.updateById(bgMasterLineDO); + }else { + //终检 + ZjBgMasterLineDO bgMasterLineDO = zjBgMasterLineMapper.selectById(operateReqVO.getId()); + bgMasterLineDO.setNotificationStatus(3); + bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); + bgMasterLineDO.setAudit_time(LocalDateTime.now()); + bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); + bgMasterLineDO.setConStatus(2); + zjBgMasterLineMapper.updateById(bgMasterLineDO); + } +// if(operateReqVO.getActive().equals("AUDIT")){ +// //质检预警 +// bdgzsomthingDO abc= new bdgzsomthingDO(); +// abc.setThingname("质检通知单"); +// abc.setAttr3(operateReqVO.getCode());//改成单独查询的 +// bdgzsomthingMapper.updateok(abc); +// } + } + } @Override public PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java index 2d7c73d..a7edf61 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjbgmasterline/ZjBgMasterLineServiceImpl.java @@ -225,7 +225,7 @@ public class ZjBgMasterLineServiceImpl implements ZjBgMasterLineService { if(CollUtil.isNotEmpty(list)){ for (ZjBgMasterLineDO bgMasterLineDO : list) { List fileUrlList = new ArrayList<>(); - List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(bgMasterLineDO.getId(),1); + List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(bgMasterLineDO.getId(),2); if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) { fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl()); 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 4dec957..040e979 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 @@ -121,7 +121,7 @@ LEFT JOIN base_procedure pr1 ON pr1.id = g.procedure_id left join system_users u on u.id = t.bg_user left join system_users u2 on u2.id = t.auditor WHERE t.deleted = 0 AND t.tenant_id = 2 AND g.deleted = 0 AND g.tenant_id = 2 - AND pr1.deleted = 0 AND pr1.tenant_id = 2 + AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND t.notification_status = #{queryType} UNION ALL @@ -135,7 +135,7 @@ FROM quality_zj_bg_master_line zj LEFT JOIN quality_zj_pg_master_line g1 ON zj.zj_mx_id = g1.id left join system_users u1 on u1.id = zj.bg_user left join system_users u3 on u3.id = zj.auditor - WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 + WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 AND zj.notification_status = #{queryType} ) gh @@ -157,7 +157,7 @@ LEFT JOIN quality_pg_master_line g ON t.zj_mx_id = g.id LEFT JOIN base_procedure pr1 ON pr1.id = g.procedure_id left join system_users u on u.id = t.bg_user left join system_users u2 on u2.id = t.auditor - WHERE t.deleted = 0 AND t.tenant_id = 2 AND g.deleted = 0 AND g.tenant_id = 2 + WHERE t.deleted = 0 AND t.tenant_id = 2 AND g.deleted = 0 AND g.tenant_id = 2 and t.is_qua = 1 AND pr1.deleted = 0 AND pr1.tenant_id = 2 UNION ALL @@ -169,7 +169,7 @@ zj.audit_time as auditTime,zj.is_repre as isRepre,zj.is_qua as isQua,zj.notification_status as notificationStatus, zj.remark as remark ,'' as materialName, '' as blueprintNo, '' as procedureName FROM quality_zj_bg_master_line zj - LEFT JOIN quality_zj_pg_master_line g1 ON zj.zj_mx_id = g1.id + LEFT JOIN quality_zj_pg_master_line g1 ON zj.zj_mx_id = g1.id and zj.is_qua = 1 left join system_users u1 on u1.id = zj.bg_user left join system_users u3 on u3.id = zj.auditor WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 ) gh @@ -189,12 +189,13 @@ g.project_name as projectName ,u2.nickname as auditorName,t.audit_opinion as auditOpinion, t.audit_time as auditTime,t.is_repre as isRepre,t.is_qua as isQua,t.notification_status as notificationStatus, t.remark as remark, g.material_name as materialName,g.blueprint_no as blueprintNo, pr1.name as procedureName + FROM quality_bg_master_line t LEFT JOIN quality_pg_master_line g ON t.zj_mx_id = g.id LEFT JOIN base_procedure pr1 ON pr1.id = g.procedure_id left join system_users u on u.id = t.bg_user left join system_users u2 on u2.id = t.auditor WHERE t.deleted = 0 AND t.tenant_id = 2 AND g.deleted = 0 AND g.tenant_id = 2 - AND pr1.deleted = 0 AND pr1.tenant_id = 2 + AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND t.notification_status = #{queryType} UNION ALL @@ -208,7 +209,7 @@ FROM quality_zj_bg_master_line zj LEFT JOIN quality_zj_pg_master_line g1 ON zj.zj_mx_id = g1.id left join system_users u1 on u1.id = zj.bg_user left join system_users u3 on u3.id = zj.auditor - WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 + WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 AND zj.notification_status = #{queryType} ) gh ORDER BY gh.createTime DESC LIMIT #{offset}, #{limit} diff --git a/mes-ui/mini-app/src/pages.json b/mes-ui/mini-app/src/pages.json index ea018dc..eb2862d 100644 --- a/mes-ui/mini-app/src/pages.json +++ b/mes-ui/mini-app/src/pages.json @@ -102,12 +102,6 @@ "navigationBarTitleText": "过程检报工" } }, - { - "path": "pages/pgMaster/components/showpicture", - "style": { - "navigationBarTitleText": "过程检图片" - } - }, { "path": "pages/pgMaster/pgMaster-detail", "style": { diff --git a/mes-ui/mini-app/src/pages/pgMaster/components/showpicture.vue b/mes-ui/mini-app/src/pages/pgMaster/components/showpicture.vue deleted file mode 100644 index 5b9dbf9..0000000 --- a/mes-ui/mini-app/src/pages/pgMaster/components/showpicture.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - - 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 e508903..0ee810e 100644 --- a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue +++ b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue @@ -412,7 +412,7 @@ id: detailId.value, Authorization: token, 'Tenant-Id': 2, - 'type':2, + 'type':1, }, success: async (uploadFileRes) => { uni.hideLoading(); @@ -498,7 +498,7 @@ - 生产完成 + 质检完成 @@ -529,10 +529,10 @@ {{ item.amount }} - + 是否复检: - {{ item.isRepre == 0 ? '是':'否' }} + {{ item.isRepre == 1 ? '是':'否' }} 是否合格: diff --git a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue index a1fe53f..c9cb719 100644 --- a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue +++ b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue @@ -281,7 +281,7 @@ @click="handleComplate"> - 生产完成 + 质检结束 diff --git a/mes-ui/mini-app/src/pages/unqualifiedNotification/components/dataItem.vue b/mes-ui/mini-app/src/pages/unqualifiedNotification/components/dataItem.vue index a220201..b1d2ff2 100644 --- a/mes-ui/mini-app/src/pages/unqualifiedNotification/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/unqualifiedNotification/components/dataItem.vue @@ -123,10 +123,13 @@ const handleDetail = (item) => { - + 检验单据: (单号:{{ item.code }}) + + {{ statusText }} + @@ -183,7 +186,7 @@ const handleDetail = (item) => { {{ item.remark }} --> - + 审核人:{{ item.auditorName }} @@ -194,7 +197,6 @@ const handleDetail = (item) => { - {{ statusText }} @@ -229,6 +231,20 @@ const handleDetail = (item) => { font-size: 28rpx; color: #737D88; } + .statusLabelzf { + font-size: 24rpx; + position: absolute; + right: 30rpx; + top: 15rpx; + border-radius: 10rpx; + font-size: 24rpx; + padding: 10rpx 30rpx; + border-radius: 10rpx; + font-size: 24rpx; + background: linear-gradient(149deg, #2DACE6 4%, #356899 98%); + color: #fff; + + } } .md { diff --git a/mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue b/mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue index 6eb0a70..010a8fa 100644 --- a/mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue +++ b/mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue @@ -3,7 +3,7 @@ import { formatDate } from '@/utils/index' import { onLoad, onShow } from '@dcloudio/uni-app' import { useLoginStore } from '@/stores/modules/login' - import { getNotificationDetailAPI } from '@/services/unqualifiedNotification' + import { getNotificationDetailAPI,operateWx } from '@/services/unqualifiedNotification' import { serviceDomain } from '@/services/constants' const popup = ref() const userStore = useLoginStore() @@ -147,8 +147,17 @@ // 提交报工 const submitForm = async (active) => { try { - - + const params = { + id: detailInfo.value?.id, + type: typeName.value, + auditOpinion: active, + auditor: userId, + projectId: 0, + projectSubId:0, + status: 1, + notificationStatus:3 + } + await operateWx(params); } catch (error) { uni.showToast({ icon: 'none', @@ -161,11 +170,11 @@ // uni.redirectTo({ // url, // }) - // const pages = getCurrentPages(); // 获取当前页面栈 - // await initPage(); - // const currentPage = pages[pages.length - 1]; // 当前页面 - // const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`; - // uni.reLaunch({ url }); // 重新加载当前页面 + const pages = getCurrentPages(); // 获取当前页面栈 + await initPage(); + const currentPage = pages[pages.length - 1]; // 当前页面 + const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`; + uni.reLaunch({ url }); // 重新加载当前页面 } @@ -190,8 +199,8 @@ 检验单据:{{detailInfo.code}} - {{ - detailInfo.notificationStatus == 1 ? '未审核' : '已审核' }} + {{ + detailInfo.notificationStatus == 2 ? '未审核' : '已审核' }} 项目:{{detailInfo.projectName}} 子项目:{{ detailInfo.projectSubCode || '' }} @@ -250,10 +259,10 @@ - - 报废 - 返修 - 让步接收 + + 报废 + 返修 + 让步接收 @@ -265,7 +274,20 @@ .data-detail { border-radius: 10rpx; padding-bottom: 200rpx; +.statusLabelzf { + font-size: 24rpx; + position: absolute; + right: 30rpx; + top: 15rpx; + border-radius: 10rpx; + font-size: 24rpx; + padding: 10rpx 30rpx; + border-radius: 10rpx; + font-size: 24rpx; + background: linear-gradient(149deg, #ffff00 4%, #cfcf00 98%); + color: #fff; + } .module { background: linear-gradient(178deg, #356899 7%, #356899 57%, #F4F6F9 94%); padding: 20rpx; diff --git a/mes-ui/mini-app/src/pages/zjPgMaster/showpicture.vue b/mes-ui/mini-app/src/pages/zjPgMaster/showpicture.vue deleted file mode 100644 index 5b9dbf9..0000000 --- a/mes-ui/mini-app/src/pages/zjPgMaster/showpicture.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - - diff --git a/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue b/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue index c5ebeff..d590b09 100644 --- a/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue +++ b/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue @@ -474,7 +474,7 @@ @click="handleComplate"> - 生产完成 + 质检结束 diff --git a/mes-ui/mini-app/src/services/unqualifiedNotification.ts b/mes-ui/mini-app/src/services/unqualifiedNotification.ts index a909e16..c89b948 100644 --- a/mes-ui/mini-app/src/services/unqualifiedNotification.ts +++ b/mes-ui/mini-app/src/services/unqualifiedNotification.ts @@ -24,7 +24,13 @@ export const getNotificationDetailAPI = (data: Object) => { data, }) } - +export const operateWx = (data: Object) => { + return http({ + method: 'POST', + url: '/heli/unqualified-notification/operateWx', + data, + }) +} // 获取零件分页 export const getBomPageAPI = (data: Object) => { return http({ diff --git a/mes-ui/mini-app/src/static/images/unqualifiedNotification.jpeg b/mes-ui/mini-app/src/static/images/unqualifiedNotification.jpeg deleted file mode 100644 index db54d5a..0000000 Binary files a/mes-ui/mini-app/src/static/images/unqualifiedNotification.jpeg and /dev/null differ