修复bug

module/Store/src/Repository/AllWarehouseOrderGoodsRepository.php

@@ -26,13 +26,13 @@ class AllWarehouseOrderGoodsRepository extends EntityRepository
      * @param $goodsName
      * @return mixed
      */
-    public function findWarehouseGoodsIdSearch($search = [])
+    public function findWarehouseGoodsIdSearch($search = [],$orderBy="ASC")
     {
         //当定义为某个字段时，输出的是数组
         $query = $this->getEntityManager()->createQueryBuilder()
             ->select('o')
             ->from(AllWarehouseOrderGoods::class, 'o')
-            ->orderBy("o.addTime","ASC");
+            ->orderBy("o.addTime",$orderBy);
         $this->querySearchData($search, $query);
         $goodsIdResult = $query->getQuery()->getResult();
         return $goodsIdResult;

module/Store/src/Service/AllExWarehouseOrderGoodsManager.php

@@ -52,9 +52,9 @@ class AllExWarehouseOrderGoodsManager
             $goodsInfo = $this->entityManager->getRepository(Goods::class)->findOneBy(['goodsId' => $value]);
             $goodsExNum=$data['goodsExNum'][$key];
             if($warehouseOrderSn){
-                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value,'warehouse_order_sn'=>$warehouseOrderSn,'warehouse_id'=>$warehouseId,'out_num'=>1]);
+                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value,'warehouse_order_sn'=>$warehouseOrderSn,'warehouse_id'=>$warehouseId,'out_num'=>1],"DESC");
             }else{
-                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value,'warehouse_id'=>$warehouseId,'out_num'=>1]);
+                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value,'warehouse_id'=>$warehouseId,'out_num'=>1],"DESC");
             }
 
             foreach ($orderGoodsInfo as $k=>$v){
@@ -68,7 +68,7 @@ class AllExWarehouseOrderGoodsManager
                         $exWarehouseGoods->setWarehouseGoodsExNum($v->getoutNum());
                         $exWarehouseGoods->setWarehouseGoodsTax(0);
                         $exWarehouseGoods->setWarehouseGoodsAmount($v->getoutNum() * $data['goodsPrice'][$key] + $data['goodsTax'][$key]);
-                        $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->updateWarehouseGoodsStock(['goodsId' => $value,'allWarehouseOrderGoodsId'=>$v->getallWarehouseOrderGoodsId(),'sendNum'=>$v->getoutNum()]);
+                        $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->updateOutNum(['goodsId' => $value,'allWarehouseOrderGoodsId'=>$v->getallWarehouseOrderGoodsId(),'sendNum'=>$v->getoutNum()]);
                         $goodsExNum = $goodsExNum - $v->getoutNum();
                     }else{
                         $exWarehouseGoods->setWarehouseGoodsExNum($goodsExNum);
@@ -115,9 +115,9 @@ class AllExWarehouseOrderGoodsManager
 
             $goodsExNum=$value['sendNum'];
             if($warehouseOrderSn){
-                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value['goodsId'],'warehouse_order_sn'=>$warehouseOrderSn,'warehouse_id'=>$value['warehouseId'],'out_num'=>1]);
+                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value['goodsId'],'warehouse_order_sn'=>$warehouseOrderSn,'warehouse_id'=>$value['warehouseId'],'out_num'=>1],"DESC");
             }else{
-                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value['goodsId'],'warehouse_id'=>$value['warehouseId'],'out_num'=>1]);
+                $orderGoodsInfo = $this->entityManager->getRepository(AllWarehouseOrderGoods::class)->findWarehouseGoodsIdSearch(['goods_id' => $value['goodsId'],'warehouse_id'=>$value['warehouseId'],'out_num'=>1],"DESC");
             }
 
             foreach ($orderGoodsInfo as $k=>$v){
@@ -143,7 +143,7 @@ class AllExWarehouseOrderGoodsManager
                     }
 
                     $exWarehouseGoods->setWarehouseGoodsPrice($salesOrder->getsalesGoodsPrice());
-                    $exWarehouseGoods->setGoodsId($value);
+                    $exWarehouseGoods->setGoodsId($value['goodsId']);
                     $exWarehouseGoods->setGoodsName($goodsInfo->getGoodsName());
                     $exWarehouseGoods->setGoodsNumber($goodsInfo->getGoodsNumber());
                     $exWarehouseGoods->setGoodsSpec($goodsInfo->getGoodsSpec());