明树Git Lab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
L
letian_backend
Project
Project
Details
Activity
Releases
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
zengfanpei
letian_backend
Commits
62c6cd3e
Commit
62c6cd3e
authored
Mar 14, 2025
by
zfp1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
6de1d171
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
19 deletions
+16
-19
packMatInListController.js
controller/packMatInListController.js
+4
-4
packMatOutListController.js
controller/packMatOutListController.js
+4
-7
rawMatProlistController.js
controller/rawMatProlistController.js
+4
-4
rawMatReqlistController.js
controller/rawMatReqlistController.js
+4
-4
No files found.
controller/packMatInListController.js
View file @
62c6cd3e
...
@@ -107,12 +107,12 @@ async function exportExcel(req, res, next) {
...
@@ -107,12 +107,12 @@ async function exportExcel(req, res, next) {
search
.
name
=
{
$regex
:
req
.
body
.
name
};
search
.
name
=
{
$regex
:
req
.
body
.
name
};
}
}
if
(
req
.
body
.
startTime
)
{
if
(
req
.
body
.
startTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
indate
=
search
.
indat
e
||
{};
search
.
tim
e
.
$gte
=
req
.
body
.
startTime
;
search
.
indat
e
.
$gte
=
req
.
body
.
startTime
;
}
}
if
(
req
.
body
.
endTime
)
{
if
(
req
.
body
.
endTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
indate
=
search
.
indat
e
||
{};
search
.
tim
e
.
$lte
=
req
.
body
.
endTime
search
.
indat
e
.
$lte
=
req
.
body
.
endTime
}
}
let
ret
=
await
DB
.
ExcelRecord
.
create
({
let
ret
=
await
DB
.
ExcelRecord
.
create
({
creator
:
req
.
user
.
_id
,
creator
:
req
.
user
.
_id
,
...
...
controller/packMatOutListController.js
View file @
62c6cd3e
...
@@ -103,19 +103,16 @@ async function importExcel(req, res, next) {
...
@@ -103,19 +103,16 @@ async function importExcel(req, res, next) {
async
function
exportExcel
(
req
,
res
,
next
)
{
async
function
exportExcel
(
req
,
res
,
next
)
{
try
{
try
{
let
search
=
{
del
:
0
};
let
search
=
{
del
:
0
};
if
(
req
.
body
.
agrProName
)
{
search
.
agrProName
=
{
$regex
:
req
.
body
.
agrProName
};
}
if
(
req
.
body
.
name
)
{
if
(
req
.
body
.
name
)
{
search
.
name
=
{
$regex
:
req
.
body
.
name
};
search
.
name
=
{
$regex
:
req
.
body
.
name
};
}
}
if
(
req
.
body
.
startTime
)
{
if
(
req
.
body
.
startTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
outdate
=
search
.
outdat
e
||
{};
search
.
tim
e
.
$gte
=
req
.
body
.
startTime
;
search
.
outdat
e
.
$gte
=
req
.
body
.
startTime
;
}
}
if
(
req
.
body
.
endTime
)
{
if
(
req
.
body
.
endTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
outdate
=
search
.
outdat
e
||
{};
search
.
tim
e
.
$lte
=
req
.
body
.
endTime
search
.
outdat
e
.
$lte
=
req
.
body
.
endTime
}
}
let
ret
=
await
DB
.
ExcelRecord
.
create
({
let
ret
=
await
DB
.
ExcelRecord
.
create
({
creator
:
req
.
user
.
_id
,
creator
:
req
.
user
.
_id
,
...
...
controller/rawMatProlistController.js
View file @
62c6cd3e
...
@@ -109,12 +109,12 @@ async function exportExcel(req, res, next) {
...
@@ -109,12 +109,12 @@ async function exportExcel(req, res, next) {
search
.
name
=
{
$regex
:
req
.
body
.
name
};
search
.
name
=
{
$regex
:
req
.
body
.
name
};
}
}
if
(
req
.
body
.
startTime
)
{
if
(
req
.
body
.
startTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
indate
=
search
.
indat
e
||
{};
search
.
tim
e
.
$gte
=
req
.
body
.
startTime
;
search
.
indat
e
.
$gte
=
req
.
body
.
startTime
;
}
}
if
(
req
.
body
.
endTime
)
{
if
(
req
.
body
.
endTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
indate
=
search
.
indat
e
||
{};
search
.
tim
e
.
$lte
=
req
.
body
.
endTime
search
.
indat
e
.
$lte
=
req
.
body
.
endTime
}
}
let
ret
=
await
DB
.
ExcelRecord
.
create
({
let
ret
=
await
DB
.
ExcelRecord
.
create
({
creator
:
req
.
user
.
_id
,
creator
:
req
.
user
.
_id
,
...
...
controller/rawMatReqlistController.js
View file @
62c6cd3e
...
@@ -108,12 +108,12 @@ async function exportExcel(req, res, next) {
...
@@ -108,12 +108,12 @@ async function exportExcel(req, res, next) {
search
.
name
=
{
$regex
:
req
.
body
.
name
};
search
.
name
=
{
$regex
:
req
.
body
.
name
};
}
}
if
(
req
.
body
.
startTime
)
{
if
(
req
.
body
.
startTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
outdate
=
search
.
outdat
e
||
{};
search
.
tim
e
.
$gte
=
req
.
body
.
startTime
;
search
.
outdat
e
.
$gte
=
req
.
body
.
startTime
;
}
}
if
(
req
.
body
.
endTime
)
{
if
(
req
.
body
.
endTime
)
{
search
.
time
=
search
.
tim
e
||
{};
search
.
outdate
=
search
.
outdat
e
||
{};
search
.
tim
e
.
$lte
=
req
.
body
.
endTime
search
.
outdat
e
.
$lte
=
req
.
body
.
endTime
}
}
let
ret
=
await
DB
.
ExcelRecord
.
create
({
let
ret
=
await
DB
.
ExcelRecord
.
create
({
creator
:
req
.
user
.
_id
,
creator
:
req
.
user
.
_id
,
...
...
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