From 6b7fc22801c39a9f9bafd87b122a66861e798f2a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 17 七月 2024 15:28:27 +0800
Subject: [PATCH] 在制品报表不需要根据时间查询
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 11 ++---
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 39 ++-----------------
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 8 ++--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 5 +-
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 6 +--
5 files changed, 16 insertions(+), 53 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index ce80b04..1ffa0fc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -72,24 +72,9 @@
let pageNum = ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
-}
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
+//绗竴娆″姞杞�
let selectProcesses = value.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -113,7 +98,7 @@
optionVal = null
}
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/workInProgress/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
+request.post(`/report/workInProgress/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
if (res.code == 200) {
// total.dataTotal = res.data.total.total*1
@@ -131,8 +116,6 @@
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
let inputVal = form.orderId
if (inputVal == '') {
inputVal = null
@@ -141,7 +124,7 @@
if (optionVal == '') {
optionVal = null
}
- request.post(`/report/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}/${optionVal}`, filterData.value).then((res) => {
+ request.post(`/report/selectReportingWork/${pageNum.value}/${total.pageSize}/${inputVal}/${optionVal}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -156,8 +139,6 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
let selectProcesses = value.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -171,7 +152,7 @@
if (optionVal == '') {
optionVal = null
}
- request.post(`/report/workInProgress/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
+ request.post(`/report/workInProgress/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
if (res.code == 200) {
// total.dataTotal = res.data.total.total*1
@@ -426,19 +407,7 @@
<div class="main-div-customer">
<div id="selectForm">
<el-row :gutter="0">
- <!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
- <!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
- <el-date-picker
- v-model="form.date1"
- :start-placeholder="$t('basicData.startDate')"
- :end-placeholder="$t('basicData.endDate')"
- format="YYYY/MM/DD"
- style="width: 100px"
- type="daterange"
- value-format="YYYY-MM-DD"
- />
-
<el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
<el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 130px"></el-input>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index feb327f..64755cd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -57,16 +57,14 @@
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
@SaCheckPermission("WorkInProgress.search")
- @PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgress/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
@PathVariable String orderId,
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
@RequestBody Report report) {
- return Result.seccess(reportService.workInProgressSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses,optionVal, report));
+ return Result.seccess(reportService.workInProgressSv( orderId, inputProject, selectProcesses,optionVal, report));
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index b868815..5af0105 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -22,7 +22,6 @@
Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
List<Map<String, String>> workInProgressMp(
- @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
@Param("orderId") String orderId, @Param("inputProject") String inputProject,
@Param("selectProcesses") String selectProcesses, Report report);
@@ -69,9 +68,9 @@
Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
- List<Map<String, String>> workInProgressOrderMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
+ List<Map<String, String>> workInProgressOrderMp( String orderId, String inputProject, String selectProcesses, Report report);
- List<Map<String, String>> workInProgressProcessMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
+ List<Map<String, String>> workInProgressProcessMp( String orderId, String inputProject, String selectProcesses, Report report);
List<ScheduleProductionScheduleDTO> scheduleProductionScheduleMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index d1ebdee..9264688 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -125,7 +125,7 @@
return map;
}
- public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
+ public Map<String, Object> workInProgressSv( String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
if ("null".equals(orderId)) {
orderId = "";
@@ -140,16 +140,16 @@
Map<String, Object> map = new HashMap<>();
if (optionVal.equals("1")){
/* 鏍规嵁閿�鍞崟鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressOrderMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressOrderMp( orderId, inputProject, selectProcesses, report));
}else if(optionVal.equals("2")){
/* 鏍规祦绋嬪崱鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressProcessMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressProcessMp( orderId, inputProject, selectProcesses, report));
} else if (optionVal.equals("3")) {
} else {
- map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressMp( orderId, inputProject, selectProcesses, report));
}
map.put("process", productionSchedulingMapper.selectProcess());
return map;
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index d43f483..1a2eebe 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -288,7 +288,7 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where rwk.this_process = #{selectProcesses}
- and rw.review_status = 1
+ and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
@@ -299,7 +299,6 @@
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
- and o.create_time between #{selectTime1} and #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -990,7 +989,7 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where rwk.this_process = #{process}
- and rw.review_status = 1
+ and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
@@ -1315,7 +1314,7 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where rwk.this_process = #{selectProcesses}
- and rw.review_status = 1
+ and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
@@ -1326,7 +1325,6 @@
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
- and o.create_time between #{selectTime1} and #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -1377,7 +1375,7 @@
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
where rwk.this_process = #{selectProcesses}
- and rw.review_status = 1
+ and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
and c.order_sort = fc.order_number
@@ -1388,7 +1386,6 @@
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
- and o.create_time between #{selectTime1} and #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
--
Gitblit v1.8.0