1221

app/admin/controller/Good.php

@@ -323,14 +323,20 @@ class Good extends \app\BaseController
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function Stat(){
-        $condition =["is_del"=>0];
+        $condition =[["is_del"=>0]];
         $wsm_code = isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']):"";
         if($wsm_code!=""){
-          $condition["wsm_code"] = $wsm_code;
+         //$condition["wsm_code"] = $wsm_code;
+            $condition[]=["wsm_code","=",$wsm_code];
+        }
+        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
+        if($suplierNo!==""){
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+            $condition[]=["wsm_code","in",$wsmcode];
         }
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
         if($type_code!=""){
-            $condition["good_type_code"] = $type_code;
+            $condition[] = ["good_type_code","=",$type_code];
         }
         $statlist = Db::name("good_stock")->where($condition)->field("sum(wait_in_stock) as wait_in_stock,sum(wait_out_stock) as wait_out_stock ,sum(usable_stock) as usable_stock,sum(intra_stock) as intra_stock,sum(total_stock) as total_stock,sum(warn_stock) as warn_stock")->find();
         return app_show(0,"获取成功",$statlist);

app/admin/controller/Sale.php

@@ -73,18 +73,18 @@ public function create(){
                 $iten=[];
                 $iten['orderCode']=$orderCode;
                 $iten['wsm_code']=$ion['wsm_code'];
-                $iten['stock_id']=$ion['stock_id'];
+                $iten['stock_id']="";
                 $iten['num']=$ion['num'];
-                $iten['status']=$ion['status'];
-                $iten['sale_price']=$ion['sale_price'];
+                $iten['status']=0;
+                $iten['sale_price']=0;
                 $iten['addtime'] =date("Y-m-d H:i:s");
                 $iten['updatetime'] =date("Y-m-d H:i:s");
                 $inn[]=$iten;
             }
-            if($vi['usable_stock']<$iten['num']){
-                Db::rollback();
-                return error_show(1002,"超出库存数量");
-            }
+//            if($vi['usable_stock']<$iten['num']){
+//                Db::rollback();
+//                return error_show(1002,"超出库存数量");
+//            }
             $vp= Db::name('sale_info')->insertAll($inn);
        foreach ($va as $value){
         $temp=[];
@@ -253,20 +253,20 @@ public function info(){
     if($id==""){
         return error_show(1002,"参数id不能为空");
     }
-    $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']) :"";
-    if($wsm_code==""){
-        return error_show(1003,"仓库code不能存在");
-    }
+ //  $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']) :"";
+//    if($wsm_code==""){
+//        return error_show(1003,"仓库code不能存在");
+//    }
     $einfo = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->field('good_code,good_name,customer_code,orderCode')->find();
     if(empty($einfo)){
         return error_show(1002,"未找到销售订单数据");
     }
-    $stok= Db::name('good_stock')->where(['wsm_code'=>$wsm_code,'is_del'=>0])->field('wsm_code')->find();
+    $stok= Db::name('good_stock')->where(['id'=>$id,'is_del'=>0])->field('wsm_code')->find();
     if(empty($stok)){
         return error_show(0,"未找到商品数据");
     }
     $fo = Db::name('order_addr')->where(['orderCode'=>$einfo['orderCode'],'is_del'=>0])->field('addr,contactor,mobile,receipt_quantity,arrive_time')->select();
-    $st = Db::name('sale_info')->where(['wsm_code'=>$stok['wsm_code']])->field('wsm_code,num,sale_price')->select();
+    $st = Db::name('sale_info')->where(['id'=>$einfo['orderCode']])->field('wsm_code,num,sale_price')->select();
     $stok['temp']=$st;
     $einfo['item']=$fo;
     if(empty($einfo)){