库存

app-ghs/controllers/StockInController.php

@@ -65,10 +65,8 @@ class StockInController extends BaseController
         if (isset($order->inShopId) == false || $order->inShopId != $this->shopId) {
             util::fail('没有权限');
         }
-
         $id = $order->id ?? 0;
         $info = StockInOrderClass::getLockById($id);
-
         StockInOrderClass::cancelOrder($info, $this->adminId);
         util::complete("取消成功");
     }

biz-ghs/order/classes/StockInOrderClass.php

@@ -170,6 +170,7 @@ class StockInOrderClass extends BaseClass
         //流水记录
         $orderData['shopId'] = $shopId;
         $orderData['itemInfo'] = $itemInfo;
+        $orderData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         StockRecordClass::addRecordByOrder($orderData, StockRecordClass::STOCK_RECORD_TYPE_IN_STOCK);
         $outOrderSn = $orderData['outOrderSn'];
         $outShopId = $orderData['outShopId'];
@@ -349,6 +350,7 @@ class StockInOrderClass extends BaseClass
             $itemInfo[$k]['newStock'] = $stockInfo['newStock'];
         }
         $outOrderData['itemInfo'] = $itemInfo;
+        $outOrderData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         StockRecordClass::addRecordByOrder($outOrderData, StockRecordClass::STOCK_RECORD_TYPE_IN_STOCK_CANCEL);
 
         //修改出库订单状态

biz-ghs/order/classes/StockOutOrderClass.php

@@ -5,6 +5,7 @@ namespace bizGhs\order\classes;
 use biz\shop\classes\ShopClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\stock\classes\StockRecordClass;
+use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
 use Yii;
@@ -71,7 +72,7 @@ class StockOutOrderClass extends BaseClass
         if (empty($itemInfo)) {
             util::fail("订单异常");
         }
-        //写流水
+        $orderData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         StockRecordClass::addRecordByOrder($orderData, StockRecordClass::STOCK_RECORD_TYPE_OUT_STOCK);
         if ($action === self::ACTION_CONFIRM) {
             //直接出库=》待入库

biz-ghs/stock/classes/StockRecordClass.php

@@ -6,6 +6,7 @@ use bizGhs\base\classes\BaseClass;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\stock\services\StockRecordService;
+use common\components\dict;
 use common\services\xhItemService;
 
 class StockRecordClass extends BaseClass
@@ -106,7 +107,6 @@ class StockRecordClass extends BaseClass
             $itemNum = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);
             $record['sjId'] = $orderData['sjId'];
             $record['shopId'] = $orderData['shopId'];
-            //增加mainId
             $record['mainId'] = $productData[$productId]['mainId'] ?? 0;
             $record['orderSn'] = $orderData['orderSn'];
             $record['itemId'] = $itemId;
@@ -116,6 +116,7 @@ class StockRecordClass extends BaseClass
             $record['productId'] = $productId;
             $record['newStock'] = $v['newStock'];// 最新库存
             $record['relateName'] = $orderData['relateName'] ?? '';
+            $record['ptStyle'] = $orderData['ptStyle'] ?? dict::getDict('ptStyle', 'ghs');
             self::addRecord($record);
         }
     }