没有找到入库门店

app-ghs/controllers/StockOutController.php

@@ -190,11 +190,8 @@ class StockOutController extends BaseController
             }
             $post['itemInfo'] = $ghsItemInfo;
             $order = StockOutOrderClass::addOrder($post);
-            if ($order) {
-                $transaction->commit();
-                util::success($order);
-            }
-            util::fail('出库失败');
+            $transaction->commit();
+            util::success($order);
         } catch (\Exception $exception) {
             $transaction->rollBack();
             util::fail('出库失败');

biz-ghs/order/classes/StockOutOrderClass.php

@@ -82,8 +82,20 @@ class StockOutOrderClass extends BaseClass
         $orderData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         StockRecordClass::addRecordByOrder($orderData, StockRecordClass::STOCK_RECORD_TYPE_OUT_STOCK);
         if ($action === self::ACTION_CONFIRM) {
-            //直接出库=》待入库
-            self::confirmOrder($orderSn, $data['outShopId'], $data['adminId']);
+            $adminId = $data['adminId'] ?? 0;
+            //直接出库，并且在对方门店生成待入库单
+            $inOrder = self::confirmOrder($orderSn, $data['outShopId'], $adminId);
+            $confirmIn = $data['confirmIn'] ?? 0;
+            //直接确认入库
+            if ($confirmIn == 1) {
+                $inOrderSn = $inOrder['orderSn'] ?? '';
+                $inShopId = $inOrder['inShopId'] ?? 0;
+                $inShop = ShopClass::getById($inShopId, true);
+                if (empty($inShop)) {
+                    util::fail('没有找到入库门店');
+                }
+                StockInOrderClass::confirmOrder($inOrderSn, $inShop, $adminId);
+            }
         }
         return $order;
     }
@@ -108,30 +120,22 @@ class StockOutOrderClass extends BaseClass
             util::fail("订单已处理");
         }
         $orderId = $orderData['id'] ?? 0;
-        $connection = Yii::$app->db;
-        $transaction = $connection->beginTransaction();
-        try {
-            //修改状态
-            self::updateById($orderId, $data);
-            $itemInfo = $orderData['itemInfo'] ?? [];
-            if (empty($itemInfo)) {
-                $transaction->rollBack();
-                util::fail("订单异常");
-            }
-            $orderData['shopId'] = $shopId;
-            //写入一条数据到入库门店的入库订单表，生成入库订单号
-            $inOrderData = StockInOrderClass::addOrder($orderData);
-            $inOrderSn = $inOrderData['orderSn'];
-            //更新入库订单号
-            self::updateById($orderId, ['inOrderSn' => $inOrderSn]);
-            //完成，提交事务
-            $transaction->commit();
-        } catch (\Exception $exception) {
-            $transaction->rollBack();
-            Yii::warning("stock out :" . $exception->getMessage());
-            util::fail("操作失败");
-        }
 
+        //修改状态
+        self::updateById($orderId, $data);
+        $itemInfo = $orderData['itemInfo'] ?? [];
+        if (empty($itemInfo)) {
+
+            util::fail("订单异常");
+        }
+        $orderData['shopId'] = $shopId;
+        //写入一条数据到入库门店的入库订单表，生成入库订单号
+        $inOrderData = StockInOrderClass::addOrder($orderData);
+        $inOrderSn = $inOrderData['orderSn'];
+        //更新入库订单号
+        self::updateById($orderId, ['inOrderSn' => $inOrderSn]);
+        //完成，提交事务
+        return $inOrderData;
     }
 
     //2021.1.23. lqh 取消出库 ：