Merge branch 'mt' of git.huaml.com:zhh/huahuibao into mt

biz-ghs/order/classes/StockWastageOrderClass.php

@@ -60,7 +60,7 @@ class StockWastageOrderClass extends BaseClass
         $data['mainId'] = $mainId;
 
         //写入订单表
-        $order = self::add($data);
+        $order = self::add($data, true);
         foreach ($ghsItemInfo as $k => $v) {
             $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true);
             $ghsItemInfo[$k]['oldStock'] = $stockInfo['oldStock'];
@@ -75,7 +75,6 @@ class StockWastageOrderClass extends BaseClass
         $orderData['ptStyle'] = $post['ptStyle'] ?? dict::getDict('ptStyle', 'ghs');
         StockRecordClass::addRecordByOrder($orderData, StockRecordClass::STOCK_RECORD_TYPE_WASTAGE);
 
-
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
             util::fail('没有main信息');
@@ -88,6 +87,10 @@ class StockWastageOrderClass extends BaseClass
             $cost = $v['itemCost'] ?? 0;
             $wastage = bcadd($wastage, bcmul($num, $cost, 2), 2);
         }
+
+        $order->cost = $wastage;
+        $order->save();
+
         $currentTotalExpend = bcadd($main->totalExpend, $wastage, 2);
         $main->totalExpend = $currentTotalExpend;
         $currentWast = bcadd($main->totalWast, $wastage, 2);