添加备注字段和修改bug

app/admin/controller/Purchin.php

@@ -783,11 +783,13 @@ class Purchin extends BaseController
                     Db::rollback();
                     return error_show(1002,"验货审核失败");
                 }
+
+                $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
+                $process = ["order_code" => $info['wsm_in_code'], "order_id" => $res, "order_status" => 0, "order_type" => 'RKTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
             }
-            $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
-            $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$res,"order_status"=>0,"order_type"=>'RKTHD'];
-            ProcessOrder::AddProcess($this->post['token'],$process);
+
             Db::commit();
             return app_show(0,"验货审核完成");
         }

app/admin/controller/Sale.php

@@ -672,6 +672,9 @@ class Sale extends Base
         if($sendtype==""){
             return error_show(1003,"参数sendtype不能为空");
         }
+
+        $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']):"";
+
         $orderCode = makeNo("QR");
         $spuCode = $zxinfo['spuCode'];
         $skuCode = "";
@@ -746,7 +749,7 @@ class Sale extends Base
                 "zxNo"=>$bidNo,
                 "platform_order"=>"",
                 "platform_id"=>0,
-                "remark"=>"",
+                "remark"=>$remark,
                 "arrive_time"=>$arrtime,
                 "is_stock"=>0,
                 "is_activity"=>0,