优化取消工单流程

biz-hd/order/classes/OrderGoodsClass.php

@@ -224,11 +224,11 @@ class OrderGoodsClass extends BaseClass
                 //加库存
                 $stockInfo = ProductClass::addStockByItemNum($v['productId'],$v['itemNum']);
                 //加流水记录
-                $record = $v;
-                $record['oldStock'] = $stockInfo['oldStock'];
-                $record['newStock'] = $stockInfo['newStock'];
-                unset($record['id']);
-                StockRecordClass::cancelMakeGoodsWastage($record);
+                $wastageRecord = $v;
+                $wastageRecord['oldStock'] = $stockInfo['oldStock'];
+                $wastageRecord['newStock'] = $stockInfo['newStock'];
+                unset($wastageRecord['id']);
+                StockRecordClass::cancelMakeGoodsWastage($wastageRecord);
             }
         }
         //是否有消耗
@@ -237,15 +237,15 @@ class OrderGoodsClass extends BaseClass
         $whereConsume['recordType'] = StockRecordClass::STOCK_RECORD_TYPE_GOODS_CONSUME;
         $consumeDatas = StockRecordClass::getAllByCondition($whereConsume,null,"*");
         if($consumeDatas){
-            foreach ($consumeDatas as $v){
+            foreach ($consumeDatas as $c){
                 //加库存
-                $stockInfo = ProductClass::addStockByItemNum($v['productId'],$v['itemNum']);
+                $stockInfo = ProductClass::addStockByItemNum($c['productId'],$c['itemNum']);
                 //加流水记录
-                $record = $v;
-                $record['oldStock'] = $stockInfo['oldStock'];
-                $record['newStock'] = $stockInfo['newStock'];
-                unset($record['id']);
-                StockRecordClass::cancelMakeGoodsConsume($record);
+                $consumeRecord = $c;
+                $consumeRecord['oldStock'] = $stockInfo['oldStock'];
+                $consumeRecord['newStock'] = $stockInfo['newStock'];
+                unset($consumeRecord['id']);
+                StockRecordClass::cancelMakeGoodsConsume($consumeRecord);
             }
         }