Skip to content

D
dsyerp
Commit 7294ee9a authored by wxl's avatar wxl
Browse files
Options

合并type类型

parent 10ed3824
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 75 deletions
module/Store/src/Entity/AllExWarehouseOrderGoods.php
View file @ 7294ee9a
......@@ -37,11 +37,6 @@ class AllExWarehouseOrderGoods extends BaseEntity
* @ORM\Column(name="ex_warehouse_order_id", type="integer", length=11)
*/
private $exWarehouseOrderId;
/**
* 销售订单对应表id
* @ORM\Column(name="send_order_id", type="integer", length=11)
*/
private $sendOrderId;
/**
* 其他入库采购入库对应表入库单号
......@@ -109,18 +104,23 @@ class AllExWarehouseOrderGoods extends BaseEntity
*/
private $goodsUnit;
/**
* 其他入库id
* @ORM\Column(name="all_warehouse_order_id", type="integer", length=20)
*/
private $allWarehouseOrderId;
/**
* 时间
* @ORM\Column(name="add_time", type="integer", length=11)
*/
private $addTime;
/**
* 出库类型
* @ORM\Column(name="type", type="enum", length=11)
*/
private $type;
/**
* 其他入库id
* @ORM\Column(name="all_warehouse_order_id", type="integer", length=20)
*/
private $allWarehouseOrderId;
/**
* 成本价
......@@ -353,40 +353,58 @@ class AllExWarehouseOrderGoods extends BaseEntity
$this->goodsUnit = $goodsUnit;
}
/**
* @return mixed
*/
public function getAllWarehouseOrderId()
public function getAddTime()
{
return $this->allWarehouseOrderId;
return $this->addTime;
}
/**
* @param mixed $addTime
*/
public function setAddTime($addTime): void
{
$this->addTime = $addTime;
}
/**
* @return mixed
*/
public function getType()
{
return $this->type;
}
/**
* @param mixed $allWarehouseOrderId
* @param mixed $type
*/
public function setAllWarehouseOrderId($allWarehouseOrderId): void
public function setType($type): void
{
$this->allWarehouseOrderId = $allWarehouseOrderId;
$this->type = $type;
}
/**
* @return mixed
*/
public function getAddTime()
public function getAllWarehouseOrderId()
{
return $this->addTime;
return $this->allWarehouseOrderId;
}
/**
* @param mixed $addTime
* @param mixed $allWarehouseOrderId
*/
public function setAddTime($addTime): void
public function setAllWarehouseOrderId($allWarehouseOrderId): void
{
$this->addTime = $addTime;
$this->allWarehouseOrderId = $allWarehouseOrderId;
}
/**
* @return mixed
*/
......@@ -402,4 +420,5 @@ class AllExWarehouseOrderGoods extends BaseEntity
{
$this->costPrice = $costPrice;
}
}
\ No newline at end of file
module/Store/src/Entity/AllWarehouseOrderGoods.php
View file @ 7294ee9a
......@@ -33,21 +33,10 @@ class AllWarehouseOrderGoods extends BaseEntity
private $allWarehouseOrderGoodsId;
/**
* 盘点入库对应表id
* @ORM\Column(name="stock_check_id", type="integer", length=11)
* 入库对应表id
* @ORM\Column(name="warehouse_order_id", type="integer", length=11)
*/
private $stockCheckId;
/**
* 其他入库对应表id
* @ORM\Column(name="other_warehouse_order_id", type="integer", length=11)
*/
private $otherWarehouseOrderId;
/**
* 采购入库对应表id
* @ORM\Column(name="purchase_warehouse_order_id", type="integer", length=11)
*/
private $purchaseWarehouseOrderId;
private $warehouseOrderId;
/**
* 其他入库采购入库对应表入库单号
......@@ -127,6 +116,12 @@ class AllWarehouseOrderGoods extends BaseEntity
*/
private $outNum;
/**
* 入库类型
* @ORM\Column(name="type", type="enum", length=11)
*/
private $type;
/**
* @return mixed
*/
......@@ -143,53 +138,23 @@ class AllWarehouseOrderGoods extends BaseEntity
$this->allWarehouseOrderGoodsId = $allWarehouseOrderGoodsId;
}
/**
* @return mixed
*/
public function getStockCheckId()
{
return $this->stockCheckId;
}
/**
* @param mixed $stockCheckId
*/
public function setStockCheckId($stockCheckId)
{
$this->stockCheckId = $stockCheckId;
}
/**
* @return mixed
*/
public function getOtherWarehouseOrderId()
{
return $this->otherWarehouseOrderId;
}
/**
* @param mixed $otherWarehouseOrderId
*/
public function setOtherWarehouseOrderId($otherWarehouseOrderId): void
public function getWarehouseOrderId()
{
$this->otherWarehouseOrderId = $otherWarehouseOrderId;
return $this->warehouseOrderId;
}
/**
* @return mixed
* @param mixed $warehouseOrderId
*/
public function getPurchaseWarehouseOrderId()
public function setWarehouseOrderId($warehouseOrderId): void
{
return $this->purchaseWarehouseOrderId;
$this->warehouseOrderId = $warehouseOrderId;
}
/**
* @param mixed $purchaseWarehouseOrderId
*/
public function setPurchaseWarehouseOrderId($purchaseWarehouseOrderId): void
{
$this->purchaseWarehouseOrderId = $purchaseWarehouseOrderId;
}
/**
* @return mixed
......@@ -397,4 +362,21 @@ class AllWarehouseOrderGoods extends BaseEntity
{
$this->outNum = $outNum;
}
/**
* @return mixed
*/
public function getType()
{
return $this->type;
}
/**
* @param mixed $type
*/
public function setType($type): void
{
$this->type = $type;
}
}
\ No newline at end of file
module/Store/src/Service/AllExWarehouseOrderGoodsManager.php
View file @ 7294ee9a
......@@ -85,6 +85,7 @@ class AllExWarehouseOrderGoodsManager
$exWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
$exWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
$exWarehouseGoods->setAddTime(time());
$exWarehouseGoods->setType("ex");
$exWarehouseGoods->setAllWarehouseOrderId($v->getallWarehouseOrderGoodsId());
$exWarehouseGoods->setCostPrice($v->getwarehouseGoodsPrice());
......@@ -123,7 +124,7 @@ class AllExWarehouseOrderGoodsManager
if ($goodsInfo && $goodsExNum>0) {
$exWarehouseGoods = new AllExWarehouseOrderGoods();
$exWarehouseGoods->setAllExWarehouseOrderGoodsId(null);
$exWarehouseGoods->setSendOrderId($sendOrder->getSendOrderId());
$exWarehouseGoods->setExWarehouseOrderId($sendOrder->getSendOrderId());
$exWarehouseGoods->setExWarehouseOrderSn($v->getwarehouseOrderSn());
$exWarehouseGoods->setWarehouseId($value['warehouseId']);
if($goodsExNum >= $v->getoutNum()){
......@@ -148,6 +149,7 @@ class AllExWarehouseOrderGoodsManager
$exWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
$exWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
$exWarehouseGoods->setAddTime(time());
$exWarehouseGoods->setType("send");
$exWarehouseGoods->setAllWarehouseOrderId($v->getallWarehouseOrderGoodsId());
$exWarehouseGoods->setCostPrice($v->getwarehouseGoodsPrice());
......
module/Store/src/Service/AllWarehouseOrderGoodsManager.php
View file @ 7294ee9a
......@@ -49,7 +49,7 @@ class AllWarehouseOrderGoodsManager
if($goodsInfo) {
$allWarehouseGoods = new AllWarehouseOrderGoods();
$allWarehouseGoods->setAllWarehouseOrderGoodsId(null);
$allWarehouseGoods->setOtherWarehouseOrderId($otherWarehouseOrderId);
$allWarehouseGoods->setWarehouseOrderId($otherWarehouseOrderId);
$allWarehouseGoods->setWarehouseOrderSn($warehouseOrderSn);
$allWarehouseGoods->setWarehouseId($warehouseId);
$allWarehouseGoods->setWarehouseGoodsBuyNum($data['goodsBuyNum'][$key]);
......@@ -63,6 +63,7 @@ class AllWarehouseOrderGoodsManager
$allWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
$allWarehouseGoods->setAddTime(time());
$allWarehouseGoods->setOutNum($data['goodsBuyNum'][$key]);
$allWarehouseGoods->setType("other");
$this->entityManager->persist($allWarehouseGoods);
$this->entityManager->flush();
......@@ -83,7 +84,7 @@ class AllWarehouseOrderGoodsManager
foreach ($orderGoods as $goodsValue) {
$allWarehouseGoods = new AllWarehouseOrderGoods();
$allWarehouseGoods->setAllWarehouseOrderGoodsId(null);
$allWarehouseGoods->setPurchaseWarehouseOrderId($warehouseOrder->getWarehouseOrderId());
$allWarehouseGoods->setWarehouseOrderId($warehouseOrder->getWarehouseOrderId());
$allWarehouseGoods->setWarehouseOrderSn($warehouseOrder->getWarehouseOrderSn());
$allWarehouseGoods->setWarehouseId($warehouseOrder->getWarehouseId());
$allWarehouseGoods->setWarehouseGoodsBuyNum($goodsValue->getPGoodsBuyNum());
......@@ -97,7 +98,7 @@ class AllWarehouseOrderGoodsManager
$allWarehouseGoods->setGoodsUnit($goodsValue->getGoodsUnit());
$allWarehouseGoods->setAddTime(time());
$allWarehouseGoods->setOutNum($goodsValue->getPGoodsBuyNum());
$allWarehouseGoods->setType("purchase");
$this->entityManager->persist($allWarehouseGoods);
$this->entityManager->flush();
......@@ -120,7 +121,7 @@ class AllWarehouseOrderGoodsManager
if($goodsInfo && $GoodsBuyNum >0) {
$allWarehouseGoods = new AllWarehouseOrderGoods();
$allWarehouseGoods->setAllWarehouseOrderGoodsId(null);
$allWarehouseGoods->setStockCheckId($stockCheckId);
$allWarehouseGoods->setWarehouseOrderId($stockCheckId);
$allWarehouseGoods->setWarehouseId($warehouseId);
$allWarehouseGoods->setWarehouseOrderSn($warehouseOrderSn);
$allWarehouseGoods->setWarehouseGoodsBuyNum($GoodsBuyNum);
......@@ -134,6 +135,8 @@ class AllWarehouseOrderGoodsManager
$allWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
$allWarehouseGoods->setAddTime(time());
$allWarehouseGoods->setOutNum($GoodsBuyNum);
$allWarehouseGoods->setType("check");
$this->entityManager->persist($allWarehouseGoods);
$this->entityManager->flush();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment