出库编号

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,$exWarehouseOrder->getExWarehouseOrderInfo());
+                    $allExWarehouseOrderGoodsManager->addExWarehouseOrderGoods($goodsData, $data['warehouseId'], $exWarehouseOrder->getExWarehouseOrderId(),$warehouseOrderSn,$exWarehouseOrder->getExWarehouseOrderSn(),$exWarehouseOrder->getExWarehouseOrderInfo());
                     $this->getEventManager()->trigger('ex-warehouse-order.out.post', $this, $exWarehouseOrder);
 
                     $this->entityManager->commit();

module/Store/src/Entity/AllExWarehouseOrderGoods.php

@@ -39,7 +39,7 @@ class AllExWarehouseOrderGoods extends BaseEntity
     private $exWarehouseOrderId;
 
     /**
-     * 其他入库采购入库对应表入库单号
+     * 其他出库销售订单对应表出库单号
      * @ORM\Column(name="ex_warehouse_order_sn", type="string", length=100)
      */
     private $exWarehouseOrderSn;

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,$exWarehouseOrderInfo=null)
+    public function addExWarehouseOrderGoods(array $data, $warehouseId, $orderId,$warehouseOrderSn=null,$exWarehouseOrderSn=null,$exWarehouseOrderInfo=null)
     {
         foreach ($data['goodsId'] as $key => $value) {
             $goodsInfo = $this->entityManager->getRepository(Goods::class)->findOneBy(['goodsId' => $value]);
@@ -62,7 +62,7 @@ class AllExWarehouseOrderGoodsManager
                     $exWarehouseGoods = new AllExWarehouseOrderGoods();
                     $exWarehouseGoods->setAllExWarehouseOrderGoodsId(null);
                     $exWarehouseGoods->setExWarehouseOrderId($orderId);
-                    $exWarehouseGoods->setExWarehouseOrderSn($v->getwarehouseOrderSn());
+                    $exWarehouseGoods->setExWarehouseOrderSn($exWarehouseOrderSn);
                     $exWarehouseGoods->setWarehouseId($warehouseId);
                     if($goodsExNum >= $v->getoutNum()){
                         $exWarehouseGoods->setWarehouseGoodsExNum($v->getoutNum());
@@ -126,7 +126,7 @@ class AllExWarehouseOrderGoodsManager
                     $exWarehouseGoods = new AllExWarehouseOrderGoods();
                     $exWarehouseGoods->setAllExWarehouseOrderGoodsId(null);
                     $exWarehouseGoods->setExWarehouseOrderId($sendOrder->getSendOrderId());
-                    $exWarehouseGoods->setExWarehouseOrderSn($v->getwarehouseOrderSn());
+                    $exWarehouseGoods->setExWarehouseOrderSn($sendOrder->getSendOrderSn());
                     $exWarehouseGoods->setWarehouseId($value['warehouseId']);
                     if($goodsExNum >= $v->getoutNum()){
                         $exWarehouseGoods->setWarehouseGoodsExNum($v->getoutNum());