wugg 3 jaren geleden
bovenliggende
commit
bde4a93223
1 gewijzigde bestanden met toevoegingen van 44 en 43 verwijderingen
  1. 44 43
      app/admin/controller/Purch.php

+ 44 - 43
app/admin/controller/Purch.php

@@ -351,8 +351,8 @@ class Purch extends \app\BaseController
        // $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
         $data=[
             "cgdNo"=>$cgdNo,
-            "good_code"=>$gd['good_type_code'],
-            "good_kode"=>$gd['good_code'],
+            "good_code"=>$cg['good_type_code'],
+            "good_kode"=>$cg['good_code'],
             "good_name"=>$cg['good_name'],
             "sale_price"=>$cg['good_price'],
             "good_weight"=>$cg['weight'],
@@ -367,11 +367,46 @@ class Purch extends \app\BaseController
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
         ];
-        $cgd = Db::name('purchease_diff')->insert($data);
-        if($cgd){
-            return error_show(0,"新建成功");
-        }else{
-            return error_show(1002,"新建失败");
+        Db::startTrans();
+        try{
+            $item = Db::name("purchease_diff")->insert($data);
+            if($item){
+                if($cg['order_type']==2){
+                    $order = Db::name("sale")->where(["orderCode"=>$cg['bkcode']])->find();
+                    if(empty($order)){
+                        Db::rollback();
+                        return error_show(1002,"未找到确认单信息");
+                    }
+                    $data=[
+                        "orderCode"=>$cg['bkcode'],
+                        "good_code"=>$cg['good_type_code'],
+                        "good_kode"=>$cg['good_code'],
+                        "good_name"=>$cg['good_name'],
+                        "diff_weight"=>$diff_weight,
+                        "diff_price"=>$diff_weight*$cg['gold_price'],
+                        "gold_price"=>$cg['gold_price'],
+                        "status"=>1,
+                        "addtime"=>date("Y-m-d H:i:s"),
+                        "updatetime"=>date("Y-m-d H:i:s")
+                    ];
+                    $cgd = Db::name('sale_diff')->insert($data);
+                    if($cgd){
+                        Db::commit();
+                        return error_show(0,"新建成功");
+                    }else{
+                        Db::rollback();
+                        return error_show(1002,"新建失败");
+                    }
+                }
+                Db::commit();
+                return error_show(0,"新建成功");
+            }else{
+                Db::rollback();
+                return error_show(1002,"新建失败");
+            }
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1002,$e->getMessage());
         }
     }
     public function difflist(){
@@ -446,49 +481,15 @@ class Purch extends \app\BaseController
         if($status===""){
             return error_show(1002,"参数status不能为空");
         }
-        Db::startTrans();
-        try{
+
             $dio['status']=$status;
             $dio['updatetime']=date("Y-m-d H:i:s");
             $item = Db::name("purchease_diff")->update($dio);
-            if($item){
-                if($cgd['order_type']==2){
-                    $order = Db::name("sale")->where(["orderCode"=>$cgd['bkcode']])->find();
-                    if(empty($order)){
-                        Db::rollback();
-                        return error_show(1002,"未找到确认单信息");
-                    }
-                    $data=[
-                        "orderCode"=>$cgd['bkcode'],
-                        "good_code"=>$cgd['good_type_code'],
-                        "good_kode"=>$cgd['good_code'],
-                        "good_name"=>$cgd['good_name'],
-                        "diff_weight"=>$dio['diff_weight'],
-                        "diff_price"=>$dio['diff_weight']*$cgd['gold_price'],
-                        "gold_price"=>$cgd['gold_price'],
-                        "status"=>1,
-                        "addtime"=>date("Y-m-d H:i:s"),
-                        "updatetime"=>date("Y-m-d H:i:s")
-                    ];
-                    $cgd = Db::name('sale_diff')->insert($data);
-                    if($cgd){
-                        Db::commit();
-                        return error_show(0,"新建成功");
-                    }else{
-                        Db::rollback();
-                        return error_show(1002,"新建失败");
-                    }
-                }
-                Db::commit();
+         if ($item){
                 return error_show(0,"更新成功");
             }else{
-                Db::rollback();
                 return error_show(1002,"更新失败");
             }
-        }catch (\Exception $e){
-            Db::rollback();
-            return error_show(1002,"更新失败");
-        }
 
     }
 }