Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/After.php

@@ -41,9 +41,9 @@ class After extends \app\BaseController
             return error_show(1004,"参数 num 不能为空或零");
         }
         $order_type =isset($this->post['order_type']) &&$this->post['order_type']!=''?intval($this->post['order_type']) :"";
-        if($order_type==""){
-            return error_show(1004,"参数 order_type 不能为空或零");
-        }
+//        if($order_type==""){
+//            return error_show(1004,"参数 order_type 不能为空或零");
+//        }
         $remark =isset($this->post['remark']) &&$this->post['remark']!=''?trim($this->post['remark']) :"";
         $except_code =isset($this->post['except_code']) &&$this->post['except_code']!=''?trim($this->post['except_code']) :"";
         $img = isset($this->post['img']) &&$this->post['img']!=''?trim($this->post['img']) :"";
@@ -77,7 +77,7 @@ class After extends \app\BaseController
                 "error_remark"=>$remark,
                 "remark"=>'',
                 "except_code"=>$except_code,
-                "order_type"=>$order_type,
+                "order_type"=>$order['order_type'],
                 "status"=>0,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),

app/admin/controller/Sale.php

@@ -551,6 +551,7 @@ public function out(){
             "wsm_code"=>$wsm_code,
             "orderCode"=>$orderCode,
             "outCode"=>$outCode,
+            "order_type"=>$der['order_type'],
             "apply_id"=>$rm,
             "apply_name"=>$ri,
             "addrid"=>$dr['id'],

app/admin/controller/Salezx.php

@@ -0,0 +1,242 @@
+<?php
+
+
+namespace app\admin\controller;
+use think\App;
+use think\facade\Db;
+class Salezx extends \app\BaseController
+{
+    public $post="";
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post=$this->request->post();
+    }
+
+    public function create(){
+        $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
+        $orderCode=makeNo("CX");
+        $zxNo=isset($this->post['zxNo']) && $this->post['zxNo'] !=="" ?trim($this->post['zxNo']):"";
+        if($zxNo==''){
+            return error_show(1004,"参数zxNo不能为空");
+        }
+        $zxinfo = Db::name("consult")->where(["zxNo"=>$zxNo,"is_del"=>0])->find();
+        if($zxinfo==false){
+            return error_show(1004,"未找到咨询单数据");
+        }
+        $customer_code= $this->post['customer_code'] && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']) :"";
+        if($customer_code==""){
+            return error_show(1002,"客户code不能为空");
+        }
+        $customer=Db::name("customer_info")->where(["companyNo"=>$customer_code])->find();
+        if($customer==false){
+            return error_show(1004,"未找到客户数据");
+        }
+        $sendtype =isset($this->post['sendtype']) && $this->post['sendtype'] !=="" ?trim($this->post['sendtype']):"";
+        if($sendtype==''){
+            return error_show(1004,"参数sendtype不能为空");
+        }
+        $good_num =isset($this->post['good_num']) && $this->post['good_num'] !=="" ?intval($this->post['good_num']):"";
+        if($good_num===''){
+            return error_show(1004,"参数good_num不能为空");
+        }
+        $goodtype =isset($this->post['goodtype']) && $this->post['goodtype'] !=="" ?intval($this->post['goodtype']):"";
+        if($goodtype===''){
+            return error_show(1004,"参数goodtype不能为空");
+        }
+        $remark =isset($this->post['remark']) && $this->post['remark'] !=="" ?trim($this->post['remark']):"";
+        $addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !=="" ?$this->post['addrlist']:"";
+        if($addrlist=="" || empty($addrlist)){
+            return error_show(1004,"参数addrlist不能为空");
+        }
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(1002,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
+        Db::startTrans();
+        try {
+            $data=[
+                "orderCode"=>$orderCode,
+                "good_code"=>isset($zxinfo['cpNo'])&&$zxinfo['cpNo']!==''?$zxinfo['cpNo']:'',
+                "customer_code"=>$customer_code,
+                "good_name"=>isset($zxinfo['cpName'])&&$zxinfo['cpName']!==''?$zxinfo['cpName']:'',
+                "good_num"=>$good_num,
+                "apply_id"=>$rm,
+                "apply_name"=>$ri,
+                "origin_price"=>$zxinfo['sale_fee'],
+                "sale_price"=>$zxinfo['sale_fee'],
+                "post_fee"=>$zxinfo['delivery_fee'],
+                "status"=>0,
+                "send_num"=>0,
+                "wsend_num"=>$good_num,
+                "send_status"=>1,
+                "good_type"=>$goodtype,
+                "send_type"=>$sendtype,
+                "is_del"=>0,
+                "remark"=>$remark,
+                "order_type"=>2,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s"),
+                'total_price'=>round($zxinfo['total_fee']*$good_num,2),
+            ];
+            $datainfo = Db::name('sale')->insert($data,true);
+            $vat=[];
+            if($datainfo>0){
+                $addgood=$this->addGood($zxinfo);
+
+                if($addgood==false){
+                    Db::rollback();
+                    return error_show(1002,"咨询订单创建商品失败");
+                }
+                $wsm = Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gysNo'],"wsm_type"=>2])->find();
+                if(empty($wsm)){
+                    Db::rollback();
+                    return error_show(1002,"供应商仓库未找到");
+                }
+                $cgd =makeNo("CG");
+                $clll=[
+                    "cgdNo"=>$cgd,
+                    "bkcode"=>$orderCode,
+                    "wsm_code"=>$wsm['wsm_code'],
+                    "cgder_id"=>"0",
+                    "cgder"=>$zxinfo['saler'],
+                    "good_code"=>"GD-".$zxinfo['cpNo'],
+                    "good_name"=>$zxinfo['cpName'],
+                    "good_type_code"=>$zxinfo['cpNo'],
+                    "good_num"=>$good_num,
+                    "good_price"=>$zxinfo['total_fee'],
+                    "total_fee"=>round($zxinfo['total_fee']*$good_num,2),
+                    "pakge_fee"=>$zxinfo['package_fee'],
+                    "cert_fee"=>$zxinfo['cert_fee'],
+                    "open_fee"=>$zxinfo['open_fee'],
+                    "delivery_fee"=>$zxinfo['delivery_fee'],
+                    "mark_fee"=>$zxinfo['mark_fee'],
+                    "teach_fee"=>$zxinfo['cost_fee'],
+                    "nake_fee"=>$zxinfo['bare_fee'],
+                    "weight"=>isset($zxinfo['weight'])?$zxinfo['weight']:0,
+                    "supplierNo"=>$zxinfo['gysNo'],
+                    "supplier_name"=>$zxinfo['gysname'],
+                    "send_num"=>0,
+                    "wsend_num"=>$good_num,
+                    "remark"=>$remark,
+                    "lasttime"=>date("Y-m-d H:i:s"),
+                    "is_del"=>0,
+                    "status"=>$sendtype==1?1:0,
+                    "order_type"=>2,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+                $cgin = Db::name("purchease_order")->insert($clll);
+              //  var_dump(Db::name("purchease_order")->getLastSql(),$clll);
+                if($cgin==false){
+                    Db::rollback();
+                    return error_show(1002,"咨询采购单创建商品失败");
+                }
+                foreach ($addrlist as $value){
+                    $temp=[];
+                    $addrs=[];
+                    if($value['addr_code']!==''&&is_array($value['addr_code'])){
+                        $addrs['provice_code'] = $value['addr_code'][0];
+                        $addrs['city_code'] = $value['addr_code'][1];
+                        $addrs['area_code'] = $value['addr_code'][2];
+                        $addr = json_encode($addrs);
+                    }else{
+                        $addr = isset($value['addr_code'])?$value['addr_code']:'';
+                    }
+                    $temp['orderCode']=$orderCode;
+                    $temp['contactor']=$value['contactor'];
+                    $temp['mobile'] = $value['mobile'];
+                    $temp['addr'] = $value['addr'];
+                    $temp['addr_code']=$addr;
+                    $temp['customer_code'] =$customer_code;
+                    $temp['receipt_quantity']=$value['receipt_quantity'];
+                    $temp['post_fee'] =0;
+                    $temp['is_del'] =0;
+                    $temp['addtime'] =date("Y-m-d H:i:s");
+                    $temp['updatetime'] =date("Y-m-d H:i:s");
+                    $temp['arrive_time']=$value['arrive_time'];
+                    $vat[]=$temp;
+                }
+                $vmp = Db::name('order_addr')->insertAll($vat);
+                if($vmp){
+                    Db::commit();
+                    return error_show(0,"咨询订单创建成功");
+                }
+            }
+            Db::rollback();
+            return error_show(1002,"咨询订单创建失败");
+        }catch(\Exception $e){
+            Db::rollback();
+            return error_show(1005,$e->getMessage());
+        }
+    }
+
+    /**咨询新建商品
+     * @param $data
+     * @return bool
+     */
+    public function addGood($data){
+        $isgood = Db::name("good")->where(["good_code"=>"GD-".$data["cpNo"]])->find();
+        if($isgood){
+            return true;
+        }
+        $good=[
+            "good_code"=>"GD-".$data["cpNo"],
+            "item"=>'咨询订单',
+            "good_name"=>$data["cpName"],
+            "good_desc"=>$data["desc"],
+            "brand"=>$data["brank"],
+            "original_price"=>$data["sale_price"],
+            "cg_saler"=>$data["saler"],
+            "good_type"=>$data["zxtype"],
+            "unit"=>$data["unit"],
+            "good_addr"=>$data["addr"],
+            "gys_code"=>$data["gysNo"],
+            "market_fee"=>$data["sale_fee"],
+            "is_online"=>'产品上线',
+            "sort_f"=>$data["cat_f"],
+            "sort_s"=>$data["cat_s"],
+            "cat_id"=>$data["cat_id"],
+            "status"=>1,
+            "is_del"=>0,
+            "addtime"=>date("Y-m-d H:i:s"),
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        $insert = Db::name("good")->insert($good);
+        if($insert){
+            $type=[
+                "type_code"=>$data['cpNo'],
+                "good_code"=>"GD-".$data["cpNo"],
+                "color"=>$data["color"],
+                "material"=>$data["material"],
+                "attribute"=>$data["model"],
+                "specs"=>$data["specs"],
+                "is_diff"=>$data["is_diff"],
+                "cert_fee"=>$data["cert_fee"],
+                "packing_fee"=>$data["package_fee"],
+                "mark_fee"=>$data["mark_fee"],
+                "cost_fee"=>$data["bare_fee"],
+                "logistics_fee"=>$data["delivery_fee"],
+                "logistics"=>$data["delivery_day"],
+                "min_num"=>$data["min_num"],
+                "unit_price"=>$data["sale_price"],
+                "status"=>1,
+                "is_del"=>0,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s"),
+            ];
+            $ert = Db::name("good_type")->insert($type);
+            if($ert){
+                return true;
+            }
+        }
+        return false;
+    }
+
+//    public function CgdAdd($data){
+//        $cgNo = makeNo("CG");
+//
+//    }
+}

app/admin/controller/Supplier.php

@@ -34,10 +34,10 @@ public function list(){
     if ($code !== "") {
         $where[] = ["code","=", $code];
     }
-//    $source = isset($this->post['source']) && $this->post['source'] !== "" ? trim($this->post['source']) : "";
-//    if ($source !== "") {
-//        $where['source'] = ["like", "%{source}%"];
-//    }
+    $is_platform = isset($this->post['is_platform']) && $this->post['is_platform'] !== "" ? intval($this->post['is_platform']) : "";
+    if ($is_platform !== "") {
+        $where[] = ['is_platform',"=", $is_platform];
+    }
 //    $area = isset($this->post['area']) && $this->post['area'] !== "" ? trim($this->post['area']) : "";
 //    if ($area !== "") {
 //        $where['area'] = ["like", "%{area}%"];
@@ -97,6 +97,9 @@ public function create(){
     if($nature==""){
         return error_show(1002,"公司类型不能为空");
     }
+    $is_platform = isset($this->post['is_platform']) && $this->post['is_platform']!==""? intval($this->post['is_platform'])
+        :"0";
+
     $ticket_type = isset($this->post['ticket_type']) && $this->post['ticket_type']!==""? trim($this->post['ticket_type']) :"";
     if($ticket_type==""){
         return error_show(1002,"回款方式不能为空");
@@ -116,6 +119,7 @@ public function create(){
         "is_del"=>0,"ticket_type"=>$ticket_type,
         "addtime"=>date('Y-m-d H:i:s'),
         "updatetime"=>date("Y-m-d H:i:s"),
+        "is_platform"=>$is_platform
     ];
     $join = Db::name('supplier')->insert($data);
     return $join? error_show(0,"添加成功") :error_show(1002,"添加失败");
@@ -159,7 +163,8 @@ public function edit(){
     if($legaler==""){
         return error_show(1002,"法人不能为空");
     }
-
+    $is_platform = isset($this->post['is_platform']) && $this->post['is_platform']!==""? intval($this->post['is_platform'])
+        :"0";
     $addr = isset($this->post['addr']) && $this->post['addr']!==""? trim($this->post['addr']) :"";
     if($addr==""){
         return error_show(1002,"地址不能为空");
@@ -169,7 +174,7 @@ public function edit(){
         "name"=>$name,"source"=>$source,
         "type"=>$type,"area"=>$area,"city"=>$city,
         "nature"=>$nature,"addr"=>$addr,
-        "is_del"=>0,"addtime"=>date('Y-m-d H:i:s'),
+        "is_del"=>0,"addtime"=>date('Y-m-d H:i:s'),"is_platform"=>$is_platform,
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $ed = Db::name('supplier')->where(['is_del'=>0,'id'=>$id])->save($vmp);

app/admin/route/app.php

@@ -248,3 +248,5 @@ Route::rule('reordercreate','admin/Reorder/create');
 Route::rule('reorderinfo','admin/Reorder/info');
 Route::rule('reorderdel','admin/Reorder/delete');
 Route::rule('reorderexam','admin/Reorder/exam');
+
+Route::rule('salezxcreate','admin/Salezx/create');