ll

app/admin/controller/Allot.php

@@ -18,34 +18,33 @@ class Allot extends BaseController
         $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 =['is_del'=>0];
-        $allot_code = isset($this->post['allot_code']) && $this->post['allot_code'] !== "" ? intval($this->post['allot_code']) : "";
+        $allot_code = isset($this->post['allot_code']) && $this->post['allot_code'] !== "" ? trim($this->post['allot_code']) : "";
         if ($allot_code !== "") {
             $where['allot_code'] = $allot_code;
         }
-        $wsm_out = isset($this->post['wsm_out']) && $this->post['wsm_out'] !== "" ? intval($this->post['wsm_out']) : "";
+        $wsm_out = isset($this->post['wsm_out']) && $this->post['wsm_out'] !== "" ? trim($this->post['wsm_out']) : "";
         if ($wsm_out !== "") {
             $where['wsm_out'] = $wsm_out;
         }
-        $wsm_in = isset($this->post['wsm_in']) && $this->post['wsm_in'] !== "" ? intval($this->post['wsm_in']) : "";
+        $wsm_in = isset($this->post['wsm_in']) && $this->post['wsm_in'] !== "" ? trim($this->post['wsm_in']) : "";
         if ($wsm_in !== "") {
             $where['wsm_in'] = $wsm_in;
         }
-        $addtime = isset($this->post['addtime']) && $this->post['addtime'] !== "" ? intval($this->post['addtime']) : "";
-        if ($addtime !== "") {
-            $where['addtime'] = $addtime;
+        $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
+        if ($start !="") {
+            $where = ["addtime"=>Db::raw(">= '{$start}'")];
         }
-        $count = Db::name('allot_stock')->count();
+        $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] :"";
+        if($end !=""){
+            $where = ["addtime"=>Db::raw("<= '{$end}'")];
+        }
+        $count = Db::name('allot_stock')->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('allot_stock')->where($where)->page($page,$size)->select();
+      // var_dump(Db::name('allot_stock')->getLastSql());
         return app_show(0,"获取成功",['count'=>$count,'list'=>$list]);
     }
-    //    $good_name= isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name']) :"";
-//    $allot_code = isset($this->post['allot_code']) && $this->post['allot_code'] !=="" ? trim($this->post['allot_code']) :"";
-//    $usable_num = isset($this->post['usable_num']) && $this->post['usable_num'] !=="" ? intval($this->post['allot_code']) :"0";
-//    $error_num = isset($this->post['error_num']) && $this->post['error_num'] !=="" ? intval($this->post['error_num']) :"0";
-//    $error_remark = isset($this->post['error_remark']) && $this->post['error_remark'] !=="" ? trim($this->post['error_remark']) :"";
-//    $stock_num = isset($this->post['stock_num']) && $this->post['error_num'] !=="" ? intval($this->post['error_num']) : "0";
     public function create(){
         $token =isset($this->post['token']) && $this->post['token'] !=="" ? trim($this->post['token']) :"";
     $wsm_out = isset($this->post['wsm_out']) && $this->post['wsm_out'] !=="" ? trim($this->post['wsm_out']) :"";
@@ -56,10 +55,10 @@ class Allot extends BaseController
     if($wsm_in==""){
         return error_show(1002,"入库仓库不能为空");
     }
-    $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code'] !=="" ? trim($this->post['good_type_code']) :"";
-    if($good_type_code==""){
-        return error_show(1002,"商品属性不能为空");
-    }
+//    $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code'] !=="" ? trim($this->post['good_type_code']) :"";
+//    if($good_type_code==""){
+//        return error_show(1002,"商品属性不能为空");
+//    }
     $allot_code=makeNo("XK");
 //    $allot_code = isset($this->post['allot_code']) && $this->post['allot_code'] !=="" ? trim($this->post['allot_code']) :"";
 //        if($allot_code==""){
@@ -106,8 +105,11 @@ class Allot extends BaseController
             if($pd>0) {
                 foreach ($dain as $value) {
                     $st = Db::name("good_type")->alias("b")->join("good a", "a.good_code = b.good_code", "left")
-                        ->join("good_stock c", "c.good_type_code = b.type_code", "left")->where(['wsm_code' => $wsm_out, 'good_type_code' => $value['type_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
-                        ->field("b.type_code,a.good_name,a.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock")->find();
+                        ->join("good_stock c", "c.good_type_code = b.type_code", "left")
+                        ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
+                        ->join("supplier n","n.code=v.supplierNo","left")
+                        ->where(['c.wsm_code' => $wsm_out, 'good_type_code' => $value['type_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                        ->field("b.type_code,a.good_name,a.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name,n.code")->find();
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");
@@ -169,6 +171,14 @@ class Allot extends BaseController
         if($allot_code==""){
             return error_show(1002,"调拨单编号不能为空");
         }
+        $post_name = isset($this->post['post_name']) && $this->post['post_name'] !=="" ? trim($this->post['post_name']) :"";
+        if($post_name==""){
+            return error_show(1002,"物流公司不能为空");
+        }
+        $post_code = isset($this->post['post_code']) && $this->post['post_code'] !=="" ? trim($this->post['post_code']) :"";
+        if($post_code==""){
+            return error_show(1002,"物流单号不能为空");
+        }
        $apply_id =GetUserInfo($token);
         if(empty($apply_id)||$apply_id['code']!=0){
             return error_show(1002,"申请人数据不存在");
@@ -203,6 +213,8 @@ class Allot extends BaseController
                 "wsm_out"=>$wsm_out,
                 "wsm_in"=>$wsm_in,
                 "post_fee"=>$post_fee,
+                "post_name"=>$post_name,
+                "post_code"=>$post_code,
                 "status"=>$status,
                 "updatetime"=>date('Y-m-d H:i:s'),
             ];
@@ -260,4 +272,28 @@ class Allot extends BaseController
             return error_show(1002,"删除失败");
         }
     }
+    public function status(){
+        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"" ;
+        if($id==""){
+            return error_show(1002,"调拨编号不能为空");
+        }
+        $remark = isset($this->post['remark']) && $this->post['remark'] !=="" ? trim($this->post['remark']) :"";
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
+        if($status===""){
+            return error_show(1002,"审核状态不能为空");
+        }
+        $st = Db::name('allot_stock')->where(['id'=>$id,"is_del"=>0])->find();
+        if(empty($st)){
+            return error_show(1002,"调拨信息未找到");
+        }
+        $st['remark']=$remark;
+        $st['status']=$status;
+        $st['updatetime']= date('Y-m-d H:i:s');
+        $sv = Db::name('allot_stock')->save($st);
+        if($sv){
+            return error_show(0,"状态更新成功");
+        }else{
+            return error_show(1002,"状态更新失败");
+        }
+    }
 }

app/admin/controller/Check.php

@@ -22,6 +22,65 @@ public function __construct(App $app)
         return error_show($effetc['code'],$effetc['message']);
     }
 }
+public function flist(){
+    $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;
+    $condtion=['a.is_del'=>0,'b.is_del'=>0];
+    $wsmcode =isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']):"";
+    if($wsmcode==""){
+        return error_show(1002,"仓库code不能为空");
+
+       // $typecode= Db::name("good_stock")->where(["wsm_code"=>$wsmcode,'is_del'=>0])->column("good_type_code");
+    }
+    $condtion['c.wsm_code']=$wsmcode;
+    $good_code =isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
+    if($good_code!=""){
+        $condtion['b.type_code'] = $good_code;
+    }
+    $goodcode =isset($this->post['good_code']) &&$this->post['good_code'] !=="" ? trim($this->post['good_code'])
+        :"";
+    if($goodcode!=""){
+        $condtion['a.good_code'] = Db::raw("like '%{$goodcode}%'");
+    }
+    $good_name =isset($this->post['good_name']) &&$this->post['good_name'] !=="" ? trim($this->post['good_name'])
+        :"";
+    if($good_name!=""){
+        $condtion['a.good_name'] = Db::raw("like '%{$good_name}%'");
+    }
+    $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,"未找到供应商信息");
+        }
+//                $typecode = Db::name("good_stock")->alias("a")->join("warehouse_info b","a.wsm_code=b.wsm_code","left")->where(["a.is_del"=>0,
+//                    "b.is_del"=>0,"b.supplierNo"=>$supplierNo])->column("a.good_type_code");
+//                if(empty($typecode)){
+//                    return error_show(1004,"未找到供应商有关的商品信息");
+//                }
+        $condtion["a.gys_code"] = $supplierNo;
+    }
+
+    $count = Db::name("good_type")->alias("b")
+        ->join("good a","a.good_code = b.good_code","left")
+        ->join("good_stock c","c.good_type_code=b.type_code","left")
+        ->where($condtion)->count();
+    $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
+    $list = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
+        ->join("good_stock c","c.good_type_code=b.type_code","left")
+        ->where($condtion)->field("b.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.usable_stock,a.updatetime")
+        ->page($page,$size)->select();
+    $data=[];
+    foreach ($list as $key=>$value){
+        //$stock = Db::name("good_stock")->where(["good_type_code"=>$value['type_code'],"is_del"=>0])->sum("usable_stock");
+        //$value['usable_stock']=$stock;
+        $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
+        $value['supplier_name'] =isset($supplier['name']) ?$supplier['name'] :"";
+        $data[]=$value;
+    }
+    return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
+}
 public function list()
 {
     $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";

app/admin/controller/Version.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\BaseController;
+use think\App;
+use think\facade\Db;
+
+class Version extends BaseController
+{
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post = $this->request->post();
+    }
+
+    public function list(){
+        $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;
+        $count= Db::name("version")->count();
+        $total = ceil($count/$size);
+        $page = $page>=$total? $total:$page;
+        $list = Db::name("version")->page($page,$size)->order("addtime desc")->select();
+        return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
+    }
+
+    public function create(){
+        $title = isset($this->post['title'])&&$this->post['title']!="" ? $this->post['title']:"";
+        if($title==""){
+            return error_show(1004,"参数title 不能为空");
+        }
+        $content = isset($this->post['content'])&&$this->post['content']!="" ? $this->post['content']:"";
+        if($content==""){
+            return error_show(1004,"参数content 不能为空");
+        }
+        $version = isset($this->post['version'])&&$this->post['version']!="" ? $this->post['version']:"";
+        if($version==""){
+            return error_show(1004,"参数version 不能为空");
+        }
+        $data=[
+            "title"=>$title,
+            "content"=>$content,
+            "version"=>$version,
+            "addtime"=>date("Y-m-d H:i:s")
+        ];
+
+        $inert= Db::name("version")->insert($data);
+        if($inert){
+
+            return app_show(0,"版本信息新建成功");
+        }else{
+            return app_show(0,"版本信息新建失败");
+        }
+    }
+
+}

app/admin/route/app.php

@@ -91,6 +91,7 @@ Route::rule('Consultlist','admin/Consult/list');
 Route::rule('Consultinfo','admin/Consult/info');
 Route::rule('Consultdel','admin/Consult/del');
 
+Route::rule('checkflist','admin/Check/flist');
 Route::rule('checklist','admin/Check/list');
 Route::rule('checkgood','admin/Check/goodlist');
 Route::rule('checkcreate','admin/Check/create');
@@ -99,11 +100,15 @@ Route::rule('checkedit','admin/Check/edit');
 Route::rule('checkedell','admin/Check/dell');
 Route::rule('checkestatus','admin/Check/statu');
 
+Route::rule('versionlist','admin/Version/list');
+Route::rule('versioncreate','admin/Version/create');
+
 Route::rule('allotlist','admin/Allot/list');
 Route::rule('allotcreate','admin/Allot/create');
 Route::rule('allotedit','admin/Allot/edit');
 Route::rule('allotinfo','admin/Allot/info');
 Route::rule('allotdelect','admin/Allot/del');
+Route::rule('allotstatus','admin/Allot/status');
 
 Route::rule('userlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');