Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dsyerp
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
sugar
dsyerp
Commits
f0af86ab
Commit
f0af86ab
authored
Nov 16, 2023
by
wxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
盘点入库
parent
7983f7c6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
1 deletion
+65
-1
module/Stock/src/Controller/StockCheckController.php
module/Stock/src/Controller/StockCheckController.php
+4
-0
module/Store/src/Entity/AllWarehouseOrderGoods.php
module/Store/src/Entity/AllWarehouseOrderGoods.php
+22
-0
module/Store/src/Service/AllWarehouseOrderGoodsManager.php
module/Store/src/Service/AllWarehouseOrderGoodsManager.php
+39
-1
No files found.
module/Stock/src/Controller/StockCheckController.php
View file @
f0af86ab
...
@@ -24,6 +24,7 @@ use Stock\Form\StockCheckGoodsForm;
...
@@ -24,6 +24,7 @@ use Stock\Form\StockCheckGoodsForm;
use
Stock\Service\StockCheckGoodsManager
;
use
Stock\Service\StockCheckGoodsManager
;
use
Stock\Service\StockCheckManager
;
use
Stock\Service\StockCheckManager
;
use
Laminas\View\Model\JsonModel
;
use
Laminas\View\Model\JsonModel
;
use
Store\Service\AllWarehouseOrderGoodsManager
;
/**
/**
* 库存盘点
* 库存盘点
...
@@ -182,6 +183,7 @@ class StockCheckController extends AbstractActionController
...
@@ -182,6 +183,7 @@ class StockCheckController extends AbstractActionController
*/
*/
public
function
confirmAction
()
public
function
confirmAction
()
{
{
$allWarehouseOrderGoodsManager
=
new
AllWarehouseOrderGoodsManager
(
$this
->
entityManager
);
$stockCheckId
=
(
int
)
$this
->
params
()
->
fromRoute
(
'id'
,
-
1
);
$stockCheckId
=
(
int
)
$this
->
params
()
->
fromRoute
(
'id'
,
-
1
);
$stockCheckInfo
=
$this
->
entityManager
->
getRepository
(
StockCheck
::
class
)
->
findOneBy
([
'stockCheckId'
=>
$stockCheckId
]);
$stockCheckInfo
=
$this
->
entityManager
->
getRepository
(
StockCheck
::
class
)
->
findOneBy
([
'stockCheckId'
=>
$stockCheckId
]);
if
(
$stockCheckInfo
==
null
)
{
if
(
$stockCheckInfo
==
null
)
{
...
@@ -202,6 +204,8 @@ class StockCheckController extends AbstractActionController
...
@@ -202,6 +204,8 @@ class StockCheckController extends AbstractActionController
$this
->
entityManager
->
beginTransaction
();
$this
->
entityManager
->
beginTransaction
();
try
{
try
{
$this
->
stockCheckManager
->
updateStockCheckState
(
1
,
$stockCheckInfo
);
$this
->
stockCheckManager
->
updateStockCheckState
(
1
,
$stockCheckInfo
);
$allWarehouseOrderGoodsManager
->
addAllCheckWarehouseOrderGoods
(
$stockCheckInfo
->
getwarehouseId
(),
$stockCheckId
,
$stockCheckInfo
->
getStockCheckSn
());
$this
->
getEventManager
()
->
trigger
(
'stock-check.update.post'
,
$this
,
$stockCheckInfo
);
$this
->
getEventManager
()
->
trigger
(
'stock-check.update.post'
,
$this
,
$stockCheckInfo
);
$this
->
entityManager
->
commit
();
$this
->
entityManager
->
commit
();
...
...
module/Store/src/Entity/AllWarehouseOrderGoods.php
View file @
f0af86ab
...
@@ -32,6 +32,12 @@ class AllWarehouseOrderGoods extends BaseEntity
...
@@ -32,6 +32,12 @@ class AllWarehouseOrderGoods extends BaseEntity
*/
*/
private
$allWarehouseOrderGoodsId
;
private
$allWarehouseOrderGoodsId
;
/**
* 盘点入库对应表id
* @ORM\Column(name="stock_check_id", type="integer", length=11)
*/
private
$stockCheckId
;
/**
/**
* 其他入库对应表id
* 其他入库对应表id
* @ORM\Column(name="other_warehouse_order_id", type="integer", length=11)
* @ORM\Column(name="other_warehouse_order_id", type="integer", length=11)
...
@@ -137,6 +143,22 @@ class AllWarehouseOrderGoods extends BaseEntity
...
@@ -137,6 +143,22 @@ class AllWarehouseOrderGoods extends BaseEntity
$this
->
allWarehouseOrderGoodsId
=
$allWarehouseOrderGoodsId
;
$this
->
allWarehouseOrderGoodsId
=
$allWarehouseOrderGoodsId
;
}
}
/**
* @return mixed
*/
public
function
getStockCheckId
()
{
return
$this
->
stockCheckId
;
}
/**
* @param mixed $stockCheckId
*/
public
function
setStockCheckId
(
$stockCheckId
)
{
$this
->
stockCheckId
=
$stockCheckId
;
}
/**
/**
* @return mixed
* @return mixed
*/
*/
...
...
module/Store/src/Service/AllWarehouseOrderGoodsManager.php
View file @
f0af86ab
...
@@ -16,8 +16,10 @@ namespace Store\Service;
...
@@ -16,8 +16,10 @@ namespace Store\Service;
use
Doctrine\ORM\EntityManager
;
use
Doctrine\ORM\EntityManager
;
use
Purchase\Entity\WarehouseOrder
;
use
Purchase\Entity\WarehouseOrder
;
use
Stock\Entity\StockCheckGoods
;
use
Store\Entity\AllWarehouseOrderGoods
;
use
Store\Entity\AllWarehouseOrderGoods
;
use
Store\Entity\Goods
;
use
Store\Entity\Goods
;
use
Store\Entity\WarehouseGoods
;
class
AllWarehouseOrderGoodsManager
class
AllWarehouseOrderGoodsManager
{
{
...
@@ -70,7 +72,7 @@ class AllWarehouseOrderGoodsManager
...
@@ -70,7 +72,7 @@ class AllWarehouseOrderGoodsManager
}
}
/**
/**
* 添加入库商品
* 添加
采购
入库商品
* @param $orderGoods
* @param $orderGoods
* @param WarehouseOrder $warehouseOrder
* @param WarehouseOrder $warehouseOrder
* @return bool
* @return bool
...
@@ -102,4 +104,40 @@ class AllWarehouseOrderGoodsManager
...
@@ -102,4 +104,40 @@ class AllWarehouseOrderGoodsManager
//$this->entityManager->clear(AllWarehouseOrderGoods::class);
//$this->entityManager->clear(AllWarehouseOrderGoods::class);
}
}
}
}
/**
* 添加盘点入库商品
* @param $orderGoods
* @param WarehouseOrder $warehouseOrder
* @return bool
*/
public
function
addAllCheckWarehouseOrderGoods
(
$warehouseId
,
$stockCheckId
,
$warehouseOrderSn
)
{
$stockCheckGoods
=
$this
->
entityManager
->
getRepository
(
StockCheckGoods
::
class
)
->
findBy
([
'stockCheckId'
=>
$stockCheckId
]);
foreach
(
$stockCheckGoods
as
$key
=>
$value
)
{
$goodsInfo
=
$this
->
entityManager
->
getRepository
(
Goods
::
class
)
->
findOneBy
([
'goodsId'
=>
$value
->
getgoodsId
()]);
if
(
$goodsInfo
)
{
$allWarehouseGoods
=
new
AllWarehouseOrderGoods
();
$allWarehouseGoods
->
setAllWarehouseOrderGoodsId
(
null
);
$allWarehouseGoods
->
setStockCheckId
(
$stockCheckId
);
$allWarehouseGoods
->
setWarehouseId
(
$warehouseId
);
$allWarehouseGoods
->
setWarehouseOrderSn
(
$warehouseOrderSn
);
$GoodsBuyNum
=
$value
->
getstockCheckAftGoodsNum
()
-
$value
->
getstockCheckPreGoodsNum
();
$allWarehouseGoods
->
setWarehouseGoodsBuyNum
(
$GoodsBuyNum
);
$allWarehouseGoods
->
setWarehouseGoodsPrice
(
$goodsInfo
->
getgoodsPrice
());
$allWarehouseGoods
->
setWarehouseGoodsTax
(
0
);
$allWarehouseGoods
->
setWarehouseGoodsAmount
(
$goodsInfo
->
getgoodsPrice
()
*
$GoodsBuyNum
);
$allWarehouseGoods
->
setGoodsId
(
$value
->
getgoodsId
());
$allWarehouseGoods
->
setGoodsName
(
$goodsInfo
->
getGoodsName
());
$allWarehouseGoods
->
setGoodsNumber
(
$goodsInfo
->
getGoodsNumber
());
$allWarehouseGoods
->
setGoodsSpec
(
$goodsInfo
->
getGoodsSpec
());
$allWarehouseGoods
->
setGoodsUnit
(
$goodsInfo
->
getOneUnit
()
->
getUnitName
());
$allWarehouseGoods
->
setAddTime
(
time
());
$allWarehouseGoods
->
setOutNum
(
$GoodsBuyNum
);
$this
->
entityManager
->
persist
(
$allWarehouseGoods
);
$this
->
entityManager
->
flush
();
}
}
}
}
}
\ No newline at end of file
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