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

app/admin/controller/Good.php

@@ -9,6 +9,11 @@ use think\facade\Db;
 class Good extends \app\BaseController
 {
         public $post="";
+        private $acton=[
+            "allotsend"=>'调拨发货',
+            "allotin"=>'调拨入库',
+            "allotincheck"=>'调拨验货'
+        ];
         public function __construct(App $app)
         {
             parent::__construct($app);
@@ -404,9 +409,15 @@ class Good extends \app\BaseController
         if($wsm_code!=""){
             $where[]=['b.wsm_code',"like","%$wsm_code%"];
         }
-        $good_type_code= isset($this->post['good_type_code']) && $this->post['good_type_code']!="" ? trim($this->post['good_type_code']):"";
-        if($good_type_code!=""){
-            $where[]=['b.good_type_code',"like","%$good_type_code%"];
+        $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
+        if($supplierNo!=""){
+            $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
+            if(empty($supplier)){
+                return error_show(1004,"未找到供应商信息");
+            }
+            $wsmcode = Db::name("warehouse_info")->where([
+                "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
+            $where[]=['b.wsm_code',"in",$wsmcode];
         }
         $count = Db::name("good_log")->alias('a')
             ->join("good_stock b","b.id=a.id","left")->where($where)->count();
@@ -424,6 +435,7 @@ class Good extends \app\BaseController
             (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
             $value['item'] =$item;
             $value['empty'] =$wsm;
+            $value['action_type_cn'] =$this->acton[$value['action_type']];
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/controller/Sale.php

@@ -164,33 +164,33 @@ class Sale extends BaseController
     if($orderCode !==""){
         $where[]=['orderCode',"=",$orderCode];
     }
-        $apply_name=isset($this->post['apply_name']) && $this->post['apply_name'] !=="" ? trim($this->post['apply_name'])
-            :"";
-        if($apply_name !==""){
-            $where[]=['apply_name',"like","%$apply_name%"];
-        }
-        $good_name=isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name'])
-            :"";
-        if($good_name !==""){
-            $where[]=['good_name',"like","%$good_name%"];
-        }
-        $good_code=isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code']):"";
-        if($good_code !==""){
-            $where[]=['good_code',"like","%$good_code%"];
-        }
-        $customer_code=isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']):"";
-        if($customer_code !==""){
-            $where[]=['customer_code',"like","%$customer_code%"];
-        }
-        $supplierNo=isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
-        if($supplierNo !==""){
-            $where[]=['supplierNo',"like","%$supplierNo%"];
-        }
-        $ordertype=isset($this->post['order_type']) && $this->post['order_type'] !=="" ? intval($this->post['order_type'])
-            :"";
-        if($ordertype !==""){
-            $where[]=['order_type',"=",$ordertype];
-        }
+    $apply_name=isset($this->post['apply_name']) && $this->post['apply_name'] !=="" ? trim($this->post['apply_name'])
+        :"";
+    if($apply_name !==""){
+        $where[]=['apply_name',"like","%$apply_name%"];
+    }
+    $good_name=isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name'])
+        :"";
+    if($good_name !==""){
+        $where[]=['good_name',"like","%$good_name%"];
+    }
+    $good_code=isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code']):"";
+    if($good_code !==""){
+        $where[]=['good_code',"like","%$good_code%"];
+    }
+    $customer_code=isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']):"";
+    if($customer_code !==""){
+        $where[]=['customer_code',"like","%$customer_code%"];
+    }
+    $supplierNo=isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
+    if($supplierNo !==""){
+        $where[]=['supplierNo',"like","%$supplierNo%"];
+    }
+    $ordertype=isset($this->post['order_type']) && $this->post['order_type'] !=="" ? intval($this->post['order_type'])
+        :"";
+    if($ordertype !==""){
+        $where[]=['order_type',"=",$ordertype];
+    }
     $status=isset($this->post['status']) && $this->post['status'] !=="" ? trim($this->post['status']):"";
     if($status !==""){
         $where[]=['status',"=",$status];
@@ -199,9 +199,9 @@ class Sale extends BaseController
     if($start !=""){
         $where[]= ["addtime",'>=',$start];
     }
-        $end = isset($this->post['end']) && $this->post['end'] !=="" ? $this->post['end'] :"";
-        if($end !=""){
-            $where[]= ["addtime",'<=',$end];
+    $end = isset($this->post['end']) && $this->post['end'] !=="" ? $this->post['end'] :"";
+    if($end !=""){
+        $where[]= ["addtime",'<=',$end];
         }
     $count = Db::name('sale')->where($where)->count();
     $total = ceil($count/$size);
@@ -677,6 +677,7 @@ class Sale extends BaseController
 //    $check_num = isset($this->post['check_num']) && $this->post['check_num'] !=="" ? $this->post['check_num'] :"";
 //    $error_num = isset($this->post['error_num']) && $this->post['error_num'] !=="" ? $this->post['error_num'] :"";
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? $this->post['status'] :"1";
+    //$order_type = isset($this->post['order_type']) && $this->post['order_type'] !=="" ? $this->post['order_type'] :"1";
     //$dn=Db::name('sale_info')->where(['wsm_code'=>$outCode])->find();
     Db::startTrans();
     try {
@@ -937,4 +938,48 @@ class Sale extends BaseController
         $info['can']= isset($info['cat_id']) && $info['cat_id'] !==0 ? made($info['cat_id']):[];
         return app_show(0,"获取成功",$info);
     }
+    public function saleout(){
+        $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
+        $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']) :"10";
+        $where= [];
+        $orderCode=isset($this->post['orderCode']) && $this->post['orderCode'] !=="" ? trim($this->post['orderCode'])
+            :"";
+        if($orderCode !==""){
+            $where[]=['orderCode',"like","%$orderCode%"];
+        }
+        $apply_name=isset($this->post['apply_name']) && $this->post['apply_name'] !=="" ? trim($this->post['apply_name'])
+            :"";
+        if($apply_name !==""){
+            $where[]=['apply_name',"like","%$apply_name%"];
+        }
+        $status=isset($this->post['status']) && $this->post['status'] !=="" ? trim($this->post['status']):"";
+        if($status !==""){
+            $where[]=['status',"=",$status];
+        }
+        $start = isset($this->post['start']) && $this->post['start'] !=="" ? $this->post['start'] :"";
+        if($start !=""){
+            $where[]= ["addtime",'>=',$start];
+        }
+        $end = isset($this->post['end']) && $this->post['end'] !=="" ? $this->post['end'] :"";
+        if($end !=""){
+            $where[]= ["addtime",'<=',$end];
+        }
+        $count = Db::name('order_out')->where($where)->count();
+        $total = ceil($count/$size);
+        $page = $page >= $total ? $total : $page;
+        $list= Db::name('order_out')->where($where)->order("addtime desc")->page($page,$size)->select();
+        foreach ($list as $value){
+            $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c","k.supplierNo=c.code")
+                ->where(["k.wsm_code"=>$value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
+            $addr = Db::name("order_addr")->where(["id"=>$value['addrid']])->find();
+            $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+            $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+            $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code']:"";
+            $value['addr']=isset($addr['addr']) ? $addr['addr']:"";
+            $value['contactor']=isset($addr['contactor']) ? $addr['contactor']:"";
+            $value['mobile']=isset($addr['mobile']) ? $addr['mobile']:"";
+            $data[]=$value;
+        }
+        return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
+    }
 }

app/admin/route/app.php

@@ -102,6 +102,7 @@ Route::rule('salestatus','admin/Sale/status');
 Route::rule('salefee','admin/Sale/fee');
 Route::rule('saleout','admin/Sale/out');
 Route::rule('salecustomer','admin/Sale/customer');
+Route::rule('xsaleout','admin/Sale/saleout');
 
 Route::rule('checkflist','admin/Check/flist');
 Route::rule('checklist','admin/Check/list');