shish 5 years ago
parent
commit
0d64be2660

+ 0 - 4
app-ghs/controllers/StockOutController.php

@@ -41,9 +41,7 @@ class StockOutController extends BaseController
         $post['outTime'] = $date;
         $action = $post['action'] ?? 'wait'; //confirm(直接出库) wait(待出库中)
         $post['action'] = $action;
-        //判断 入库的门店ID是否有效
         $post['inShopId'] = $inShopId;
-        //是否判断 inShopId 下还有未完成出库的订单?
         $check = StockOutOrderClass::getByCondition(['outShopId' => $this->shopId, 'inShopId' => $inShopId, 'status' => StockOutOrderClass::STATUS_WAIT]);
         if ($check) {
             util::fail('还有待出库的订单');
@@ -86,8 +84,6 @@ class StockOutController extends BaseController
         }
     }
 
-    //
-
     //出库详情 linqh 2021.1.23
     public function actionDetail()
     {

+ 3 - 10
biz-ghs/order/classes/StockOutOrderClass.php

@@ -5,23 +5,21 @@ namespace bizGhs\order\classes;
 use biz\shop\classes\ShopClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\stock\classes\StockRecordClass;
-use bizGhs\stock\services\StockRecordService;
 use common\components\orderSn;
 use common\components\util;
-use common\services\xhItemService;
 use Yii;
 use bizGhs\base\classes\BaseClass;
 use bizGhs\order\traits\OrderTrait;
 
 class StockOutOrderClass extends BaseClass
 {
+
     use OrderTrait;
     const STATUS_WAIT = 1; //待出库
     const STATUS_COMPLETE = 2; //已出库
     const STATUS_CANCEL = 3; //取消出库
     const STATUS_BACK = 4; //退回,取消入库 (暂不用)
 
-
     const ACTION_WAIT = 'wait';
     const ACTION_CONFIRM = 'confirm'; //直接入库
 
@@ -33,8 +31,7 @@ class StockOutOrderClass extends BaseClass
 
     public static $baseFile = '\bizGhs\order\models\StockOutOrder';
 
-    //2021.1.23 linqh 新增出库订单:
-    // 一、保存订单表和订单详情表
+    //2021.1.23 linqh 新增出库订单
     public static function addOrder($data)
     {
         $action = $data['action'];
@@ -63,7 +60,6 @@ class StockOutOrderClass extends BaseClass
             $batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
             StockOutOrderItemClass::batchAddOrderItem($batchData);
 
-
             $orderData = self::getOrderDetail($orderSn, $data['outShopId']);
             $orderData['shopId'] = $data['outShopId'];
             $itemInfo = $orderData['itemInfo'] ?? [];
@@ -84,7 +80,6 @@ class StockOutOrderClass extends BaseClass
         } catch (\Exception $exception) {
             $transaction->rollBack();
             util::fail('保存失败' . $exception->getMessage());
-            //钉钉告警?
         }
 
     }
@@ -236,9 +231,6 @@ class StockOutOrderClass extends BaseClass
     public static function groupOrderItem($ghsItemInfo, $orderSn)
     {
         $productData = self::getProductMapData($ghsItemInfo);
-        //$itemIds =  array_column($productData,'itemId');
-        //$itemData = xhItemService::getByIds($itemIds);
-        //$itemData = array_column($itemData, NULL, 'id');
         //写入详情表
         $batchData = [];
         foreach ($ghsItemInfo as $v) {
@@ -289,4 +281,5 @@ class StockOutOrderClass extends BaseClass
     {
         return self::$statusMap[$status] ?? '';
     }
+
 }