wugg il y a 3 ans
Parent
commit
d73b6846e2
1 fichiers modifiés avec 26 ajouts et 26 suppressions
  1. 26 26
      app/admin/controller/Resign.php

+ 26 - 26
app/admin/controller/Resign.php

@@ -413,7 +413,7 @@ class Resign extends BaseController
         }
         $feed = Db::name("purchease_feedback")->where(['bkcode'=>$info['bk_code'],'is_del'=>0])->find();
         if(empty($feed)){
-            return error_show(1004,'未找到数据');
+            return error_show(1004,'未找到反馈数据');
         }
         $feed['wsm_name']="";
         if($feed['warehouse']!=""){
@@ -461,35 +461,35 @@ class Resign extends BaseController
                         Db::rollback();
                         return error_show(1001,'备库反馈数据状态修改失败');
                     }
-                    $supplier = Db::name("supplier")->where(["code"=>$feed['supplier']])->find();
+                    $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find();
                     $inw = makeNo("CG");
                     $data=[
-                        "bkcode"=>$feed['bkcode'],
+                        "bkcode"=>$purse['bkcode'],
                         'cgdNo'=>$inw,
-                        "wsm_code"=>$feed['warehouse'],
-                        "good_code"=>$purse['good_code'],
-                        "good_name"=>$purse['good_name'],
-                        "good_type_code"=>$purse['good_type_code'],
-                        "good_num"=>$purse['good_num'],
+                        "wsm_code"=>$purse['warehouse'],
+                        "good_code"=>$feed['good_code'],
+                        "good_name"=>$feed['good_name'],
+                        "good_type_code"=>$feed['good_type_code'],
+                        "good_num"=>$feed['good_num'],
                         "send_num"=>0,
-                        "wsend_num"=>$purse['good_num'],
-                        'good_price'=>$feed['good_price'],
-                        "total_fee"=>$feed['good_price'],
-                        'pakge_fee'=>$feed['pakge_fee'],
-                        'cert_fee'=>$feed['cert_fee'],
-                        'open_fee'=>$feed['open_fee'],
-                        'mark_fee'=>$feed['mark_fee'],
-                        'teach_fee'=>$feed['teach_fee'],
-                        'nake_fee'=>$feed['nake_fee'],
-                        'delivery_fee'=>$feed['delivery_fee'],
-                        'weight'=>$feed['weight'],
-                        'diff_weight'=>$feed['diff_weight'],
-                        'diff_price'=>$feed['diff_price'],
-                        'cgder_id'=>$feed['purchaser_id'],
-                        'cgder'=>$feed['purchaser'],
-                        'supplierNo'=>$feed['supplier'],
+                        "wsend_num"=>$feed['good_num'],
+                        'good_price'=>$purse['good_price'],
+                        "total_fee"=>$purse['good_price'],
+                        'pakge_fee'=>$purse['pakge_fee'],
+                        'cert_fee'=>$purse['cert_fee'],
+                        'open_fee'=>$purse['open_fee'],
+                        'mark_fee'=>$purse['mark_fee'],
+                        'teach_fee'=>$purse['teach_fee'],
+                        'nake_fee'=>$purse['nake_fee'],
+                        'delivery_fee'=>$purse['delivery_fee'],
+                        'weight'=>$purse['weight'],
+                        'diff_weight'=>$purse['diff_weight'],
+                        'diff_fee'=>$purse['diff_price'],
+                        'cgder_id'=>$purse['purchaser_id'],
+                        'cgder'=>$purse['purchaser'],
+                        'supplierNo'=>$purse['supplier'],
                         'supplier_name'=>isset($supplier['name']) ? $supplier['name']:"",
-                        'lasttime'=>$feed['expecttime'],
+                        'lasttime'=>$purse['expecttime'],
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
@@ -505,7 +505,7 @@ class Resign extends BaseController
                             Db::rollback();
                             return error_show(1001,'未找到备库反馈数据');
                         }
-                        $purse['status']=1;
+                        $purse['status']=2;
                         $purse['addtime']=date("Y-m-d H:i:s");
                         $up = Db::name("purchease_feedback")->save($purse);
                         if($up==false){