Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
openApi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hj
openApi
Commits
53006ebb
Commit
53006ebb
authored
Jun 24, 2022
by
hangjun83
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
罗恩工具类更新
parent
b26f6a2b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
server/app/Repositories/Eloquent/RhawnSoitemsRepositoryEloquent.php
.../Repositories/Eloquent/RhawnSoitemsRepositoryEloquent.php
+7
-2
server/app/Services/RhawnOrdersService.php
server/app/Services/RhawnOrdersService.php
+2
-2
No files found.
server/app/Repositories/Eloquent/RhawnSoitemsRepositoryEloquent.php
View file @
53006ebb
...
...
@@ -99,7 +99,12 @@ class RhawnSoitemsRepositoryEloquent extends BaseRepository implements RhawnSoit
public
function
getOrderItemsStockFromItemIds
(
$id
)
{
if
(
!
is_array
(
$id
)){
$item
=
$this
->
find
(
$id
);
$id
=
(
array
)
$id
;
}
else
{
$item
=
RhawnSoitems
::
query
()
->
whereIn
(
'si_id'
,
$id
)
->
get
();
}
if
(
!
$item
){
throw
new
\LogicException
(
'该订单项不存在!'
,
500
);
}
...
...
@@ -109,7 +114,7 @@ class RhawnSoitemsRepositoryEloquent extends BaseRepository implements RhawnSoit
->
join
(
'dpdetail'
,
'dpdetail.si_id'
,
'soitems.si_id'
)
->
join
(
'pstock'
,
'pstock.pstk_id'
,
'dpdetail.pstk_id'
)
->
join
(
'products'
,
'soitems.p_id'
,
'products.p_id'
)
->
where
(
'soitems.si_id'
,
$id
)
->
where
In
(
'soitems.si_id'
,
$id
)
->
where
(
'si_if_cancel'
,
0
)
//->where('dpdetail.dpd_invoiced','=',0)
->
get
();
...
...
server/app/Services/RhawnOrdersService.php
View file @
53006ebb
...
...
@@ -129,7 +129,7 @@ class RhawnOrdersService
//先查询库存信息
$repository
=
app
(
RhawnSoitemsRepository
::
class
);
$stockResult
=
$repository
->
getOrderItemsStockFromItemIds
(
$params
[
'item_id'
]
);
$stockResult
=
$repository
->
getOrderItemsStockFromItemIds
(
explode
(
','
,
$params
[
'item_id'
])
);
if
(
empty
(
$stockResult
)
||
!
$stockResult
){
throw
new
\LogicException
(
'订单明细id不存在!'
,
500
);
}
...
...
@@ -274,7 +274,7 @@ class RhawnOrdersService
}
//获取销售订单item数据
$result
=
app
(
RhawnSoitemsRepository
::
class
)
->
getOrderItemsStockFromItemIds
(
$content
[
'item_id'
]
);
$result
=
app
(
RhawnSoitemsRepository
::
class
)
->
getOrderItemsStockFromItemIds
(
explode
(
','
,
$content
[
'item_id'
])
);
$returnItemStock
=
[];
if
(
$result
&&
!
empty
(
$result
)){
foreach
(
$result
as
$res
){
...
...
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