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

app/admin/controller/Goodup.php

@@ -1757,13 +1757,13 @@ class Goodup extends Base
         try {
             $save =Db::name("good_platform")->save($platform);
             if($save){
-                ActionLog::logAdd($this->post['token'], [
+                ActionLog::logAdd(['id'=>$createrid,'nickname'=>$creater], [
                     "order_code" =>$platform['skuCode'],//咨询单详情编号
                     "status" =>$bifore,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "edit"//新建create，编辑edit，更改状态status
                 ], "SPSX", $platform['exam_status'],$platform);
-                ProcessOrder::AddProcess($this->post['token'], [
+                ProcessOrder::AddProcess(['id'=>$createrid,'nickname'=>$creater], [
                     "order_type" => 'SPSX',
                     "order_code" =>$platform['skuCode'],//咨询单详情编号
                     "order_id" => $platform['id'],
@@ -1791,6 +1791,7 @@ class Goodup extends Base
                         unset($good_basic['addtime']);
                         $good_basic['updatetime'] = date('Y-m-d H:i:s');
                         Db::name('good')
+                            ->strict(false)
                             ->where(['spuCode' => $platform['spuCode'], 'is_del' => 0])
                             ->update($good_basic);
                     }

app/admin/controller/Purchin.php

@@ -103,7 +103,7 @@ class Purchin extends Base
             ->where($where)
             ->where($condition)
             ->page($page,$size)
-            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,u.itemid,b.cgderid,b.cgder,b.good_createrid,b.good_creater")
+            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,u.itemid,b.cgder_id,b.cgder,b.good_createrid,b.good_creater")
             ->order("a.addtime desc")
             ->cursor();
         $data=[];