Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ximai
mes
Commits
440b25d6
Commit
440b25d6
authored
Sep 29, 2025
by
温志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改查询BUG
parent
938339c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
ProFeedbackController.java
...a/com/ximai/mes/pro/controller/ProFeedbackController.java
+2
-2
ProWorkorderMapper.xml
.../resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml
+0
-2
No files found.
mes/src/main/java/com/ximai/mes/pro/controller/ProFeedbackController.java
View file @
440b25d6
...
...
@@ -122,9 +122,9 @@ public class ProFeedbackController extends BaseController {
/**
* 查询生产报工记录列表
*/
@
Ge
tMapping
(
"/list/export"
)
@
Pos
tMapping
(
"/list/export"
)
@ApiOperation
(
"查询生产报工记录列表导出"
)
public
void
listExport
(
HttpServletResponse
response
,
ProFeedbackCheckListDto
proFeedbackCheckListDto
)
{
public
void
listExport
(
HttpServletResponse
response
,
@RequestBody
ProFeedbackCheckListDto
proFeedbackCheckListDto
)
{
ProFeedback
proFeedback
=
new
ProFeedback
();
BeanUtils
.
copyProperties
(
proFeedbackCheckListDto
,
proFeedback
);
QueryWrapper
<
ProFeedback
>
query
=
new
QueryWrapper
<>();
...
...
mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml
View file @
440b25d6
...
...
@@ -265,7 +265,6 @@
pw.in_drawing_no,
pw.erp_create_time,
pw.erp_update_time ,
pw.order_serial,
item.line_name,
SUBSTRING_INDEX(task.task_batch, '-', -1) task_batch,
sum(case task.is_last_process when 0 THEN 0 ELSE fe.quantity_qualify + fe.quantity_unqualify END) as quantity_produced
...
...
@@ -367,7 +366,6 @@
pw.in_drawing_no,
pw.erp_create_time,
pw.erp_update_time,
pw.order_serial,
SUBSTRING_INDEX(task.task_batch, '-', -1) ,
item.line_name
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment