d

app/admin/controller/Allot.php

@@ -234,7 +234,7 @@ class Allot extends BaseController
 //            ->where(['a.id'=>$id,'a.is_del'=>0])->find();
        // var_dump( Db::name('allot_stock')->getLastSql());
 
-        $vmp = Db::name('allot_info')->where(['allot_code'=>$str['allot_code']])->select();
+        $vmp = Db::name('allot_info')->where(['allot_code'=>$str['allot_code'],'is_del'=>0])->select();
 
             $data=[];
         foreach ($vmp as $k=>$value){
@@ -389,8 +389,8 @@ class Allot extends BaseController
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('allot_stock')->save($st);
             if($sv){
-                if($status==2){
-                    $vmp = Db::name('allot_info')->where(['allot_code'=>$st['allot_code']])->select();
+                if($status==2 || $status==1){
+                    $vmp = Db::name('allot_info')->where(['allot_code'=>$st['allot_code'],"is_del"=>0])->select();
                     foreach ($vmp as $value){
                         $stock = Db::name("good_stock")->where(["good_type_code"=>$value['good_type_code'],"wsm_code"=>$st['wsm_out'],"is_del"=>0])->find();
                         //var_dump($value['allot_num'],$stock['usable_stock']);
@@ -398,15 +398,17 @@ class Allot extends BaseController
                             Db::rollback();
                             return error_show(2000,"超出库存数量");
                         }
-                        $stock['usable_stock']-=$value['allot_num'];
-                        $stock['wait_out_stock']+=$value['allot_num'];
-                        $stock['total_stock']=$stock['wait_out_stock']+$stock['usable_stock'];
-                        $stock['updatetime']= date('Y-m-d H:i:s');
-                        $Db = Db::name('good_stock')->update($stock);
-                        //var_dump(Db::name('good_stock')->getLastSql());
-                        if($Db==false){
-                            Db::rollback();
-                            return error_show(1002,"状态更新失败");
+                        if($status==2){
+                            $stock['usable_stock']-=$value['allot_num'];
+                            $stock['wait_out_stock']+=$value['allot_num'];
+                            $stock['total_stock']=$stock['wait_out_stock']+$stock['usable_stock'];
+                            $stock['updatetime']= date('Y-m-d H:i:s');
+                            $Db = Db::name('good_stock')->update($stock);
+                            //var_dump(Db::name('good_stock')->getLastSql());
+                            if($Db==false){
+                                Db::rollback();
+                                return error_show(1002,"状态更新失败");
+                            }
                         }
                     }
                 }
@@ -455,7 +457,7 @@ class Allot extends BaseController
             ];
             $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code])->update($data);
             if($datainfo){
-                    $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code']])->select();
+                    $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code'],'is_del'=>0])->select();
                    // var_dump(Db::name('allot_info')->getLastSql());
                     foreach ($vnp as $value){
                         $stock = Db::name("good_stock")->where(["good_type_code"=>$value['good_type_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
@@ -515,7 +517,7 @@ class Allot extends BaseController
                     Db::rollback();
                     return error_show(1003, "未找到商品");
                 }
-                $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->find();
+                $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code'],'is_del'=>0])->find();
                 if(empty($n)){
                     Db::rollback();
                     return error_show(10032, "未找到数据");
@@ -531,7 +533,7 @@ class Allot extends BaseController
                 $temp['error_remark'] = $value['error_remark'];
                 $temp['stock_num']=$n['allot_num'];
                 $temp['updatetime'] = date("Y-m-d H:i:s");
-                $np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->save($temp);
+                $np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code'],'is_del'=>0])->save($temp);
                 if($np==false){
                     Db::rollback();
                     return error_show(1001,"数据更新失败");
@@ -627,7 +629,7 @@ public function vesio(){
                     Db::rollback();
                     return error_show(1001,"数据更新失败");
                 }
-                $p = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code']])->find();
+                $p = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
                 if($p==""){
                     Db::rollback();
                     return error_show(1002,"未找到数据");