Browse Source

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

wufeng 2 years ago
parent
commit
ffe4fd12a2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/admin/controller/Purch.php

+ 2 - 2
app/admin/controller/Purch.php

@@ -445,9 +445,9 @@ class Purch extends Base
                 'updatetime' => date("Y-m-d H:i:s"),
             ]);
         if ($upd) {
-            $process = ["order_code" => $cgdNo, "order_id" => $data['id'], "order_status" => $status, "order_type" => 'CGD'];
+            $process = ["order_code" => implode(',', $cgdNo), "order_id" => 0, "order_status" => $status, "order_type" => 'CGD'];
             ProcessOrder::AddProcess($this->post['token'], $process);
-            $order = ["order_code" => $cgdNo, "status" => $data['status'], "action_remark" => $remark, "action_type" => "status"];
+            $order = ["order_code" => implode(',', $cgdNo), "status" => '', "action_remark" => $remark, "action_type" => "status"];
             ActionLog::logAdd($this->post['token'], $order, 'CGD', $status, $this->post);
             return app_show(0, "更新成功");
         } else {