小单位

biz-ghs/order/classes/OrderItemClass.php

@@ -114,22 +114,24 @@ class OrderItemClass extends BaseClass
             $weight = bcadd($w, $weight, 2);
 
             if ($stockMayChange == true) {
-
-                $checkStock = true;
-                $stockInfo = ProductClass::decreaseStock($productId, $bigNum, $smallNum, $checkStock);
-                $recordData = [];
-                $recordData['sjId'] = $post['sjId'] ?? 0;
-                $recordData['shopId'] = $post['shopId'] ?? 0;
-                $recordData['mainId'] = $post['mainId'] ?? 0;
-                $recordData['itemId'] = $val['itemId'] ?? 0;
-                $recordData['itemNum'] = $itemNum;
-                $recordData['oldStock'] = $stockInfo['oldStock'];
-                $recordData['newStock'] = $stockInfo['newStock'];
-                $recordData['productId'] = $productId;
-                $recordData['orderSn'] = $orderSn;
-                $recordData['relateName'] = $post['customName'] ?? '';
-                $recordData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
-                StockRecordClass::addSellStockOrderRecord($recordData);
+                //小单位花材开单不再扣库存
+                if (intval($itemNum) > 0) {
+                    $checkStock = true;
+                    $stockInfo = ProductClass::decreaseStock($productId, $bigNum, $smallNum, $checkStock);
+                    $recordData = [];
+                    $recordData['sjId'] = $post['sjId'] ?? 0;
+                    $recordData['shopId'] = $post['shopId'] ?? 0;
+                    $recordData['mainId'] = $post['mainId'] ?? 0;
+                    $recordData['itemId'] = $val['itemId'] ?? 0;
+                    $recordData['itemNum'] = intval($itemNum);
+                    $recordData['oldStock'] = $stockInfo['oldStock'];
+                    $recordData['newStock'] = $stockInfo['newStock'];
+                    $recordData['productId'] = $productId;
+                    $recordData['orderSn'] = $orderSn;
+                    $recordData['relateName'] = $post['customName'] ?? '';
+                    $recordData['ptStyle'] = dict::getDict('ptStyle', 'ghs');
+                    StockRecordClass::addSellStockOrderRecord($recordData);
+                }
             }
         }
         $respond['weight'] = $weight;

biz-ghs/product/classes/ProductClass.php

@@ -629,15 +629,11 @@ class ProductClass extends BaseClass
 
 
     //加库存，允许负库存，负数数量（盘点时）
-
-    /**
-     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
-     * @param $itemNumBundle  花材数量（扎）
-     * @param $itemNumPiece  花材数量(支)
-     * @return mixed
-     */
     public static function addStock($productId, $itemNumBundle, $itemNumPiece)
     {
+        //小单位库存不再考虑 ssh 20230303
+        $itemNumPiece = 0;
+
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {
@@ -665,15 +661,12 @@ class ProductClass extends BaseClass
 
 
     //todo 库存修改 加锁
-
-    /**
-     * 对商品ID 加库存
-     * @param $productId  商品ID
-     * @param $itemNum  数量
-     * @return mixed
-     */
+    //对商品ID 加库存
     public static function addStockByItemNum($productId, $itemNum)
     {
+        //小单位库存不再考虑 ssh 20230303
+        $itemNum = intval($itemNum);
+
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {
@@ -695,16 +688,13 @@ class ProductClass extends BaseClass
     }
 
     //减库存,允许负库存，负数数量（盘点时）
-
-    /**
-     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
-     * @param $itemNumBundle  花材数量（扎）
-     * @param $itemNumPiece  花材数量(支)
-     * @param $checkStock boolean 是否需要判断库存
-     * @return mixed
-     */
+    //checkStock boolean 是否需要判断库存
     public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece, $checkStock = false)
     {
+
+        //小单位库存不再考虑 ssh 20230303
+        $itemNumPiece = 0;
+
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {
@@ -744,12 +734,6 @@ class ProductClass extends BaseClass
 
 
     //根据数量减库存
-
-    /**
-     * @param $productId
-     * @param $itemNum
-     * @return mixed  返回减之前的库存，和减之后的库存
-     */
     public static function decreaseStockByItemNum($productId, $itemNum, $checkStock = false)
     {
         $key = self::LOCK_STOCK . '_' . $productId;