licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

品质异常审核

Browse Source
This commit is contained in:
Ledo 2025-07-11 13:57:06 +08:00
parent e8c40da222
commit d00cf61c1d
12 changed files with 131 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java
View File

@ -174,8 +174,7 @@ public class UnqualifiedNotificationController {
@Operation(summary = "获得品质异常通知单审核分页")
@PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')")
public CommonResult<PageResult<UnqualifiedNotificationDO>> getUnqualifiedNotificationPageWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) {
int i = pageReqVO.getPageNo() * pageReqVO.getPageSize();
if (pageReqVO.getPageNo() == 1) i = 0;
int i = (pageReqVO.getPageNo()-1) * pageReqVO.getPageSize();
pageReqVO.setPageNum(i);
PageResult<UnqualifiedNotificationDO> unqualifiedNotificationPage = unqualifiedNotificationService.getUnqualifiedNotificationPageWx(pageReqVO);
List<UnqualifiedNotificationDO> list = unqualifiedNotificationPage.getList();
@ -200,12 +199,32 @@ public class UnqualifiedNotificationController {
return success(unqualifiedNotificationPage);
}
@GetMapping("/countWx")
@Operation(summary = "获得品质异常通知单审核分页")
@PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')")
public CommonResult<Long> countWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) {
return success(unqualifiedNotificationService.countWx(pageReqVO));
}
@GetMapping("/detailWx")
@Operation(summary = "获得品质异常通知单审核分页")
@PreAuthorize("@ss.hasPermission('heli:unqualified-notification:query')")
public CommonResult<UnqualifiedNotificationDO> detailWx(@Valid UnqualifiedNotificationPageReqVO pageReqVO) {
return success(unqualifiedNotificationService.getUnqualifiedNotificationWxById(pageReqVO));
UnqualifiedNotificationDO unqualifiedNotificationDO = unqualifiedNotificationService.getUnqualifiedNotificationWxById(pageReqVO);
List<String> fileUrlList = new ArrayList<>();
Integer type = 0;
if (unqualifiedNotificationDO.getTypeName().equals("过程检")){
type = 2;
}else if (unqualifiedNotificationDO.getTypeName().equals("终检")){
type = 1;
}
List<UnqualifiedNotificationFileDO> unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),type);
if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){
for (UnqualifiedNotificationFileDO unqualifiedNotificationFileDO : unqualifiedNotificationFileDOS) {
fileUrlList.add(unqualifiedNotificationFileDO.getFileUrl());
}
unqualifiedNotificationDO.setFileUrlList(fileUrlList);
}
return success(unqualifiedNotificationDO);
}
@GetMapping("/export-excel")

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationService.java
View File

@ -46,7 +46,7 @@ public interface UnqualifiedNotificationService {
* @return 品质异常通知单审核
*/
UnqualifiedNotificationDO getUnqualifiedNotification(Long id);
Long countWx(@Valid UnqualifiedNotificationPageReqVO updateReqVO);
/**
* 获得品质异常通知单审核分页
*

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java
View File

@ -240,6 +240,11 @@ try {
return pageResult;
}
@Override
public Long countWx(UnqualifiedNotificationPageReqVO pageReqVO) {
PageResult<UnqualifiedNotificationDO> pageResult = new PageResult<>();
return unqualifiedNotificationMapper.selectCountPageWx(2, 5,5);
}
@Override
public void operate(UnqualifiedNotificationSaveReqVO operateReqVO) {
if(operateReqVO.getId() == null){
createUnqualifiedNotification(operateReqVO);

2
mes-ui/mini-app/src/manifest.json
View File

@ -106,7 +106,7 @@
},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wxa29fe397274614b5",
"appid" : "wx48fad418e2753b1c",
"setting" : {
"minified" : true,
"urlCheck" : true,

9
mes-ui/mini-app/src/pages/index/index.vue
View File

@ -111,6 +111,7 @@ const getHomeCategory = async () => {
const unReadCount = await getUnreadMessage();
const count = await countReview();
const unqualifiedNotificationCount = await countUnqualifiedNotification(query);
// 把未读数放到消息通知项
const cgdsp = categoryList.value.find(
(e) => e.path === "cgdsp"
@ -118,6 +119,9 @@ const getHomeCategory = async () => {
const msgItem = categoryList.value.find(
(e) => e.path === "messageNotification"
);
const unqualifiedNotificationItem = categoryList.value.find(
(e) => e.path === "unqualifiedNotification"
);
if (cgdsp){
cgdsp.unReadCount = count;
// cgdsp.auth=true
@ -126,6 +130,11 @@ const getHomeCategory = async () => {
msgItem.unReadCount = unReadCount;
// msgItem.auth=true
}
if(unqualifiedNotificationItem){
unqualifiedNotificationItem.unReadCount = unqualifiedNotificationCount
}
if (loginStore.userInfo.userId) {
const obj = {
...loginStore.userInfo,

8
mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue
View File

@ -147,7 +147,7 @@
// uni.redirectTo({
// url,
// })
await initPage();
const pages = getCurrentPages(); // 获取当前页面栈
const currentPage = pages[pages.length - 1]; // 当前页面
const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
@ -200,8 +200,8 @@
if (isQua.value == 1) {
await imgUpload()
}
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 }); // 重新加载当前页面
@ -223,8 +223,8 @@
if (isQua.value == 1) {
await imgUpload()
}
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 }); // 重新加载当前页面
@ -292,8 +292,6 @@
})
} finally {
isLoading.value = false
await initPage()
const pages = getCurrentPages(); // 获取当前页面栈
const currentPage = pages[pages.length - 1]; // 当前页面
const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;

11
mes-ui/mini-app/src/pages/unqualifiedNotification/components/dataItem.vue
View File

@ -127,7 +127,7 @@ const handleDetail = (item) => {
<view class="hd">
<view class="num">检验单据：</view>
<view class="statusLabel">（单号：{{ item.code }}）</view>
<view class="statusLabelzf" @click="handleDetail(item)" >
<view class="statusLabelzf" >
{{ statusText }}
</view>
</view>
@ -136,7 +136,14 @@ const handleDetail = (item) => {
<view class="product-item">项目：<text class="blue">{{ item.projectName}}</text>
</view>
<view class="product-item">通知日期：<text class="">{{ item.createTime }}</text></view>
<view class="product-row" v-if="item.typeName == '过程检'">
<view class="row-item">
<view class="label">零件名称：<text class="blue">{{ item.materialName }}</text></view>
</view>
<view class="row-item">
<view class="label">工序：<text class="blue">{{ item.procedureName }}</text></view>
</view>
</view>
<view class="product-row">
<view class="row-item">
<view class="label">质检员：<text class="blue">{{ item.creatorName }}</text></view>

64
mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification-detail.vue
View File

@ -143,8 +143,25 @@
uni.reLaunch({ url }); // 重新加载当前页面
}
}
const range = [
{ value: 1, text: "返修" },
{ value: 2, text: "让步接收" },
{ value: 3, text: "报废" },
]
// 提交报工
const handleOk = async() =>{
if(detailInfo.value.auditOpinion){
await submitForm(detailInfo.value.auditOpinion);
}else{
uni.showToast({
icon: 'none',
duration: 3000,
title: '请选择审核意见后提交',
})
return;
}
}
const submitForm = async (active) => {
try {
const params = {
@ -187,7 +204,9 @@
await getDetailData(idValue.value, typeName.value)
}
const audit = ()=>{
popup.value.open()
}
const detailId = ref()
</script>
@ -207,6 +226,14 @@
{{' ' + detailInfo.projectSubName }}
</view>
<view class="product-item">通知日期：{{detailInfo.createTime}}</view>
<view class="product-row" v-if="detailInfo.typeName == '过程检'">
<view class="row-item">
<view class="label">零件名称：<text class="blue">{{ detailInfo.materialName }}</text></view>
</view>
<view class="row-item">
<view class="label">工序：<text class="blue">{{ detailInfo.procedureName }}</text></view>
</view>
</view>
<view class="product-row">
<view class="row-item">
<view class="label">质检员：<text class="blue">{{ detailInfo.creatorName }}</text></view>
@ -260,11 +287,36 @@
</view>
</view>
<view class="action" v-if="detailInfo.notificationStatus !== 3">
<view class="action-item danger" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(3)">报废</view>
<!-- <view class="action-item info" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(3)">报废</view>
<view class="action-item start" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(1)">返修</view>
<view class="action-item stop" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(2)">让步接收</view>
<view class="action-item stop" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(2)">让步接收</view> -->
<view class="action-item info" v-if="detailInfo.notificationStatus !== 3" @click="cancel()">取消</view>
<view class="action-item start" v-if="detailInfo.notificationStatus !== 3" @click="audit()">审核</view>
<!-- <view class="action-item stop" v-if="detailInfo.notificationStatus !== 3" @click="submitForm(2)">让步接收</view> -->
</view>
<uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<view class="title">
<view class="text">审核信息</view>
<!-- <view class="close" @click="handleClose">X</view> -->
</view>
<scroll-view scroll-y="true" style="height: 100%;">
<view class="cont">
<view class="item">
<view class="label"><span class="star">*</span>审核意见：</view>
<uni-data-select
v-model="detailInfo.auditOpinion"
:localdata="range"
></uni-data-select>
</view>
</view>
</scroll-view>
<view class="ok" @click="handleOk">确定</view>
</uni-popup>
</template>
</view>
@ -513,7 +565,9 @@
width: 272rpx;
height: 86rpx;
border-radius: 24rpx;
&.info {
background: linear-gradient(157deg, #A9A9A9 -3%, #A9A9A9 90%);
}
&.start {
background: linear-gradient(157deg, #2EACE6 -3%, #356899 90%);
}

3
mes-ui/mini-app/src/pages/unqualifiedNotification/unqualifiedNotification.vue
View File

@ -77,9 +77,6 @@ const handlePopClose = (flag) => {
<dataItem ref="childRef" v-if="item.isRender" :order-state="item.orderState" />
</swiper-item>
</swiper>
<!-- <view class="float-btn" :style="{bottom: btnTop + 'px', right: btnLeft + 'px'}" @click="handleAdd">
<image class="add" src="/static/images/unqualifiedNotification-add.png" mode="scaleToFill" />
</view> -->
<!-- uni-ui 弹出层 -->
<uni-popup ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<detailPanel v-if="isShowPop" @close="handlePopClose" />

14
mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue
View File

@ -147,7 +147,7 @@
// uni.redirectTo({
// url,
// })
await initPage();
const pages = getCurrentPages(); // 获取当前页面栈
const currentPage = pages[pages.length - 1]; // 当前页面
const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
@ -194,8 +194,8 @@
if (isQua.value == 1) {
await imgUpload()
}
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 }); // 重新加载当前页面
@ -217,8 +217,8 @@
if (isQua.value == 1) {
await imgUpload()
}
const pages = getCurrentPages(); // 获取当前页面栈
await initPage();
const pages = getCurrentPages(); // 获取当前页面栈
const currentPage = pages[pages.length - 1]; // 当前页面
const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
uni.reLaunch({ url }); // 重新加载当前页面
@ -287,7 +287,7 @@
})
} finally {
isLoading.value = false
await initPage()
const pages = getCurrentPages(); // 获取当前页面栈
const currentPage = pages[pages.length - 1]; // 当前页面
@ -396,7 +396,6 @@
icon: 'none', // 显示纯文本时icon设为none
duration: 2000
});
await initPage()
popup.value.close();
},
@ -408,7 +407,6 @@
icon: 'none', // 显示纯文本时icon设为none
duration: 2000
});
await initPage()
},
complete: () => {
uni.hideLoading();
@ -505,10 +503,10 @@
<view class="val high-color">{{ item.amount }}</view>
</view>
</view>
<view class="product-row">
<view v-if="item.workTime" class="product-row">
<view class="row-item">
<view class="label">是否复检：</view>
<view class="val high-color">{{ item.isRepre == 0 ? '是':'否' }}</view>
<view class="val high-color">{{ item.isRepre == 1? '是':'否' }}</view>
</view>
<view class="row-item">
<view class="label">是否合格：</view>

8
mes-ui/mini-app/src/services/home.ts
View File

@ -17,7 +17,13 @@ export const getHomeCategoryAPI = () => {
url: '/system/auth/get-permission-info',
})
}
export const countUnqualifiedNotification = (data: Object) => {
return http<any[]>({
method: 'GET',
url: '/heli/unqualified-notification/countWx',
data,
})
}
export const getUnreadMessage = () => {
return http<CategoryItem[]>({
method: 'GET',

3
mes-ui/mini-app/src/services/unqualifiedNotification.ts
View File

@ -31,6 +31,9 @@ export const operateWx = (data: Object) => {
data,
})
}
// 获取零件分页
export const getBomPageAPI = (data: Object) => {
return http<any[]>({