Переглянути джерело

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 роки тому
батько
коміт
11d3e25c5a
1 змінених файлів з 6 додано та 6 видалено
  1. 6 6
      app/abutment/logic/Filing.php

+ 6 - 6
app/abutment/logic/Filing.php

@@ -115,7 +115,7 @@ class Filing
                 return explode(',', $val);
             })->withAttr('delivery_place', function ($val) {
                 return explode(',', $val);
-            })->withAttr('cat_info', function ($val,$da) {
+            })->withAttr('cat_info', function ($val, $da) {
                 return made($da['cat_id']);
             })
             ->findOrEmpty();
@@ -138,11 +138,11 @@ class Filing
             ->value('companyName', '');
         if ($companyName == '') return json_show(1005, '该客户不存在');
 
-        $tmp=Db::name('platform')
-            ->where(['is_del'=>0,'id'=>$data['platform_id']])
+        $tmp = Db::name('platform')
+            ->where(['is_del' => 0, 'id' => $data['platform_id']])
             ->field('id')
             ->findOrEmpty();
-        if(empty($tmp)) return json_show(1005, '该平台不存在');
+        if (empty($tmp)) return json_show(1005, '该平台不存在');
 
         $res = Db::name('filing')
             ->where(['is_del' => 0, 'id' => $data['id']])
@@ -215,7 +215,7 @@ class Filing
                     'moq' => 1,
                     'customized' => $filing['make_day'],
                     'tax' => $filing['tax'],
-                    'platform_id' => 0,//平台???@todo
+                    'platform_id' => $filing['platform_id'],
                     'supplierNo' => $filing['supplierNo'],
                     'is_auth' => 0,
                     'craft_desc' => $filing['good_name'],
@@ -255,7 +255,7 @@ class Filing
                 'apply_name' => $filing['apply_name'],
                 'order_type' => 4,//报备商品
                 'order_source' => 7,//报备转单
-                'platform_id' => 0,//平台id@todo
+                'platform_id' => $filing['platform_id'],
                 'good_code' => $spuCode,
                 'skuCode' => '',
                 'cat_id' => $filing['cat_id'],