ad

app/admin/controller/Consult.php

@@ -229,8 +229,8 @@ class Consult extends Base
                     foreach ($value["specinfo"] as $v){
                         $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
                         $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
-                        $v['spec_name']=$spec['spec_name'];
-                        $v['spec_value_name']=$spec_value['spec_value'];
+                        $v['spec_name']=isset($spec['spec_name'])? $spec['spec_name']:"";
+                        $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"" ;
                         $specinfo[]=$v;
                     }
                 }
@@ -480,7 +480,7 @@ class Consult extends Base
             $zxinfo['project_name']=isset($project['project_name'])?$project['project_name']:"";
             $zxinfo['budget_total']=isset($project['budget_total'])?$project['budget_total']:"";
             $zxinfo['project_use_desc']=isset($project['use_desc'])?$project['use_desc']:"";
-            $projectinfo = Db::name("project_info")->where(["pgNo"=>$zxinfo['infoNo']])->find();
+            $projectinfo = Db::name("project_info")->where(["pgNo"=>$zxinfo['pgNo']])->find();
             $zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo']:"";
         }
         if($zxorder['depart']>0){

app/admin/controller/Purchin.php

@@ -112,20 +112,20 @@ class Purchin extends BaseController
            return error_show(1005,"采购单未发货");
        }
         $wsm_in_code = makeNo("IC");
-       $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-       if($wsm_code==""){
-           return error_show(1004,"参数 wsm_code 不能为空");
-       }
-       $wsminfo = Db::name("warehouse_info")->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
+//       $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
+//       if($wsm_code==""){
+//           return error_show(1004,"参数 wsm_code 不能为空");
+//       }
+       $wsminfo = Db::name("warehouse_info")->where(["wsm_code"=>$cgdinfo['wsm_code'],"is_del"=>0])->find();
        if(empty($wsminfo)){
            return error_show(1004,"未找到仓库信息");
        }
-       $recep = Db::name('warehouse_addr')->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
+       $recep = Db::name('warehouse_addr')->where(["wsm_code"=>$cgdinfo['wsm_code'],"is_del"=>0])->find();
 
-//        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-//        if($wsm_code==""){
-//            return error_show(1004,"参数 wsm_code 不能为空");
-//        }
+        $sendtype = isset($this->post['sendtype'])&&$this->post['sendtype']!="" ? intval($this->post['sendtype']):"";
+        if($sendtype==""){
+            return error_show(1004,"参数 sendtype 不能为空");
+        }
 
         $data = GetUserInfo($this->post['token']);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
@@ -147,7 +147,7 @@ class Purchin extends BaseController
         $orin = [
             "wsm_in_code"=>$wsm_in_code,
             "cgdNo"=>$cgdNo,
-            "wsm_code"=>$wsm_code,
+            "wsm_code"=>$cgdinfo['wsm_code'],
             "wsm_reaper"=>isset($recep)&& $recep['wsm_name']!=''? $recep['wsm_name']:"",
             "send_num"=>$send_num,
             "post_company"=>$post_company,
@@ -157,6 +157,7 @@ class Purchin extends BaseController
             "apply_id"=>$userinfo['id'],
             "apply_name"=>$userinfo['nickname'],
             "wait_num"=>0,
+            "sendtype"=>$sendtype,
             "status"=>$status,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")

app/admin/controller/Resign.php

@@ -706,11 +706,11 @@ class Resign extends BaseController
     }
 
     public function createCgd(){
-        $id=isset($this->post['id'])&&$this->post['id']!=="" ? intval($this->post['id']):"";
-        if($id===""){
-            return error_show(1004,"参数id不能为空");
+        $bk_code=isset($this->post['bk_code'])&&$this->post['bk_code']!=="" ? trim($this->post['bk_code']):"";
+        if($bk_code===""){
+            return error_show(1004,"参数bk_code不能为空");
         }
-        $info = Db::name("purchease")->where(["id"=>$id,"is_del"=>0])->find();
+        $info = Db::name("purchease")->where(["bk_code"=>$bk_code,"is_del"=>0])->find();
         if($info==false){
             return error_show(1002,'未找到备库数据');
         }
@@ -727,8 +727,9 @@ class Resign extends BaseController
             return error_show(1004,"未找到供应商数据");
         }
         $cgdCode = makeNo("CG");
+
         $cg =["cgdNo"=>$cgdCode,
-            "bkcode"=>"",
+            "bkcode"=>$info['bk_code'],
             "wsm_code"=>$info['wsm_code'],
             "cgder"=>$supplier['person'],
             "cgder_id"=>$supplier['personid'],
@@ -764,5 +765,10 @@ class Resign extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $up =Db::name("purchease_order")->insert($cg);
+        if($up){
+            return app_show(0,"采购单新建成功");
+        }else{
+            return error_show(1004,"采购单新建失败");
+        }
     }
 }