shish 4 년 전
부모
커밋
e937055806
2개의 변경된 파일3개의 추가작업 그리고 33개의 파일을 삭제
  1. 0 28
      biz-hd/purchase/classes/PurchaseClass.php
  2. 3 5
      biz-hd/purchase/services/PurchaseService.php

+ 0 - 28
biz-hd/purchase/classes/PurchaseClass.php

@@ -403,7 +403,6 @@ class PurchaseClass extends BaseClass
 
         //预订单需要增加服务费
         $book = $data['book'] ?? 0;
-        $stockMayChange = true;
         if ($book == 1) {
             $kiloFee = $ghs['kiloFee'] ?? 0;
             $miniKilo = $ghs['miniKilo'] ?? 0;
@@ -414,7 +413,6 @@ class PurchaseClass extends BaseClass
             $data['kiloFee'] = $kiloFee;
             $data['miniKilo'] = $miniKilo;
 
-            $stockMayChange = false;
             $data['stockChange'] = 0;
         }
 
@@ -511,32 +509,6 @@ class PurchaseClass extends BaseClass
                     }
                 }
             }
-            //库存变化
-            if ($stockMayChange == true) {
-                // $checkStock = true;
-                $productId = $productVal['productId'] ?? 0;
-                $itemNum = $productVal['itemNum'] ?? 0;
-                $bigNum = $proDuctVal['bigNum'] ?? 0;
-                $smallNum = $proDuctVal['smallNum'] ?? 0;
-                $ptItemId = $proDuctVal['itemId'] ?? 0;
-                // 加库存
-                $stockInfo = ProductClass::addStock($productId, $bigNum, $smallNum);
-                //记录库存流水
-                $recordData = [];
-                $recordData['sjId'] = $data['sjId'] ?? 0;
-                $recordData['shopId'] = $data['shopId'] ?? 0;
-                //增加中央ID
-                $recordData['mainId'] = $data['mainId'] ?? 0;
-                $recordData['itemId'] = $ptItemId;
-                $recordData['itemNum'] = $itemNum;
-                $recordData['oldStock'] = $stockInfo['oldStock'];
-                $recordData['newStock'] = $stockInfo['newStock'];
-                $recordData['productId'] = $productId;
-                $recordData['orderSn'] = $orderSn;
-                $recordData['relateName'] = $ghs['name'] ?? '';
-                //采购流水记录
-                StockRecordClass::addPurchaseOrderRecord($recordData);
-            }
         }
 
         $shop = ShopClass::getLockById($shopId);

+ 3 - 5
biz-hd/purchase/services/PurchaseService.php

@@ -320,11 +320,8 @@ class PurchaseService extends BaseService
 
         //零售采购单状态变化
         $info->payWay = $payWay;
-        if ($book == 1) {
-            $info->status = PurchaseClass::STATUS_UN_SEND;
-        } else {
-            $info->status = PurchaseClass::STATUS_COMPLETE;
-        }
+        $info->status = $book == 1 ? PurchaseClass::STATUS_UN_SEND : PurchaseClass::STATUS_COMPLETE;
+
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             //欠款支付
             $info->debt = 1;
@@ -368,6 +365,7 @@ class PurchaseService extends BaseService
                 $recordData['newStock'] = $stockInfo['newStock'];
                 $recordData['productId'] = $v['productId'];
                 $recordData['orderSn'] = $orderSn;
+                $recordData['relateName'] = $info->ghsName ?? '';
                 StockRecordClass::addPurchaseOrderRecord($recordData);
             }
             $info->stockChange = 1;