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

app/abutment/controller/Filing.php

@@ -46,11 +46,10 @@ class Filing extends HomeBaseController
             'delivery_place|发货地' => 'require|array|length:3',
             'weight|总重量' => 'require|float|max:99999999.99',
             'supply_area|供货区域' => 'require|number|in:1,2',
-            'pay_way|付款方式' => 'require|number|in:1,2,3',
+            'pay_way|付款方式' => 'require|number|in:0,1,2',
             'remark|采购备注' => 'require|max:255',
             'cost_desc|工艺说明' => 'max:255',
             'good_img|商品图片' => 'require|array|max:10',
-
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());

app/abutment/logic/Filing.php

@@ -138,6 +138,12 @@ class Filing
             ->value('companyName', '');
         if ($companyName == '') return json_show(1005, '该客户不存在');
 
+        $tmp=Db::name('platform')
+            ->where(['is_del'=>0,'id'=>$data['platform_id']])
+            ->field('id')
+            ->findOrEmpty();
+        if(empty($tmp)) return json_show(1005, '该平台不存在');
+
         $res = Db::name('filing')
             ->where(['is_del' => 0, 'id' => $data['id']])
             ->whereIn('status', [0, 2])
@@ -247,8 +253,8 @@ class Filing
                 'orderCode' => $orderCode,
                 'apply_id' => $filing['apply_id'],
                 'apply_name' => $filing['apply_name'],
-                'order_type' => 2,//非库存品
-                'order_source' => 2,//咨询
+                'order_type' => 4,//报备商品
+                'order_source' => 7,//报备转单
                 'platform_id' => 0,//平台id@todo
                 'good_code' => $spuCode,
                 'skuCode' => '',
@@ -266,8 +272,8 @@ class Filing
                 'is_stock' => 0,
                 'customer_code' => $filing['companyCode'],
                 'supplierNo' => $filing['supplierNo'],
-                'zxNo' => '',//@todo 咨询单号
-                'platform_order' => '',//@todo
+                'zxNo' => '',
+                'platform_order' => '',
                 'send_num' => 0,
                 'wsend_num' => $filing['num'],
                 'th_num' => 0,

app/admin/controller/Filing.php

@@ -26,7 +26,7 @@ class Filing extends Base
     //审核
     public function status()
     {
-        $param = $this->request->only(['id', 'status', 'companyCode', 'plat_code' => '', 'service_charge', 'service_proportion'], 'post');
+        $param = $this->request->only(['id', 'status', 'companyCode', 'plat_code' => '', 'service_charge', 'service_proportion','platform_id'], 'post');
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
@@ -34,6 +34,7 @@ class Filing extends Base
             'companyCode|客户' => 'require|length:18',
             'service_charge|服务费' => 'require|float|max:99999999.99',
             'service_proportion|服务费比例' => 'require|float|between:0,100',
+            'platform_id|平台id' => 'require|number|gt:0',
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());