Browse Source

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

wufeng 2 years ago
parent
commit
3674323818
1 changed files with 3 additions and 0 deletions
  1. 3 0
      app/admin/controller/Sale.php

+ 3 - 0
app/admin/controller/Sale.php

@@ -3074,6 +3074,7 @@ class Sale extends Base
 
     }
 
+    //库管发货
     public function outSend(){
        $outCode=isset($this->post['outCode'])&& $this->post['outCode']!=""? trim($this->post['outCode']):"";
        if($outCode==""){
@@ -3095,6 +3096,7 @@ class Sale extends Base
         if($post_code==""){
             return error_show(1004,"参数post_code不能为空");
         }
+        $remark = isset($this->post['remark']) &&$this->post['remark']!="" ? trim($this->post['remark']):"";
         $post_fee = isset($this->post['post_fee']) && $this->post['post_fee']!="" ? floatval($this->post['post_fee']):"";
         $outinfo['post_name'] = $post_name;
         $outinfo['post_code'] = $post_code;
@@ -3103,6 +3105,7 @@ class Sale extends Base
         $old_outinfo_status = $outinfo['status'];
         $outinfo['status'] = 2;
         $outinfo['updatetime'] = date("Y-m-d H:i:s");
+        $outinfo['remark'] = $remark;
 
         Db::startTrans();
         try{