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

app/abutment/controller/Consult.php

@@ -737,8 +737,7 @@ class Consult extends HomeBaseController
         $work_day = isset($this->post['work_day']) && $this->post['work_day'] != "" ? intval($this->post['work_day']) : "";
         $delivery_day = isset($this->post['delivery_day']) && $this->post['delivery_day'] != "" ? intval($this->post['delivery_day']) : "";
         $good_img = isset($this->post['good_img']) && $this->post['good_img'] != "" ? $this->post['good_img'] : [];
-        $expire_day = isset($this->post['expire_day']) && $this->post['expire_day'] != "" ? intval($this->post['expire_day'])
-            : "";
+        $expire_day = isset($this->post['expire_day']) && $this->post['expire_day'] != "" ? intval($this->post['expire_day']) : "";
         $origin_place = isset($this->post['origin_place']) && $this->post['origin_place'] != "" ? trim($this->post['origin_place']) : "";
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
         $pay_way = isset($this->post['pay_way']) && $this->post['pay_way'] != "" ? intval($this->post['pay_way']) : "";
@@ -833,6 +832,10 @@ class Consult extends HomeBaseController
         }
 
 
+        $supplier = Db::name('supplier')
+            ->field('id,person,personid')
+            ->where('code',$supplierNo)
+            ->findOrEmpty();
         $data = [
             "bidNo" => $bidNo,
             "infoNo" => $infoNo,
@@ -882,7 +885,9 @@ class Consult extends HomeBaseController
             "is_del" => 0,
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s"),
-            'delivery_place' => $delivery_place//发货地
+            'delivery_place' => $delivery_place,//发货地
+            'cgder' => $supplier['person'] ?? '',
+            'cgderid' => $supplier['personid'] ?? 0,
         ];
         Db::startTrans();
         try {

app/admin/controller/Consult.php

@@ -709,8 +709,7 @@ class Consult extends Base
         $work_day = isset($this->post['work_day'])&&$this->post['work_day']!=""? intval($this->post['work_day']):"";
         $delivery_day = isset($this->post['delivery_day'])&&$this->post['delivery_day']!=""? intval($this->post['delivery_day']):"";
         $good_img = isset($this->post['good_img'])&&$this->post['good_img']!=""? $this->post['good_img']:[];
-        $expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day'])
-            :"";
+        $expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day']) :"";
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!=""? trim($this->post['origin_place']):"";
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""? trim($this->post['supplierNo']):"";
         $pay_way = isset($this->post['pay_way'])&&$this->post['pay_way']!=""? intval($this->post['pay_way']):"";
@@ -807,6 +806,10 @@ class Consult extends Base
 
         }
 
+        $supplier = Db::name('supplier')
+            ->field('id,person,personid')
+            ->where('code',$supplierNo)
+            ->findOrEmpty();
 
         $data=[
             "bidNo"=>$bidNo,
@@ -857,7 +860,9 @@ class Consult extends Base
             "is_del"=>0,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
-            'delivery_place'=>$delivery_place//发货地
+            'delivery_place'=>$delivery_place,//发货地
+            'cgder' => $supplier['person'] ?? '',
+            'cgderid' => $supplier['personid'] ?? 0,
         ];
         Db::startTrans();
         try{