Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
874627d4
Commit
874627d4
authored
Apr 13, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
库存调整
parent
7f2b2f1b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
RB_WarehouseOut_GoodsDetailRepository.cs
...ository/Property/RB_WarehouseOut_GoodsDetailRepository.cs
+1
-1
PropertyController.cs
Mall.WebApi/Controllers/Property/PropertyController.cs
+2
-1
No files found.
Mall.Repository/Property/RB_WarehouseOut_GoodsDetailRepository.cs
View file @
874627d4
...
...
@@ -101,7 +101,7 @@ namespace Mall.Repository.Property
public
List
<
RB_WarehouseOut_GoodsDetail_Extend
>
GetPageList_V2
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_WarehouseOut_GoodsDetail_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$@"SELECT a.*,i.InventoryNum,i.CreateDate as StockInDate FROM(
builder
.
Append
(
$@"SELECT a.*,i.InventoryNum,i.CreateDate as StockInDate
,i.FinanceId
FROM(
SELECT gd.OrderId,gd.OrderGoodsId,gd.GoodsId,gd.StockOutId,gd.MaterialId,gd.GoodsName
,gd.Specification,gd.CostMoney,gd.ProductCode,gd.WarehouseId,s.StockOutDate,w.`Name` as WarehouseName,GROUP_CONCAT(gd.ValidityId) as ValidityIds,COUNT(0) AS Number
FROM rb_warehouseout_goodsdetail gd
...
...
Mall.WebApi/Controllers/Property/PropertyController.cs
View file @
874627d4
...
...
@@ -420,7 +420,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
ValidityIds
,
StockOutDate
=
x
.
StockOutDate
.
HasValue
?
x
.
StockOutDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
StockInDate
=
x
.
StockInDate
.
HasValue
?
x
.
StockInDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
x
.
InventoryNum
x
.
InventoryNum
,
x
.
FinanceId
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
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