到货

app-hd/controllers/ProductController.php

@@ -384,6 +384,12 @@ class ProductController extends BaseController
             util::fail('超管才能操作');
         }
 
+        $shop = $this->shop;
+        $pfShopId = $shop->pfShopId ?? 0;
+        if (!empty($pfShopId)) {
+            util::fail('请在批发端操作');
+        }
+
         $addData = Yii::$app->request->post('addData', '');
         if (empty($addData)) {
             util::fail('没有花材');

biz-ghs/order/classes/OrderClass.php

@@ -114,8 +114,9 @@ class OrderClass extends BaseClass
         if ($order->stockChange == 1) {
             util::fail('您已操作过了');
         }
-        $sjId = $data['sjId'] ?? 0;
-        $shopId = $data['shopId'] ?? 0;
+        $sjId = $order->sjId ?? 0;
+        $shopId = $order->shopId ?? 0;
+        $mainId = $order->mainId ?? 0;
         //product [{"productId":"3674","num":0,"price":1}]
         $product = $data['product'] ?? '';
         if (empty($product)) {
@@ -162,7 +163,6 @@ class OrderClass extends BaseClass
             $val->xhPrice = $price;
             $val->save();
 
-            Yii::info('数量 num num' . $val->xhPreNum . ' ' . $num . ' ' . bcsub($val->xhPreNum, $num));
             if ($val->xhPreNum > $num) {
                 //客户下单退货数增加
                 $subNum = bcsub($val->xhPreNum, $num);
@@ -183,11 +183,28 @@ class OrderClass extends BaseClass
             $smallNum = 0;
             if ($unitType == dict::getDict('unitType', 'big')) {
                 $bigNum = $num;
+                $itemNum = $num;
             } else {
                 $smallNum = $num;
+                $itemNum = bcdiv($num, $val->ratio, 2);
             }
-            $option = ['relateName' => $customName, 'ptStyle' => dict::getDict('ptStyle', 'ghs')];
-            StockClass::stockSellItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $option);
+
+            $checkStock = true;
+            $stockInfo = ProductClass::decreaseStock($productId, $bigNum, $smallNum, $checkStock);
+            $recordData = [];
+            $recordData['sjId'] = $sjId;
+            $recordData['shopId'] = $shopId;
+            $recordData['mainId'] = $mainId;
+            $recordData['itemId'] = $val->itemId;
+            $recordData['itemNum'] = $itemNum;
+            $recordData['oldStock'] = $stockInfo['oldStock'];
+            $recordData['newStock'] = $stockInfo['newStock'];
+            $recordData['productId'] = $productId;
+            $recordData['orderSn'] = $orderSn;
+            $recordData['relateName'] = $customName;
+            $recordData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
+            StockRecordClass::addSellStockOrderRecord($recordData);
+
         }
 
         $order->itemPrice = $itemPrice;

sql.sql

@@ -1038,4 +1038,5 @@ ALTER TABLE xhPlantCg ADD staffName VARCHAR(20) NOT NULL DEFAULT '' COMMENT '员
 ALTER TABLE xhClear ADD customShopId INT NOT NULL DEFAULT 0 COMMENT '客户门店id' AFTER `customId`;
 ALTER TABLE xhClear ADD ghsShopId INT NOT NULL DEFAULT 0 COMMENT '供货商门店id' AFTER `ghsId`;
 ALTER TABLE xhGhsOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `shopId`;
-ALTER TABLE xhCgItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `itemId`;
+ALTER TABLE xhCgItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `itemId`;
+ALTER TABLE xhGhsOrderItem MODIFY `itemId` INT(11) NOT NULL DEFAULT '0' COMMENT '平台花材id';