Преглед на файлове

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

wufeng преди 2 години
родител
ревизия
ff41646d4e
променени са 1 файла, в които са добавени 15 реда и са изтрити 15 реда
  1. 15 15
      app/admin/controller/Orderback.php

+ 15 - 15
app/admin/controller/Orderback.php

@@ -292,31 +292,31 @@ class Orderback extends \app\BaseController
 
         $normal_num=isset($this->post["normal_num"])&&$this->post["normal_num"]!=""?intval($this->post["normal_num"])
             :"";
-        $defective_wsm=isset($this->post["defective_wsm"])&&$this->post["defective_wsm"]!=""?trim($this->post["defective_wsm"]):"";
+//        $defective_wsm=isset($this->post["defective_wsm"])&&$this->post["defective_wsm"]!=""?trim($this->post["defective_wsm"]):"";
 
-        $defective_num=isset($this->post["defective_num"])&&$this->post["defective_num"]!==""?intval($this->post["defective_num"]):"";
-        $loss_num=isset($this->post["loss_num"])&&$this->post["loss_num"]!=""?intval($this->post["loss_num"]):"";
+//        $defective_num=isset($this->post["defective_num"])&&$this->post["defective_num"]!==""?intval($this->post["defective_num"]):"";
+//        $loss_num=isset($this->post["loss_num"])&&$this->post["loss_num"]!=""?intval($this->post["loss_num"]):"";
         if($status==4){
-            if($defective_num===""){
-                return error_show(1004,"参数defective_num不能为空");
-            }
-            if($loss_num===""){
-                return error_show(1004,"参数loss_num不能为空");
-            }
+//            if($defective_num===""){
+//                return error_show(1004,"参数defective_num不能为空");
+//            }
+//            if($loss_num===""){
+//                return error_show(1004,"参数loss_num不能为空");
+//            }
             if($normal_num===""){
                 return error_show(1004,"参数normal_num不能为空");
             }
-            if($defective_wsm===""){
-                return error_show(1004,"参数defective_wsm不能为空");
-            }
+//            if($defective_wsm===""){
+//                return error_show(1004,"参数defective_wsm不能为空");
+//            }
             if($return_wsm===""){
                 return error_show(1004,"参数return_wsm不能为空");
             }
             $info['return_wsm']=$return_wsm;
-            $info['loss_num']=$loss_num;
             $info['normal_num']=$normal_num;
-            $info['defective_wsm']=$defective_wsm;
-            $info['defective_num']=$defective_num;
+//            $info['loss_num']=$loss_num;//order_back表里没有这三个字段,不知道是干嘛的
+//            $info['defective_wsm']=$defective_wsm;
+//            $info['defective_num']=$defective_num;
         }
         $remark= isset($this->post['remark']) && $this->post['remark']!="" ? trim($this->post['remark']):"";
         Db::startTrans();