处理备注

module/Sales/src/Controller/SalesOrderController.php

@@ -324,7 +324,7 @@ class SalesOrderController extends AbstractActionController
                     $this->salesGoodsPriceLogManager->addSalesGoodsPriceLog($salesOrderGoods, $salesOrderId, time());
                     $goodsState = $this->goodsManager->outGoodsStock($sendArray['goods']);
 
-                    $allExWarehouseOrderGoodsManager->addSalesWarehouseOrderGoods($sendArray['warehouseGoods'], $sendOrder,$warehouseOrderSn);
+                    $allExWarehouseOrderGoodsManager->addSalesWarehouseOrderGoods($sendArray['warehouseGoods'], $sendOrder,$warehouseOrderSn,$salesOrderInfo->getSalesOrderInfo());
 
                     if(!$sendWarehouseGoodsState || !$goodsState) $this->entityManager->rollback();
 

module/Stock/src/Controller/ExWarehouseController.php

@@ -107,7 +107,7 @@ class ExWarehouseController extends AbstractActionController
                 try {
                     $exWarehouseOrder = $this->exWarehouseOrderManager->addExWarehouseOrder($data, $goodsData,  $this->adminSession('admin_id'));
                     $this->exWarehouseOrderGoodsManager->addExWarehouseOrderGoods($goodsData, $data['warehouseId'], $exWarehouseOrder->getExWarehouseOrderId());
-                    $allExWarehouseOrderGoodsManager->addExWarehouseOrderGoods($goodsData, $data['warehouseId'], $exWarehouseOrder->getExWarehouseOrderId(),$warehouseOrderSn);
+                    $allExWarehouseOrderGoodsManager->addExWarehouseOrderGoods($goodsData, $data['warehouseId'], $exWarehouseOrder->getExWarehouseOrderId(),$warehouseOrderSn,$exWarehouseOrder->getExWarehouseOrderInfo());
                     $this->getEventManager()->trigger('ex-warehouse-order.out.post', $this, $exWarehouseOrder);
 
                     $this->entityManager->commit();

module/Stock/src/Controller/IndexController.php

@@ -98,7 +98,7 @@ class IndexController extends AbstractActionController
                 try {
                     $otherWarehouseOrder = $this->otherWarehouseOrderManager->addOtherWarehouseOrder($data, $goodsData, $this->adminSession('admin_id'));
                     $this->otherWarehouseOrderGoodsManager->addOtherWarehouseOrderGoods($goodsData, $data['warehouseId'], $otherWarehouseOrder->getOtherWarehouseOrderId());
-                    $allWarehouseOrderGoodsManager->addAllWarehouseOrderGoods($goodsData, $data['warehouseId'], $otherWarehouseOrder->getOtherWarehouseOrderId(),$otherWarehouseOrder->getWarehouseOrderSn());
+                    $allWarehouseOrderGoodsManager->addAllWarehouseOrderGoods($goodsData, $data['warehouseId'], $otherWarehouseOrder->getOtherWarehouseOrderId(),$otherWarehouseOrder->getWarehouseOrderSn(),$otherWarehouseOrder->getWarehouseOrderInfo());
 
                     $this->getEventManager()->trigger('other-warehouse-order.insert.post', $this, $otherWarehouseOrder);
 

module/Stock/src/Controller/StockCheckController.php

@@ -204,7 +204,7 @@ class StockCheckController extends AbstractActionController
         $this->entityManager->beginTransaction();
         try {
             $this->stockCheckManager->updateStockCheckState(1, $stockCheckInfo);
-            //$allWarehouseOrderGoodsManager->addAllCheckWarehouseOrderGoods($stockCheckInfo->getwarehouseId(), $stockCheckId,$stockCheckInfo->getStockCheckSn());
+            //$allWarehouseOrderGoodsManager->addAllCheckWarehouseOrderGoods($stockCheckInfo->getwarehouseId(), $stockCheckId,$stockCheckInfo->getStockCheckSn(),$stockCheckInfo->getStockCheckInfo());
 
             $this->getEventManager()->trigger('stock-check.update.post', $this, $stockCheckInfo);
 

module/Store/src/Entity/AllExWarehouseOrderGoods.php

@@ -104,6 +104,12 @@ class AllExWarehouseOrderGoods extends BaseEntity
      */
     private $goodsUnit;
 
+    /**
+     * 入库备注
+     * @ORM\Column(name="ex_warehouse_order_info", type="string", length=100)
+     */
+    private $exWarehouseOrderInfo;
+
     /**
      * 时间
      * @ORM\Column(name="add_time", type="integer", length=11)
@@ -337,6 +343,21 @@ class AllExWarehouseOrderGoods extends BaseEntity
         $this->goodsUnit = $goodsUnit;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getExWarehouseOrderInfo()
+    {
+        return $this->exWarehouseOrderInfo;
+    }
+
+    /**
+     * @param mixed $exWarehouseOrderInfo
+     */
+    public function setExWarehouseOrderInfo($exWarehouseOrderInfo): void
+    {
+        $this->exWarehouseOrderInfo = $exWarehouseOrderInfo;
+    }
 
     /**
      * @return mixed

module/Store/src/Entity/AllWarehouseOrderGoods.php

@@ -104,6 +104,13 @@ class AllWarehouseOrderGoods extends BaseEntity
      */
     private $goodsUnit;
 
+    /**
+     * 入库备注
+     * @ORM\Column(name="warehouse_order_info", type="string", length=100)
+     */
+    private $warehouseOrderInfo;
+
+
     /**
      * 时间
      * @ORM\Column(name="add_time", type="integer", length=11)
@@ -331,6 +338,23 @@ class AllWarehouseOrderGoods extends BaseEntity
         $this->goodsUnit = $goodsUnit;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getWarehouseOrderInfo()
+    {
+        return $this->warehouseOrderInfo;
+    }
+
+    /**
+     * @param mixed $warehouseOrderInfo
+     */
+    public function setWarehouseOrderInfo($warehouseOrderInfo): void
+    {
+        $this->warehouseOrderInfo = $warehouseOrderInfo;
+    }
+
+
     /**
      * @return mixed
      */

module/Store/src/Service/AllExWarehouseOrderGoodsManager.php

@@ -46,7 +46,7 @@ class AllExWarehouseOrderGoodsManager
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\Persistence\Mapping\MappingException
      */
-    public function addExWarehouseOrderGoods(array $data, $warehouseId, $orderId,$warehouseOrderSn=null)
+    public function addExWarehouseOrderGoods(array $data, $warehouseId, $orderId,$warehouseOrderSn=null,$exWarehouseOrderInfo=null)
     {
         foreach ($data['goodsId'] as $key => $value) {
             $goodsInfo = $this->entityManager->getRepository(Goods::class)->findOneBy(['goodsId' => $value]);
@@ -84,6 +84,7 @@ class AllExWarehouseOrderGoodsManager
                     $exWarehouseGoods->setGoodsNumber($goodsInfo->getGoodsNumber());
                     $exWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
                     $exWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
+                    $exWarehouseGoods->setExWarehouseOrderInfo($exWarehouseOrderInfo);
                     $exWarehouseGoods->setAddTime(time());
                     $exWarehouseGoods->setType("ex");
                     $exWarehouseGoods->setAllWarehouseOrderId($v->getallWarehouseOrderGoodsId());
@@ -107,7 +108,7 @@ class AllExWarehouseOrderGoodsManager
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\Persistence\Mapping\MappingException
      */
-    public function addSalesWarehouseOrderGoods(array $data, SalesSendOrder $sendOrder,$warehouseOrderSn=null)
+    public function addSalesWarehouseOrderGoods(array $data, SalesSendOrder $sendOrder,$warehouseOrderSn=null,$exWarehouseOrderInfo=null)
     {
         foreach ($data as $value) {
             $goodsInfo = $this->entityManager->getRepository(Goods::class)->findOneBy(['goodsId' => $value['goodsId']]);
@@ -147,7 +148,7 @@ class AllExWarehouseOrderGoodsManager
                     $exWarehouseGoods->setGoodsName($goodsInfo->getGoodsName());
                     $exWarehouseGoods->setGoodsNumber($goodsInfo->getGoodsNumber());
                     $exWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
-                    $exWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
+                    $exWarehouseGoods->setExWarehouseOrderInfo($exWarehouseOrderInfo);
                     $exWarehouseGoods->setAddTime(time());
                     $exWarehouseGoods->setType("send");
                     $exWarehouseGoods->setAllWarehouseOrderId($v->getallWarehouseOrderGoodsId());

module/Store/src/Service/AllWarehouseOrderGoodsManager.php

@@ -42,7 +42,7 @@ class AllWarehouseOrderGoodsManager
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\Persistence\Mapping\MappingException
      */
-    public function addAllWarehouseOrderGoods(array $data, $warehouseId, $otherWarehouseOrderId,$warehouseOrderSn)
+    public function addAllWarehouseOrderGoods(array $data, $warehouseId, $otherWarehouseOrderId,$warehouseOrderSn,$warehouseOrderInfo)
     {
         foreach ($data['goodsId'] as $key => $value) {
             $goodsInfo = $this->entityManager->getRepository(Goods::class)->findOneBy(['goodsId' => $value]);
@@ -61,6 +61,7 @@ class AllWarehouseOrderGoodsManager
                 $allWarehouseGoods->setGoodsNumber($goodsInfo->getGoodsNumber());
                 $allWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
                 $allWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
+                $allWarehouseGoods->setWarehouseOrderInfo($warehouseOrderInfo);
                 $allWarehouseGoods->setAddTime(time());
                 $allWarehouseGoods->setOutNum($data['goodsBuyNum'][$key]);
                 $allWarehouseGoods->setType("other");
@@ -96,6 +97,7 @@ class AllWarehouseOrderGoodsManager
             $allWarehouseGoods->setGoodsNumber($goodsValue->getGoodsNumber());
             $allWarehouseGoods->setGoodsSpec($goodsValue->getGoodsSpec());
             $allWarehouseGoods->setGoodsUnit($goodsValue->getGoodsUnit());
+            $allWarehouseGoods->setWarehouseOrderInfo($warehouseOrder->getWarehouseOrderInfo());
             $allWarehouseGoods->setAddTime(time());
             $allWarehouseGoods->setOutNum($goodsValue->getPGoodsBuyNum());
             $allWarehouseGoods->setType("purchase");
@@ -112,7 +114,7 @@ class AllWarehouseOrderGoodsManager
      * @param WarehouseOrder $warehouseOrder
      * @return bool
      */
-    public function addAllCheckWarehouseOrderGoods($warehouseId,  $stockCheckId,$warehouseOrderSn)
+    public function addAllCheckWarehouseOrderGoods($warehouseId,  $stockCheckId,$warehouseOrderSn,$warehouseOrderInfo)
     {
         $stockCheckGoods = $this->entityManager->getRepository(StockCheckGoods::class)->findBy(['stockCheckId' => $stockCheckId]);
         foreach ($stockCheckGoods as $key => $value) {
@@ -133,6 +135,7 @@ class AllWarehouseOrderGoodsManager
                 $allWarehouseGoods->setGoodsNumber($goodsInfo->getGoodsNumber());
                 $allWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());
                 $allWarehouseGoods->setGoodsUnit($goodsInfo->getOneUnit()->getUnitName());
+                $allWarehouseGoods->setWarehouseOrderInfo($warehouseOrderInfo);
                 $allWarehouseGoods->setAddTime(time());
                 $allWarehouseGoods->setOutNum($GoodsBuyNum);
                 $allWarehouseGoods->setType("check");