Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-center-auto
Overview
Overview
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
bltdc
data-center-auto
Commits
049dc0cc
Commit
049dc0cc
authored
Feb 19, 2021
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6b233fd3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
1 deletion
+32
-1
purchase_advise.cs
AutoTurnOver.DB/purchase_advise.cs
+17
-1
dc_auto_purchase_advise.cs
AutoTurnOver.Models/dc_auto_purchase_advise.cs
+3
-0
PurchaseAdviseServices.cs
AutoTurnOver.Services/PurchaseAdviseServices.cs
+5
-0
PurchaseAdviseController.cs
AutoTurnOver/Controllers/PurchaseAdviseController.cs
+7
-0
No files found.
AutoTurnOver.DB/purchase_advise.cs
View file @
049dc0cc
...
...
@@ -1166,7 +1166,7 @@ left join dc_mid_transit as t9 on t1.bailun_sku = t9.bailun_sku and t1.warehouse
if
(
mainID
<=
0
)
{
mainID
=
purchase_advise
.
Add
(
new
dc_auto_purchase_advise
{
create_time
=
now
,
no
=
purchase_advise
.
GenerateOrderNo
(),
type
=
1
,
buy_sys_plan_no
=
"ImportYiWuShortageDetailed"
,
title
=
$" 义
务
仓缺货
{
DateTime
.
Now
.
ToString
(
"HH:mm"
)}
"
})
??
0
;
mainID
=
purchase_advise
.
Add
(
new
dc_auto_purchase_advise
{
create_time
=
now
,
no
=
purchase_advise
.
GenerateOrderNo
(),
type
=
1
,
buy_sys_plan_no
=
"ImportYiWuShortageDetailed"
,
title
=
$" 义
乌
仓缺货
{
DateTime
.
Now
.
ToString
(
"HH:mm"
)}
"
})
??
0
;
}
var
datas
=
_connection
.
Query
<
dc_auto_purchase_advise_detailed
>(
@" select
t1.bailun_sku,
...
...
@@ -1849,6 +1849,11 @@ where 1=1 ";
sql
+=
$" and t1.main_id = @main_id "
;
parameters
.
Add
(
"main_id"
,
m
.
main_id
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
m
.
main_ids
))
{
sql
+=
$" and t1.main_id in @main_ids "
;
parameters
.
Add
(
"main_ids"
,
m
.
main_ids
.
Split
(
','
).
Select
(
s
=>
int
.
Parse
(
s
)).
ToList
());
}
if
(!
string
.
IsNullOrWhiteSpace
(
m
.
sku
))
{
sql
+=
$" and t1.bailun_sku in @bailun_skus "
;
...
...
@@ -2147,5 +2152,16 @@ where 1=1 ";
return
obj
.
AsList
();
}
/// <summary>
/// 查询今日的周转数据
/// </summary>
/// <returns></returns>
public
static
List
<
dc_auto_purchase_advise
>
GetToDayDatas
()
{
return
_connection
.
Query
<
dc_auto_purchase_advise
>(
" select * from dc_auto_purchase_advise where create_time>=@bdate "
,
new
{
bdate
=
DateTime
.
Now
.
ToDayHome
()
}).
ToList
();
}
}
}
AutoTurnOver.Models/dc_auto_purchase_advise.cs
View file @
049dc0cc
...
...
@@ -536,6 +536,9 @@ namespace AutoTurnOver.Models
/// </summary>
public
int
main_id
{
get
;
set
;
}
[
Description
(
"采购建议批次"
)]
public
string
main_ids
{
get
;
set
;
}
[
Description
(
"建议单号"
)]
public
string
order_no
{
get
;
set
;
}
...
...
AutoTurnOver.Services/PurchaseAdviseServices.cs
View file @
049dc0cc
...
...
@@ -607,6 +607,11 @@ namespace AutoTurnOver.Services
{
return
DB
.
purchase_advise
.
ReturnGoodsList
(
search_data
,
offset
,
limit
,
ref
total
);
}
public
List
<
dc_auto_purchase_advise
>
GetToDayDatas
()
{
return
DB
.
purchase_advise
.
GetToDayDatas
();
}
public
string
ExportReturnGoods
(
dc_aims_return_goods_search_dto
searchData
)
{
...
...
AutoTurnOver/Controllers/PurchaseAdviseController.cs
View file @
049dc0cc
...
...
@@ -273,6 +273,13 @@ namespace AutoTurnOver.Controllers
}.
ToJson
(
false
);
}
[
HttpGet
]
public
JsonResult
GetToDayDatas
()
{
var
list
=
new
PurchaseAdviseServices
().
GetToDayDatas
();
return
new
JsonResult
(
list
);
}
public
JsonResult
ExportReturnGoods
([
FromQuery
]
dc_auto_purchase_advise_detailed_search_dto
m
,
[
FromQuery
]
int
limit
,
[
FromQuery
]
int
offset
,
[
FromQuery
]
string
sort
,
[
FromQuery
]
string
order
)
{
...
...
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