Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/Purch.php

@@ -134,6 +134,7 @@ class Purch extends \app\BaseController
         if(empty($data)){
             return error_show(1004,"未找到数据");
         }
+        $dom = Db::name("purchease_diff")->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
         $goon = Db::name('good')->where(['good_code'=>$data['good_code']])->field("cat_id")->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
@@ -173,6 +174,8 @@ class Purch extends \app\BaseController
             }
             $data['feedback'] = $feed;
             $data['can'] = $int;
+            $data['var'] = $dom;
+
         }
         return app_show(0,"获取成功",$data);
     }

app/admin/controller/Sale.php

@@ -298,7 +298,7 @@ class Sale extends BaseController
                     $iten['wsm_code'] = $ion['wsm_code'];
                     $iten['stock_id'] =0;
                     $iten['num'] = $ion['num'];
-                    $iten['status'] = $ion['status'];
+                    $iten['status'] = 1;
                     $iten['sale_price'] = $ion['sale_price'];
                     isset($ion['id']) && $ion['id'] !== "" ? '' : $iten['addtime'] = date("Y-m-d H:i:s");
                     $iten['updatetime'] = date("Y-m-d H:i:s");