From 3067d24d5f5d20b5c69e626169227a07e1bf1f49 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 23 四月 2025 09:46:29 +0800
Subject: [PATCH] 提交 app质检审核查询部分代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 8 ++++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 7 +++++++
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 2 +-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 2 ++
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 28 ++++++++++++++++++++++++++++
5 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 7eb9d2e..283f230 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -897,7 +897,7 @@
//鏆傛椂鍙栨秷
for(let item of uniqueByOrderNum){
if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
- ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
+ ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}:
${item.order_number}
${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
return false
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index d95c542..8b732fc 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -111,6 +111,13 @@
}
+ @ApiOperation("APP璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("qualityInspectionReview.search")
+ @PostMapping ("qualityReviewSearch")
+ public Result qualityReviewSearch(){
+ return Result.seccess(reportingWorkService.qualityReviewSearchSv());
+ }
+
@ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
@SaCheckPermission("qualityInspectionReview.review")
@PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}")
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 44c7639..64d0bbd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -104,4 +104,6 @@
Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
Integer selectReviewedState(String reportingWorkId);
+
+ List<ReportingWork> qualityReviewSearchMp();
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 244e135..14c1e58 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -685,6 +685,12 @@
return map;
}
+ public Map<String, Object> qualityReviewSearchSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportingWorkMapper.qualityReviewSearchMp());
+ return map;
+ }
+
//淇敼璐ㄦ瀹℃牳鐘舵��
public Boolean updateQualityStatusSv(String reportingWorkId, String username) {
if (!reportingWorkId.isEmpty()) {
@@ -1189,4 +1195,6 @@
return result;
}
+
+
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 91b3660..65b97f4 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -1066,4 +1066,32 @@
<select id="selectReviewedState">
select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId};
</select>
+
+ <select id="qualityReviewSearchMp">
+ select rw.reporting_work_id,
+ rw.reporting_work_time,
+ rw.process_id,
+ o.project,
+ o.customer_name,
+ rw.this_process,
+ ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
+ rw.this_worn_quantity,
+ rw.teams_groups_name,
+ rw.device_name,
+ rw.previous_process,
+ rw.next_process,
+ rw.quality_inspector,
+ rw.quality_ins_time,
+ dd.quality_ins_status
+ from sd.order as o
+ left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
+ left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
+
+ right join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
+ where rw.reviewed_state != 2
+ and dd.quality_ins_status = 1
+ and rw.reviewed_state!=-1
+ GROUP BY rw.reporting_work_id
+ ORDER BY rw.reporting_work_id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0