ad

app/admin/controller/Resign.php

@@ -179,16 +179,8 @@ class Resign extends Base
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"商品供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
 		$holder_name=$supplier_temp['data']['person']??0;
-//        $bk= Db::name("purchease")->where([["spuCode","=",$good_code],["status","<>",2],["is_del","=",0]])->find();
-//        if($bk!=false) return error_show(1004,"存在未完成备库单数据");
-//        $cgd =Db::name("purchease_order")->where([["spuCode","=",$good_code],["status","in",[0,1]],["is_del","=",0]])->find();
-//        if($cgd!=false) return error_show(1004,"存在未完成采购单数据");
-        //查验仓库库存数量
-//        $stock =Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")->where
-//        (["spuCode"=>$good_code, "a.is_del"=>0,"a.status"=>1,"b.companyNo"=>$good['companyNo']])->field("a.id,a.usable_stock,a.wait_out_stock")->find();
-//        if(isset($stock['usable_stock'])&& $stock['usable_stock']!=0){
-//            return error_show(1003,"库存数量为 {$stock['usable_stock']} 无法备库");
-//        }
+		$coma =$userCommon->handle("getCodeAndName",["code"=>$good['companyNo']]);
+		if($coma['code']!=0 || empty($coma['data']) ) return error_show(1002,"商品业务公司不存在");
         //校验数量
         $goodnake = Db::name("good_nake")
             ->field('id,min_num')
@@ -208,18 +200,15 @@ class Resign extends Base
         if($lastime===""){
             return error_show(1004,"参数lastime不能为空");
         }
-//        $data = GetUserInfo($token);
-//        if((!empty($data) && $data['code']!=0) ||empty($data) ){
-//            return error_show($data['code'],$data['message']);
-//        }
-//        $userinfo = $data['data'];
         $bk_code=makeNo("BK");
         $info = [
             "spuCode"=>$good['spuCode'],
             "good_name"=>$good['good_name'],
             "good_num"=>$good_num,
             "wsm_code"=>'',
+            "companyName"=>$coma['data'][$good['companyNo']],
             "companyNo"=>$good['companyNo'],
+            "supplierName"=>$coma['data'][$good['supplierNo']],
             "supplierNo"=>$good['supplierNo'],
             "file_url"=>$file_url,
             "lasttime"=>$lastime,
@@ -276,17 +265,6 @@ class Resign extends Base
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
 		$holder_name=$supplier_temp['data']['person']??0;
-//        $data = GetUserInfo($this->post['token']);
-//        if((!empty($data) && $data['code']!=0) ||empty($data) ){
-//            return error_show($data['code'],$data['message']);
-//        }
-        //查验仓库库存数量
-//        $stock =Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")->where
-//        (["spuCode"=>$info['spuCode'], "a.is_del"=>0,"a.status"=>1,"b.companyNo"=>$info['companyNo']])->field("a.id,a.usable_stock,a.wait_out_stock")->find();
-//        if(isset($stock['usable_stock'])&& $stock['usable_stock']!=0){
-//            return error_show(1003,"库存数量为 {$stock['usable_stock']} 无法备库");
-//        }
-//        $userinfo = $data['data'];
         $bk_code=makeNo("BK");
         $info['bk_code']=$bk_code;
         $info['status']=1;
@@ -297,10 +275,6 @@ class Resign extends Base
         unset($info['id']);
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
-//            $supplier = Db::name('supplier')
-//                ->field('id,person,personid')
-//                ->where('code', $info['supplierNo'])
-//                ->findOrEmpty();
             $order = ["order_type" => 'BHD', "order_code" => $bk_code, "order_id" => $in, "order_status" => 1, "before_status" => 1, 'wait_id' =>$holder_id, 'wait_name' =>$holder_name];
             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], $order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
@@ -900,10 +874,6 @@ class Resign extends Base
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
-//        $supplier=Db::name("supplier")->where(["code"=>$info['supplierNo'],"is_del"=>0])->find();
-//        if($supplier==false){
-//            return error_show(1004,"未找到供应商数据");
-//        }
         $userCommon= new \app\admin\common\User();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"未找到供应商数据");
@@ -951,8 +921,9 @@ class Resign extends Base
             "diff_fee"=>"0",
             "gold_price"=>"0",
             "supplierNo"=>$info['supplierNo'],
-            "supplier_name"=>$supplierName,
+            "supplier_name"=>$info['supplierName'],
             "companyNo"=>$info['companyNo'],
+            "companyName"=>$info['companyName'],
             "send_status"=>1,
             "send_num"=>"0",
             "wsend_num"=>$info['good_num'],