edit

app/mshop/lib/Buy.php

@@ -974,7 +974,7 @@ class Buy
 
     private function show_audit($info, &$result)
     {
-        $order['type'] = 1;
+        $info['type'] = 1;
 
         $goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $info['id']));
 
@@ -982,35 +982,38 @@ class Buy
 
         list($data, $source) = $this->assign($goods, $info, $shop, true);
 
-        if ($data) {
+        if ($info) {
 
             $head = array('序号', '商品编号', '商品名称', '供货商', '订货总数量', '商品计量单位', '订货单总金额');
             $body = array();
             $i = 0;
-            foreach ($data as $k => $v) {
-                foreach ($v as $v1) {
-                    $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
-                    if (isset($goods_info['sku'])) {
-                        $sku = '[' . $goods_info['sku']['string'] . ']';
-                    } else {
-                        $sku = '';
-                    }
-                    $d = array
-                    (
-                        $i+1,
-                        $goods_info['code'],
-                        $goods_info['name'] . $sku,
-                        $this->getSelect($source, $v1['source_id'], $v1['order_goods_id']),
-                        $v1['num'],
-                        $goods_info['unit'],
-                        $v1['p_price'] * $v1['num'],
-                    );
+            if ($data) {
+                foreach ($data as $k => $v) {
+                    foreach ($v as $v1) {
+                        $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
+                        if (isset($goods_info['sku'])) {
+                            $sku = '[' . $goods_info['sku']['string'] . ']';
+                        } else {
+                            $sku = '';
+                        }
+                        $d = array
+                        (
+                            $i+1,
+                            $goods_info['code'],
+                            $goods_info['name'] . $sku,
+                            $this->getSelect($source, $v1['source_id'], $v1['order_goods_id']),
+                            $v1['num'],
+                            $goods_info['unit'],
+                            $v1['p_price'] * $v1['num'],
+                        );
 
-                    $body[] = $d;
+                        $body[] = $d;
 
-                    $i++;
+                        $i++;
+                    }
                 }
             }
+            
             if ($goods) {
                 foreach ($goods as $k => $v) {
                     $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['goods_id'], $v['sku_id']);
@@ -1053,7 +1056,7 @@ class Buy
                 )
             );
 
-            $url = Dever::url('lib/buy.audit_set_commit?json=1&order_id=' . $info['id'], 'mshop');
+            $url = Dever::url('lib/buy.audit_set?json=1&order_id=' . $info['id'], 'mshop');
             $result['审核结果'] = array
             (
                 'type' => 'html',
@@ -1564,7 +1567,7 @@ class Buy
     }
     */
     # 采购订单审核 手动拆单
-    public function audit_set_commit_api()
+    public function audit_set_api()
     {
         //{goods: "2_4_audit_615,2_4_audit_614,-1_-1_audit_617,-1_-1_audit_616,-1_-1_audit_613", audit: "1", audit_text: "1231"}
 
@@ -1577,10 +1580,9 @@ class Buy
         if ($audit > 1 && $info && $info['status'] == 2) {
 
             $shop = Dever::db('shop/info')->find($info['type_id']);
-            
 
-            Dever::db('shop/buy_order')->update(array('where_id' => $info['id'], 'audit' => $audit, 'audit_desc' => $audit_text));
             if ($audit == 2) {
+                Dever::db('shop/buy_order')->update(array('where_id' => $info['id'], 'audit' => $audit, 'audit_desc' => $audit_text));
                 # 成功
                 if (strstr($info['order_num'], '_')) {
                     $temp = explode('_', $info['order_num']);
@@ -1621,6 +1623,7 @@ class Buy
 
                 $this->audit_action($data, $other, $info, $shop, '未选择供货商');
             } else {
+                Dever::db('shop/buy_order')->update(array('where_id' => $info['id'], 'audit' => $audit, 'audit_desc' => $audit_text));
                 # 退款
                 $shop = Dever::db('shop/info')->find($info['type_id']);
                 Dever::load('shop/lib/refund')->set('buy')->apply(1, $shop['id'], $id, false, 3, 0, '未通过审核');

app/shop/src/Excel.php

@@ -244,7 +244,7 @@ class Excel
                             //$store['name'],
 
                             $v2['code'],
-                            $v2['name'],
+                            $v2['name'] . '（'.$goods_info['name'].'）',
                             $sku,
                             $v2['price'],
                             $v2['num'],