ad

app/admin/controller/Consult.php

@@ -1890,9 +1890,9 @@ class Consult extends Base
         $info['metal_name']=isset($bidinfos['metal_id'])&& $bidinfos['metal_id']!=0?$this->noble[$bidinfos['metal_id']]:"";
 //        $info['sale_price'] =round($bidinfos['sale_price'],2);//议价前价格
         $info['specinfo'] = isset($bidinfos['specinfo'])&&$bidinfos['specinfo']!=""?json_decode($bidinfos['specinfo'],true):[];
-        if($info['status']==2){
+//        if($info['status']==2){
             $info['lower_price'] =round($lower_price,2);
-        }
+//        }
         //获取议价原因
         if ($info['result_info_id'] != 0) {
             $info['result_info'] = Db::name('result_info')->where(['result_code' => $info['result_info_id'], 'type' => 7, 'status' => 1, 'is_del' => 0])->value('result');

app/admin/controller/Filing.php

@@ -682,12 +682,10 @@ class Filing extends Base
             "addr" => "",
             "addr_code" => "",
             "contactor" => "",
-            "buyerid" => "",
-            "buyer_name" => "",
             "sendtime" => "",
             "cat_id" => '',
             "supplierNo" => "",
-            "cgd_tax" => "",
+            "cgdPrice" => "",
             "platform_id" => "0",
         ], "post", "trim");
 
@@ -705,11 +703,9 @@ class Filing extends Base
             "mobile|联系人电话" => "require|number|mobile",
             "contactor|联系人" => "require|max:255|min:1",
             "addr|收货地址" => "require|max:255|min:1",
-            "buyerid|采购员ID" => "require|number|gt:0",
-            "buyer_name|采购员" => "require|max:255|min:1",
             "sendtime|发货时间" => "require|date",
             "cat_id|商品分类id" => "require|number|gt:0",
-            "cgd_tax|采购毛利率" => "require|float|gt:0",
+            "cgdPrice|采购单价" => "require|float|gt:0",
             "platform_id|平台" => "require|number"
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
@@ -722,15 +718,7 @@ class Filing extends Base
         if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");
         if(!isset($tmp['data'][$param['supplierNo']])) return json_show(1004, "未找到平台供应商数据");
         if(!isset($tmp['data'][$param['companyNo']])) return json_show(1004, "未找到平台业务公司数据");
-        if($tmp['data'][$param['supplierNo']] == $tmp['data'][$param['companyNo']]) return json_show(1004,'供应商和业务公司不能为同一家公司');
-
-//        $customer = Db::name("customer_info")->where('companyNo', "=", $param['khNo'])->find();
-//        if ($customer == false) return error_show(1004, "客户信息未找到");
-//        $supplierName = Db::name("supplier")->where('code', "=", $param['supplierNo'])->value("name", "");
-//        if ($supplierName == '') return error_show(1004, "供应商信息未找到");
-//        $companyName = Db::name("supplier")->where('code', "=", $param['companyNo'])->value("name", "");
-//        if ($companyName == '') return error_show(1004, "业务公司信息未找到");
-//        if ($param['platform_id'] != 0) {
+
             $payinfo = Db::name("platform")->where(["id"=> $param['platform_id'],"is_del"=>0])->findOrEmpty();
             if (empty($payinfo)) return error_show(1004, "平台信息未找到");
             if ($payinfo['status'] != 1) return error_show(1004, "平台信息已禁用");
@@ -738,10 +726,10 @@ class Filing extends Base
 	            $supplierArr = Db::name("platform_pay_rate")->where(["platform_id" => $param['platform_id'], "status" => 1, "is_del" => 0])->column("companyNo");
 	            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "平台支付渠道含有该业务公司，平台无法使用！");
             }
-
-//        }
-        $param["cgd_tax"] = $param["cgd_tax"] / 100;
-        $cgdPrice = round($param['goodPrice'] * (1 - $param['cgd_tax']), 2);
+		$supplierinfo = $userCommon->handle("hqInfo",["code"=>$param['supplierNo']]);
+		if(!isset($supplierinfo['data'])|| empty($supplierinfo['data'])) return json_show(1004, "未找到供应商公司数据");
+		$person =$supplierinfo['data']['child']??["person"=>'',"person_id"=>0];
+		 if($tmp['data'][$param['supplierNo']] == $supplierinfo['data']['relation_code']) return json_show(1004,'供应商和业务公司不能为同一家公司');
         $qrddata = [
             "orderCode" => $qrdcode,
             "apply_id" => $this->uid,
@@ -755,7 +743,7 @@ class Filing extends Base
             "good_name" => $param['goodName'],
             "good_num" => $param['goodNum'],
             "good_type" => 1,
-            "origin_price" => $cgdPrice,
+            "origin_price" => $param['cgdPrice'],
             "sale_price" => $param['goodPrice'],
             "total_price" => round($param['goodPrice'] * $param['goodNum'], 2),
             "post_fee" => 0,
@@ -781,8 +769,8 @@ class Filing extends Base
             "workNo" => $param['workCode'],
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s"),
-            "cgderid" => $param['buyerid'],
-            "cgder" => $param['buyer_name'],
+            "cgderid" => $person['personid'],
+            "cgder" => $person['person'],
             "good_createrid" => $this->uid,
             "good_creater" => $this->uname
         ];
@@ -799,13 +787,13 @@ class Filing extends Base
             "cgdNo" => $cgddcode,
             "bkcode" => '',
             "wsm_code" => "",
-            "cgder_id" => $param['buyerid'],
-            'cgder' => $param['buyer_name'],
+            "cgder_id" => $person['personid'],
+            'cgder' => $person['person'],
             "spuCode" => $goodCode,
             "good_name" => $param['goodName'],
             "good_num" => $param['goodNum'],
-            "good_price" => $cgdPrice,
-            "total_fee" => round($cgdPrice * $param['goodNum'], 2),
+            "good_price" => $param['cgdPrice'],
+            "total_fee" => round($param['cgdPrice'] * $param['goodNum'], 2),
             "supplierNo" => $param['supplierNo'],
             "supplier_name" =>$tmp['data'][$param['supplierNo']],
             "companyNo" => $param['companyNo'],
@@ -882,10 +870,6 @@ class Filing extends Base
             if ($qrd == false) throw new Exception("商品信息录入生成失败");
             $qrd = Db::name("order_addr")->insert($orderAddr);
             if ($qrd == false) throw new Exception("销售单地址生成失败");
-//            if ($param['pay_id'] != 0) {
-//                pay_log($param['pay_id'], $param['companyNo'], $qrdcode);
-//            }
-
             Db::commit();
             return app_show(0, '订单生成成功');
         } catch (\Exception $exception) {
@@ -962,44 +946,32 @@ class Filing extends Base
     {
         $param = $this->request->param([
             "orderCode" => "",
-//            "companyNo" => '',
             "poCode" => "",
             "workCode" => "",
-//            "khNo" => "",
             "tax" => "",
             "goodUnit" => "",
             "mobile" => "",
             "addr" => "",
             "addr_code" => "",
             "contactor" => "",
-            "buyerid" => "",
-            "buyer_name" => "",
             "sendtime" => "",
             "supplierNo" => "",
-            "cgd_tax" => ""
+            "cgdPrice" => ""
         ], "post", "trim");
 
         $valid = Validate::rule([
             "orderCode|销售单号" => "require|max:255",
-//	 		"companyNo|业务公司编号"=>"require|max:255|min:1",
             "supplierNo|供应商公司编号" => "require|max:255|min:1",
             "poCode|PO编号" => "require|max:255|min:1",
-//	 		"workCode|业务编号"=>"require|max:255|min:1",
-//	 		"khNo|客户公司编号"=>"require|max:255|min:1",
             "mobile|联系人电话" => "require|number|mobile",
             "goodUnit|商品单位" => "require|number|gt:0",
             "contactor|联系人" => "require|max:255|min:1",
             "addr|收货地址" => "require|max:255|min:1",
-//            "addr_code|收货省市区" => "require|max:255|min:1",
-            "buyerid|采购员ID" => "require|number|gt:0",
-            "buyer_name|采购员" => "require|max:255|min:1",
             "sendtime|发货时间" => "require|date",
             "tax|商品利率" => "require|number",
-            "cgd_tax|采购毛利率" => "require|float|gt:0",
+            "cgdPrice|采购单价" => "require|float|gt:0",
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
-
-        $param["cgd_tax"] = $param["cgd_tax"] / 100;
         $saleinfo = Db::name("sale")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
         if (empty($saleinfo)) return error_show(1004, "销售单不存在");
         if ($saleinfo['order_source'] != 9) return error_show(1004, "销售单来源不是网络录入");
@@ -1011,40 +983,31 @@ class Filing extends Base
         if (empty($cgd)) return error_show(1004, "采购单不存在");
 
         $userCommon = \app\admin\common\User::getIns();
-        $tmp = $userCommon->handle('getCodeAndName',['code'=>[$param['supplierNo'],$cgd['companyNo']]]);
-        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
-//        if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");
-        if(!isset($tmp['data'][$param['supplierNo']])) return json_show(1004, "未找到平台供应商数据");
-//        if(!isset($tmp['data'][$param['companyNo']])) return json_show(1004, "未找到平台业务公司数据");
-//        if ($tmp['data'][$param['supplierNo']] == $tmp['data'][$param['companyNo']]) return json_show(1004, '供应商和业务公司不能为同一家公司');
-
         $good = Db::name("good_zixun")->where(["spuCode" => $saleinfo['good_code']])->findOrEmpty();
         if (empty($good)) return error_show(1004, "商品信息不存在");
         $addr = Db::name("order_addr")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
         if (empty($addr)) return error_show(1004, "地址信息不存在");
-        $cgdPrice = round($saleinfo['sale_price'] * (1 - $param['cgd_tax']), 2);
-//        if ($saleinfo['platform_id'] != 0) {
-//				$supplierArr = Db::name("platform_pay_rate")->where(["platform_id" => $param['platform_id'], "status" => 1, "is_del" => 0])->column("companyNo");
-//	            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "平台支付渠道含有该业务公司，平台无法使用！");
-//        }
+        $cgdPrice = $param['cgdPrice'];
+		$supplierinfo = $userCommon->handle("hqInfo",["code"=>$param['supplierNo']]);
+		if(!isset($supplierinfo['data'])|| empty($supplierinfo['data'])) return json_show(1004, "未找到供应商公司数据");
+		$person =$supplierinfo['data']['child']??["person"=>'',"person_id"=>0];
+		 if($cgd['companyNo']== $supplierinfo['data']['relation_code']) return json_show(1004,'供应商和业务公司不能为同一家公司');
         $qrddata = [
             "origin_price" => $cgdPrice,
             "arrive_time" => $param['sendtime'],
-//			"customer_code"=>$param['khNo'],
-//			"supplierNo"=>$param['companyNo'],
             "platform_order" => $param['poCode'],
             "workNo" => $param['workCode'],
             "updatetime" => date("Y-m-d H:i:s"),
-            "cgderid" => $param['buyerid'],
-            "cgder" => $param['buyer_name']
+            "cgderid" => $person['personid'],
+            "cgder" => $person['person']
         ];
         $cgddata = [
-            "cgder_id" => $param['buyerid'],
-            'cgder' => $param['buyerid'],
+            "cgder_id" => $person['personid'],
+            'cgder' => $person['person'],
             "good_price" => $cgdPrice,
             "total_fee" => round($cgdPrice * $saleinfo['good_num'], 2),
             "supplierNo" => $param['supplierNo'],
-            "supplier_name" => $tmp['data'][$param['supplierNo']],
+            "supplier_name" => $supplierinfo['data']['name'],
 //			"companyNo"=>$param['companyNo'],
             "updatetime" => date("Y-m-d H:i:s"),
         ];