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
586524e4
Commit
586524e4
authored
Mar 10, 2021
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
a407617d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
ApiUtility.cs
AutoTurnOver.DB/ApiUtility.cs
+6
-6
dc_base_trans_expectarrivaltime.cs
AutoTurnOver.Models/dc_base_trans_expectarrivaltime.cs
+6
-1
No files found.
AutoTurnOver.DB/ApiUtility.cs
View file @
586524e4
...
@@ -550,14 +550,14 @@ namespace AutoTurnOver.DB
...
@@ -550,14 +550,14 @@ namespace AutoTurnOver.DB
{
{
var
_connection
=
MyMySqlConnection
.
_connection_read_only
;
var
_connection
=
MyMySqlConnection
.
_connection_read_only
;
List
<
api_transport_count_order_transfer_dto
>
datas
=
new
List
<
api_transport_count_order_transfer_dto
>()
{
new
api_transport_count_order_transfer_dto
{
}
};
List
<
api_transport_count_order_transfer_dto
>
datas
=
new
List
<
api_transport_count_order_transfer_dto
>()
{
new
api_transport_count_order_transfer_dto
{
}
};
List
<
dc_base_trans_expectarrivaltime_temp
>
transDatas
=
new
List
<
dc_base_trans_expectarrivaltime_temp
>();
List
<
temp_dc_base_trans_expectarrivaltime_temp
>
transDatas
=
new
List
<
temp_
dc_base_trans_expectarrivaltime_temp
>();
DynamicParameters
parameters
=
new
DynamicParameters
();
DynamicParameters
parameters
=
new
DynamicParameters
();
parameters
.
Add
(
"bailun_sku"
,
data
.
bailun_sku
);
parameters
.
Add
(
"bailun_sku"
,
data
.
bailun_sku
);
parameters
.
Add
(
"warehouse_code"
,
data
.
targetwareno
);
parameters
.
Add
(
"warehouse_code"
,
data
.
targetwareno
);
// 查询真实的调拨在途
// 查询真实的调拨在途
var
orders
=
_connection
.
Query
<
dc_base_trans_expectarrivaltime_temp
>(
@"select
var
orders
=
_connection
.
Query
<
temp_
dc_base_trans_expectarrivaltime_temp
>(
@"select
ifnull(t2.`code`,'') as 'main_code',
ifnull(t2.`code`,'') as 'main_code',
ifnull(t8.expectarrivaltime,t2.expectarrivaltime) as 'expectarrivaltime',
ifnull(t8.expectarrivaltime,t2.expectarrivaltime) as 'expectarrivaltime',
t1.sku as 'bailun_sku',
t1.sku as 'bailun_sku',
...
@@ -580,7 +580,7 @@ and t3.hq_type in ('fba仓','第三方仓库') and t2.expectarrivaltime >='1991-
...
@@ -580,7 +580,7 @@ and t3.hq_type in ('fba仓','第三方仓库') and t2.expectarrivaltime >='1991-
transDatas
.
AddRange
(
orders
);
transDatas
.
AddRange
(
orders
);
}
}
// 计算调拨临时数据
// 计算调拨临时数据
var
temp_orders
=
_connection
.
Query
<
dc_base_trans_expectarrivaltime_temp
>(
@"select
var
temp_orders
=
_connection
.
Query
<
temp_
dc_base_trans_expectarrivaltime_temp
>(
@"select
t1.code as 'main_code',
t1.code as 'main_code',
t1.purchase_code as 'purchase_id',
t1.purchase_code as 'purchase_id',
t1.sku as 'bailun_sku',
t1.sku as 'bailun_sku',
...
@@ -599,7 +599,7 @@ and t1.sku=@bailun_sku and t1.target_ware_no=@warehouse_code
...
@@ -599,7 +599,7 @@ and t1.sku=@bailun_sku and t1.target_ware_no=@warehouse_code
transDatas
.
AddRange
(
temp_orders
);
transDatas
.
AddRange
(
temp_orders
);
}
}
// 查询计划单
// 查询计划单
var
plan_orders
=
_connection
.
Query
<
dc_base_trans_expectarrivaltime_temp
>(
@"select
var
plan_orders
=
_connection
.
Query
<
temp_
dc_base_trans_expectarrivaltime_temp
>(
@"select
t1.transfer_plan_order_id as 'main_code',
t1.transfer_plan_order_id as 'main_code',
'' as 'purchase_id',
'' as 'purchase_id',
t1.bailun_sku as 'bailun_sku',
t1.bailun_sku as 'bailun_sku',
...
@@ -634,7 +634,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
...
@@ -634,7 +634,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
if
(
logs
!=
null
&&
logs
.
Count
>=
1
)
if
(
logs
!=
null
&&
logs
.
Count
>=
1
)
{
{
// 按实际排降序取够库存
// 按实际排降序取够库存
var
stock_orders
=
new
List
<
dc_base_trans_expectarrivaltime_temp
>();
var
stock_orders
=
new
List
<
temp_
dc_base_trans_expectarrivaltime_temp
>();
foreach
(
var
item
in
logs
.
OrderByDescending
(
s
=>
s
.
date
))
foreach
(
var
item
in
logs
.
OrderByDescending
(
s
=>
s
.
date
))
{
{
...
@@ -651,7 +651,7 @@ from dc_base_transfer_info as t1
...
@@ -651,7 +651,7 @@ from dc_base_transfer_info as t1
left join dc_base_lms_channel as t9 on t1.channelname = t9.`name`
left join dc_base_lms_channel as t9 on t1.channelname = t9.`name`
where t1.`code`=@code limit 1
where t1.`code`=@code limit 1
"
,
new
{
code
=
item
.
system_order_no
});
"
,
new
{
code
=
item
.
system_order_no
});
stock_orders
.
Add
(
new
dc_base_trans_expectarrivaltime_temp
{
count
=
use_stock
,
main_code
=
item
.
system_order_no
,
transport_type_str
=
transport_type_str
});
stock_orders
.
Add
(
new
temp_
dc_base_trans_expectarrivaltime_temp
{
count
=
use_stock
,
main_code
=
item
.
system_order_no
,
transport_type_str
=
transport_type_str
});
}
}
}
}
...
...
AutoTurnOver.Models/dc_base_trans_expectarrivaltime.cs
View file @
586524e4
...
@@ -11,7 +11,7 @@ namespace AutoTurnOver.Models
...
@@ -11,7 +11,7 @@ namespace AutoTurnOver.Models
public
class
dc_base_trans_expectarrivaltime_temp
public
class
dc_base_trans_expectarrivaltime_temp
{
{
public
int
id
{
get
;
set
;
}
public
int
id
{
get
;
set
;
}
public
string
main_code
{
get
;
set
;
}
public
string
bailun_sku
{
get
;
set
;
}
public
string
bailun_sku
{
get
;
set
;
}
public
string
warehouse_code
{
get
;
set
;
}
public
string
warehouse_code
{
get
;
set
;
}
public
int
count
{
get
;
set
;
}
public
int
count
{
get
;
set
;
}
...
@@ -33,4 +33,9 @@ namespace AutoTurnOver.Models
...
@@ -33,4 +33,9 @@ namespace AutoTurnOver.Models
/// </summary>
/// </summary>
public
string
transport_type_str
{
get
;
set
;
}
public
string
transport_type_str
{
get
;
set
;
}
}
}
public
class
temp_dc_base_trans_expectarrivaltime_temp
:
dc_base_trans_expectarrivaltime_temp
{
public
string
main_code
{
get
;
set
;
}
}
}
}
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