ad

app/admin/controller/Check.php

@@ -202,8 +202,8 @@ public function create(){
         return error_show(1002,"申请人数据不存在");
     }
     $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-    $ri= isset($apply_name["data"]['nickname']) ?  $apply_name["data"]['nickname'] : "";
-    $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"0";
+    $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
+    //$status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"0";
 //    $dain=isset($this->post['good']) && $this->post['good'] !=="" ? trim($this->post['good']):"";
 //    if($type==2){
 //        if($dain==""||empty($dain)){
@@ -227,7 +227,7 @@ public function create(){
             "check_code"=>$check_code,
             "wsm_code"=>$wsm_code,
             "type"=>$type,
-            "status"=>$status,
+            "status"=>0,
             "apply_id"=>$rm,
             "apply_name"=>$ri,
             "is_del"=>0,
@@ -313,7 +313,7 @@ public function edit()
         return error_show(1002,"申请人数据不存在");
     }
     $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-    $ri= isset($apply_name["data"]['nickname']) ?  $apply_name["data"]['nickname'] : "";
+    $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
 //    $dain=isset($this->post['good']) && $this->post['good'] !=="" ? $this->post['good']:"";
 //    if($type==2){
 //       // var_dump($dain);
@@ -412,19 +412,36 @@ public function dell(){
         if(empty($st)){
             return error_show(1002,"盘点信息未找到");
         }
-        $st['status']=$stauts;
-        $st['remark']=$remark;
-        $st['updatetime']= date('Y-m-d H:i:s');
-        $sv = Db::name('good_check')->save($st);
-        if($stauts==0){
-            $sv = Db::name('check_item')->where(['check_code'=>$st['check_code']])->save(['is_del'=>1,"updatetime"=>date
-            ("Y-m-d H:i:s")
-            ]);
-        }
-        if($sv){
-            return error_show(0,"状态更新成功");
-        }else{
-            return error_show(1002,"状态更新失败");
+        Db::startTrans();
+        try{
+            $st['status']=$stauts;
+            $st['remark']=$remark;
+            $st['updatetime']= date('Y-m-d H:i:s');
+            $sv = Db::name('good_check')->save($st);
+            if($sv){
+                if($stauts==0){
+                    $up = Db::name('check_item')->where(['check_code'=>$st['check_code'],"is_del"=>0])->save(['is_del'=>1,
+                        "updatetime"=>date("Y-m-d H:i:s")]);
+                    if($up==false){
+                        Db::rollback();
+                        return error_show(1003,"盘点结果删除失败");
+                    }
+                }
+                if($stauts==1){
+                    $nu = Db::name('check_item')->where(['check_code'=>$st['check_code'],"is_del"=>0])->select()->toArray();
+                    if(empty($nu)){
+                        Db::rollback();
+                        return error_show(1003,"未上传盘点结果");
+                    }
+                }
+                Db::commit();
+                return error_show(0,"状态更新成功");
+            }
+                Db::rollback();
+                return error_show(1002,"状态更新失败");
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1002,$e->getMessage());
         }
 
     }
@@ -482,23 +499,23 @@ public function dell(){
         }
         $insert=[];
         foreach ($data as $value){
-            if($value[1]==""){
+            if($value["value1"]==""){
                 return error_show(1003,"商品属性code 不能为空");
             }
-            if($value[15]===""){
+            if($value["value15"]===""){
                 continue;
             }
-            $stock = Db::name("good_stock")->where(["good_type_code"=>$value[1],"wsm_code"=>$fo['wsm_code'],
+            $stock = Db::name("good_stock")->where(["good_type_code"=>$value["value1"],"wsm_code"=>$fo['wsm_code'],
                 "is_del"=>0])->find();
             $stock_num = isset($stock) ? $stock['usable_stock']:0;
             $insert[]=[
-                "good_type_code"=>$value[1],
-                "good_name"=>$value[2],
+                "good_type_code"=>$value["value1"],
+                "good_name"=>$value["value2"],
                 "origin_price"=>0,
                 "origin_num"=>isset($stock) ? $stock['usable_stock']:0,
-                "check_num"=>$value[15],
-                "is_profit"=>intval($value[15])>=$stock_num ?1:0,
-                "diff_num"=>intval($value[15])>=$stock_num ?intval($value[15])-$stock_num:$stock_num-intval($value[15]),
+                "check_num"=>$value["value15"],
+                "is_profit"=>intval($value["value15"])>=$stock_num ?1:0,
+                "diff_num"=>intval($value["value15"])>=$stock_num ?intval($value["value15"])-$stock_num:$stock_num-intval($value["value15"]),
                 'addtime'=>date("Y-m-d H:i:s"),
                 'updatetime'=>date("Y-m-d H:i:s"),
                 "check_code"=>$fo['check_code']