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
eb3e9183
Commit
eb3e9183
authored
Oct 26, 2024
by
李驰骋
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
6b963db9
26efc0a4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
ProWorkorderController.java
...s/pro/controller/proWorkOrder/ProWorkorderController.java
+1
-0
No files found.
mes/src/main/java/com/ximai/mes/pro/controller/proWorkOrder/ProWorkorderController.java
View file @
eb3e9183
...
@@ -120,6 +120,7 @@ public class ProWorkorderController extends BaseController {
...
@@ -120,6 +120,7 @@ public class ProWorkorderController extends BaseController {
query
.
in
(
StringUtils
.
isNotEmpty
(
proWorkorder
.
getStatusArr
()),
"t1.status"
,
query
.
in
(
StringUtils
.
isNotEmpty
(
proWorkorder
.
getStatusArr
()),
"t1.status"
,
new
String
[]{
WorkorderStatusEnum
.
PREPARE
.
getValue
(),
WorkorderStatusEnum
.
PUBLISHED
.
getValue
()});
new
String
[]{
WorkorderStatusEnum
.
PREPARE
.
getValue
(),
WorkorderStatusEnum
.
PUBLISHED
.
getValue
()});
query
.
gt
(
"t1.quantity-t1.quantity_scheduled"
,
0
);
query
.
gt
(
"t1.quantity-t1.quantity_scheduled"
,
0
);
query
.
orderByDesc
(
"request_date"
);
List
<
ProWorkorder
>
list
=
proWorkorderService
.
selectListByQw
(
query
);
List
<
ProWorkorder
>
list
=
proWorkorderService
.
selectListByQw
(
query
);
return
getDataTable
(
list
);
return
getDataTable
(
list
);
}
}
...
...
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