Merge branch 'plm' of wugg/stock into master

app/admin/controller/After.php

@@ -26,8 +26,8 @@ class After extends \app\BaseController
          if(empty($orderout)){
              return error_show(1005,"未找到订单数据");
          }
-        $order= Db::name("sale")->where(["orderCode"=>$order['orderCode'],"is_del"=>0])->find();
-        if(empty($order)){
+        $oder= Db::name("sale")->where(["orderCode"=>$orderout['orderCode'],"is_del"=>0])->find();
+        if(empty($oder)){
             return error_show(1005,"未找到订单数据");
         }
         $errorCode = isset($this->post['errorCode']) &&$this->post['errorCode']!=''?trim($this->post['errorCode']) :"";
@@ -65,12 +65,14 @@ class After extends \app\BaseController
             $in = [
                 "returnCode"=>$returnCode,
                 "outCode"=>$outCode,
-                "orderCode"=> $order['orderCode'],
-                "good_code"=>$order['good_code'],
-                "good_name"=>$order['good_name'],
-                "customer_code"=>$order['customer_code'],
+                "orderCode"=> $oder['orderCode'],
+                "good_code"=>$oder['good_code'],
+                "good_name"=>$oder['good_name'],
+                "customer_code"=>$oder['customer_code'],
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
+
+               // 'total_num'=>$oder['send_num'],
                 'total_num'=>$orderout['send_num'],
                 "error_code"=>$errorCode,
                 "error_num"=>$num,
@@ -79,7 +81,7 @@ class After extends \app\BaseController
                 "error_remark"=>$remark,
                 "remark"=>'',
                 "except_code"=>$except_code,
-                "order_type"=>$order['order_type'],
+                "order_type"=>$orderout['order_type'],
                 "status"=>0,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
@@ -87,9 +89,9 @@ class After extends \app\BaseController
             ];
             $create = Db::name("order_return")->insert($in,true);
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,$order['order_type']==1?'SHD':"ZXSHD",0,$orde);
+            ActionLog::logAdd($this->post['token'],$orde,$orderout['order_type']==1?'SHD':"ZXSHD",0,$orde);
             if($create>0){
-                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>$order['order_type']==1?'SHD':"ZXSHD"];
+                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>$orderout['order_type']==1?'SHD':"ZXSHD"];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return app_show(0,"售后申请单新建成功");

app/admin/controller/Check.php

@@ -108,6 +108,7 @@ public function flist(){
         ->where($condtion)->field("c.id,a.good_code,a.good_name,a.good_desc,a.brand,a.original_price,a.cg_saler,a.good_type,a.market_fee,a.gys_code,a.unit,
                 a.sort_f,a.sort_s,a.sort_t,b.color,b.material,b.specs,b.is_main,b.type_code,b.attribute,b.status as bstatus,a.addtime,c.wsm_code,c.usable_stock,c.warn_stock,a.updatetime,a.cat_id")
         ->page($page,$size)->select();
+   // var_dump(Db::name("good_type")->getLastSql());
     $data=[];
     foreach ($list as $key=>$value){
         $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();