修改花材

biz-ghs/product/classes/ProductClass.php

@@ -850,7 +850,7 @@ class ProductClass extends BaseClass
     public static function addStock($productId, $itemNumBundle, $itemNumPiece)
     {
         //小单位库存不再考虑 ssh 20230303
-        $itemNumPiece = 0;
+        //$itemNumPiece = 0;
 
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
@@ -880,7 +880,6 @@ class ProductClass extends BaseClass
     //加路上库存
     public static function addOnStockByItemNum($productId, $itemNum)
     {
-        //小单位库存不再考虑 ssh 20230303
         $key = self::LOCK_ON_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {
@@ -933,7 +932,7 @@ class ProductClass extends BaseClass
     {
 
         //小单位库存不再考虑 ssh 20230303
-        $itemNumPiece = 0;
+        //$itemNumPiece = 0;
 
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
@@ -1472,6 +1471,9 @@ class ProductClass extends BaseClass
                 //增加盘点记录 2021.7.27
                 $ratio = $product->ratio ?? 0;
                 $formNum = ProductClass::formatStock($data['stock'], $ratio);
+                echo $data['stock'];
+                print_r($formNum);
+                die;
                 $ghsItemInfo = [['productId' => $product->id, 'bigNum' => $formNum['bigNum'], 'smallNum' => $formNum['smallNum'],]];
                 $pdData = [];
                 $pdData['itemInfo'] = $ghsItemInfo;

biz-hd/purchase/classes/PurchaseClass.php

@@ -205,7 +205,7 @@ class PurchaseClass extends BaseClass
         $purchaseItem = PurchaseItemClass::getAllByCondition(['orderSn' => $orderSn], null, "*");
         foreach ($purchaseItem as $v) {
             //小单位库存不考虑入库 ssh 202310
-            $itemNum = intval($v['itemNum']);
+            $itemNum = $v['itemNum'];
             if ($itemNum > 0) {
                 $productId = $v['productId'];
                 $stockInfo = ProductClass::addStockByItemNum($v['productId'], $itemNum);