d

app/admin/controller/After.php

@@ -148,11 +148,11 @@ class After extends \app\BaseController
         if($end!==""){
             $where[]=['a.addtime',"<=", $end];
         }
-        $count=Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.returnCode")->where
+        $count=Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.returnCode=b.returnCode")->where
         ($where)->count();
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
-        $list =Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.returnCode")->where($where)
+        $list =Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.returnCode=b.returnCode")->where($where)
             ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark")->page($page,$size)
             ->order("addtime desc")->select();
         $data=[];
@@ -244,7 +244,7 @@ class After extends \app\BaseController
         $mobile = isset($this->post['mobile']) && $this->post['mobile']!="" ? trim($this->post['mobile']):"";
         $addr = isset($this->post['addr']) && $this->post['addr']!="" ? trim($this->post['addr']):"";
         $addr_code = isset($this->post['addr_code']) && $this->post['addr_code']!="" ? trim($this->post['addr_code']):"";
-        if($info['is_th']==0){
+        if($info['is_th']==0 && $info['order_type']==2){
             if($contactor==''){
                 return error_show(1005,"参数 contactor 不能为空");
             }

app/admin/controller/Allot.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\BaseController;
 use think\App;
@@ -155,6 +156,8 @@ class Allot extends BaseController
             $pd=Db::name('allot_stock')->insert($data,true);
             $dm=[];
             if($pd>0) {
+                $order = ["order_code"=>$allot_code,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 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")
@@ -162,7 +165,6 @@ class Allot extends BaseController
                         ->join("supplier n","n.code=v.supplierNo","left")
                         ->where(['c.wsm_code' => $wsm_out, 'good_type_code' => $value['good_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")->find();
-                  // var_dump(Db::name("good_type")->getLastSql());
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");
@@ -186,9 +188,8 @@ class Allot extends BaseController
                         $dm[]=$temp;
                     }
                 $io = Db::name('allot_info')->insertAll($dm);
-                //var_dump(Db::name('allot_info')->getLastSql());
                 if ($io) {
-                    DB::commit();
+                    Db::commit();
                     return error_show(0, "调拨创建成功");
                 }
             }
@@ -307,11 +308,12 @@ class Allot extends BaseController
             ];
             $da = Db::name('allot_stock')->where(["id"=>$id,"is_del"=>0])->save($data);
             if($da>0) {
+                $order = ["order_code"=>$etid['allot_code'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",$etid['status'],$this->post);
                 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['good_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();
-                  // var_dump(Db::name("good_type")->getLastSql());
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");
@@ -370,6 +372,8 @@ class Allot extends BaseController
         }
         $end = Db::name('allot_stock')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
         if($end){
+            $order = ["order_code"=>$str['allot_code'],"status"=>$str['status'],"action_remark"=>'',"action_type"=>"del"];
+            ActionLog::logAdd($this->post['token'],$order,"DBD",$str['status'],$this->post);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");
@@ -396,6 +400,8 @@ class Allot extends BaseController
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('allot_stock')->save($st);
             if($sv){
+                $order = ["order_code"=>$st['allot_code'],"status"=>$st['status'],"action_remark"=>'',"action_type"=>"del"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 if($status==2 || $status==1){
                     $vmp = Db::name('allot_info')->where(['allot_code'=>$st['allot_code'],"is_del"=>0])->select();
                     foreach ($vmp as $value){
@@ -464,6 +470,8 @@ class Allot extends BaseController
             ];
             $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code])->update($data);
             if($datainfo){
+                $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",3,$this->post);
                     $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code'],'is_del'=>0])->select();
                    // var_dump(Db::name('allot_info')->getLastSql());
                 $good_data=[];
@@ -520,6 +528,8 @@ class Allot extends BaseController
         ];
         $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code,"is_del"=>0])->save($data);
         if($datainfo>0) {
+            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
+            ActionLog::logAdd($this->post['token'],$order,"DBD",4,$this->post);
             $good_data=[];
             foreach ($dain as $value) {
                 $st = Db::name("good_type")->alias("b")->join("good a", "a.good_code = b.good_code", "left")
@@ -624,6 +634,8 @@ public function vesio(){
         ];
         $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code,"is_del"=>0])->save($data);
         if($datainfo>0) {
+            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
+            ActionLog::logAdd($this->post['token'],$order,"DBD",5,$this->post);
             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' => $al['wsm_in'], 'good_type_code' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")

app/admin/controller/Check.php

@@ -408,22 +408,36 @@ public function edit()
         return error_show(1005, $e->getMessage());
     }
 }
-public function dell(){
-    $id = $this->post['id'] && $this->post['id'] !=="" ? intval($this->post['id']) :"";
-    if($id===""){
-        return  error_show(1004,"参数id不能为空");
-    }
-    $deln= Db::name('good_check')->where(['id'=>$id,'is_del'=>0])->find();
-    if(empty($deln)){
-        return error_show(1002,"未找到数据");
-    }
-    $sv = Db::name('good_check')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
-    if($sv){
-        return error_show(0,"删除成功");
-    }else{
-        return error_show(1002,"删除失败");
+
+    /**
+     * @return \think\response\Json|void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function dell(){
+        $id = $this->post['id'] && $this->post['id'] !=="" ? intval($this->post['id']) :"";
+        if($id===""){
+            return  error_show(1004,"参数id不能为空");
+        }
+        $deln= Db::name('good_check')->where(['id'=>$id,'is_del'=>0])->find();
+        if(empty($deln)){
+            return error_show(1002,"未找到数据");
+        }
+        $sv = Db::name('good_check')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
+        if($sv){
+            return error_show(0,"删除成功");
+        }else{
+            return error_show(1002,"删除失败");
+        }
     }
-}
+
+    /**
+     * @return \think\response\Json|void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
     public function statu()
     {
         $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";

app/admin/controller/Resign.php

@@ -17,14 +17,14 @@ class Resign extends BaseController
     {
         parent::__construct($app);
         $this->post = $this->request->post();
-//        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//        }
-//        $effetc = VerifyTokens($token);
-//        if(!empty($effetc) && $effetc['code']!=0) {
-//            return error_show($effetc['code'], $effetc['message']);
-//        }
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0) {
+            return error_show($effetc['code'], $effetc['message']);
+        }
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";