ad

app/admin/controller/Consult.php

@@ -66,23 +66,12 @@ class Consult extends Base
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["b.createrid", 'in', get_company_item_user_by_name($company_name)];
-
-//        $role=$this->checkRole();
-//        if(!empty($role['write'])){
-//            $where[]=["b.createrid","in",$role['write']];
-//        }
-//        $role = $this->checkDataShare();
-//        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["b.createrid", "in", $role[DataGroupModel::$type_全部]];
-	    $role = $this->checkDataShare();
+	   $role = $this->checkDataShare();
         $hand = resign_hand_user($this->uid,0);
         if (!empty($role[DataGroupModel::$type_全部])) {
         	$arr= array_unique(array_merge($hand,$role[DataGroupModel::$type_全部]));
 			$where[] = ['b.createrid', 'in',$arr];
         }
-
-//        if(!empty($role['platform']) ){
-//            $where[]=["b.platform_code","in",$role['platform']];
-//        }
         $count = Db::name('consult_info')->alias("a")->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
@@ -1394,9 +1383,6 @@ class Consult extends Base
         }
 
         $bargain_reason =  isset($this->post['bargain_reason'])&& $this->post['bargain_reason']!=""?trim($this->post['bargain_reason']):"";
-//        if($bargain_reason===""){
-//            return error_show(1004,"参数bargain_reason不能为空");
-//        }
         $infos =Db::name("consult_info")->where(['infoNo'=>$info['infoNo'],"is_del"=>0])->find();
         if($infos==false){
             return error_show(1004,"未找到商品数据");
@@ -1404,14 +1390,7 @@ class Consult extends Base
         if($infos['status']!=2&&$infos['status']!=3&&$infos['status']!=7){
             return error_show(1004,"咨询单招标未结束或已确认商品");
         }
-//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-//        if($token==''){
-//            return error_show(105,"参数token不能为空");
-//        }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(1002,"用户数据不存在");
-//        }
+
         //新增两个字段
         //议价备注
         $bargain_remark = isset($this->post['bargain_remark']) && $this->post['bargain_remark'] != "" ? trim($this->post['bargain_remark']) : "";
@@ -1438,7 +1417,7 @@ class Consult extends Base
                 "cost_before_price"=>$info['sale_cost_fee'],
                 "cost_after_price"=>$cost_price,
                 "before_rate"=>round(($info['origin_price']-$info['total_fee'])/$info['origin_price'],2),
-                "after_rate"=>round(($bargain_price-$info['total_fee'])/$bargain_price,2),
+                "after_rate"=>$bargain_price==0?0:round(($bargain_price-$info['total_fee'])/$bargain_price,2),
                 "after_price"=>$bargain_price,
                 "exam_info"=>"",
                 "status"=>0,

app/admin/controller/Good.php

@@ -750,76 +750,27 @@ class Good extends Base
 
         $warehouse_info = Db::name("warehouse_info")
             ->alias("a")
-//                    ->leftJoin("business bus", "bus.companyNo=a.companyNo")
-//                    ->leftJoin("supplier b","a.supplierNo=b.code")
             ->where(['a.wsm_code'=>array_column($list,'wsm_code'),"a.is_del"=>0])
-            ->column("a.name as wsm_name,wsm_code,a.supplierNo,a.supplierName,a.companyNo,a.companyName",'a.wsm_code');
+            ->column("a.name as wsm_name,wsm_code,a.supplierNo,a.supplierName,a.companyNo,a.companyName,a
+            .contactor_name",'a.wsm_code');
 //            ->find();
 
-//        $userCommon = \app\admin\common\User::getIns();
-//        $names = $userCommon->handle('getCodeAndName', ['code'=>array_unique(array_merge(array_column($warehouse_info, 'supplierNo'), array_column($warehouse_info, 'companyNo')))]);
+        
+        $persionArr = get_personid_by_supplierNo(array_unique(array_column($list,"supplierNo")),"person");
 
 
         $data=[];
 
         foreach ($list as $key=>$value){
             $temp=[];
-            if($value['wsm_code']!=""){
-//                $wsm = Db::name("warehouse_info")
-//                    ->alias("a")
-////                    ->leftJoin("business bus", "bus.companyNo=a.companyNo")
-////                    ->leftJoin("supplier b","a.supplierNo=b.code")
-//                    ->where(['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])
-//                    ->field("a.name as wsm_name,wsm_code,a.supplierNo,a.companyNo")
-//                    ->find();
-//                $good = Db::name("good_stock")
-//                    ->alias("a")
-//                    ->leftJoin("good c","c.spuCode=a.spuCode")
-//                    ->where(["a.wsm_code"=>$value['wsm_code'],"a.is_del"=>0,"c.is_del"=>0])
-//                    ->select()
-//                    ->toArray();
-
-//                $names = $userCommon->handle('getCodeAndName', [$wsm['supplierNo'], $wsm['companyNo']]);
-//                $warehouse_info[$value['wsm_code']]['supplierName'] = $names['data'][$warehouse_info[$value['wsm_code']]['supplierNo']] ?? '';
-//                $warehouse_info[$value['wsm_code']]['company'] = $names['data'][$warehouse_info[$value['wsm_code']]['companyNo']] ?? '';
-
-                //商品单位和品牌
-//                $good_unit_s = Db::name("unit")->whereIn('id', array_column($good, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
-//                $brands = Db::name("brand")->whereIn('id', array_column($good, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
-
-//                foreach ($good as &$item_good){
-//                    //规格信息
-//                    $spec = Db::name("good_spec")->field('id,spec_id,spec_value_id')->where(["spuCode" => $item_good['spuCode'], "is_del" => 0])->select()->toArray();
-//
-//                    $speclist = [];
-//                    if (!empty($spec)) {
-//                        foreach ($spec as $val) {
-//                            $tmp = [];
-//                            $tmp['spec_id'] = $val['spec_id'];
-//                            $tmp['spec_value_id'] = $val['spec_value_id'];
-//                            $sp = Db::name("specs")->where(["id" => $val['spec_id']])->find();
-//                            $tmp['spec_name'] = isset($sp["spec_name"]) ? $sp["spec_name"] : "";
-//                            $spv = Db::name("spec_value")->where(["id" => $val['spec_value_id']])->find();
-//                            $tmp['spec_value'] = isset($spv["spec_value"]) ? $spv["spec_value"] : "";
-//                            $speclist[] = $tmp;
-//                        }
-//                    }
-//                    $item_good['specinfo'] = $speclist;
-//                    $item_good['unit'] = $good_unit_s[$item_good['good_unit']]??'';
-//                    $item_good['brand_name'] = $brands[$item_good['brand_id']]??'';
-//                    $item_good['can'] = made($item_good['cat_id'],[]);
-//                    $item_good['total_stock'] =$item_good['usable_stock']+$item_good['wait_out_stock'];
-//
-//                }
-
-
-            }
             $temp['wsm_name'] = isset($warehouse_info[$value['wsm_code']]['wsm_name'])?$warehouse_info[$value['wsm_code']]['wsm_name']:"";
             $temp['wsm_code']=$value['wsm_code'];
             $temp['supplier_code']=isset($warehouse_info[$value['wsm_code']]['supplierNo'])?$warehouse_info[$value['wsm_code']]['supplierNo']:"";
             $temp['supplier_name']=isset($warehouse_info[$value['wsm_code']]['supplierName'])?$warehouse_info[$value['wsm_code']]['supplierName']:"";
             $temp['company_no']=isset($warehouse_info[$value['wsm_code']]['companyNo'])?$warehouse_info[$value['wsm_code']]['companyNo']:"";
             $temp['company_name']=isset($warehouse_info[$value['wsm_code']]['companyName'])?$warehouse_info[$value['wsm_code']]['companyName']:"";
+            $temp['contactor_name']=isset($warehouse_info[$value['wsm_code']]['contactor_name'])?$warehouse_info[$value['wsm_code']]['contactor_name']:"";
+            $temp['person']=$persionArr[$warehouse_info[$value['wsm_code']]['supplierNo']]??"";
             $temp['usable_stock'] = $value['usable_stock'];
             $temp['wait_in_stock'] = $value['wait_in_stock'];
             $temp['wait_out_stock'] = $value['wait_out_stock'];
@@ -942,16 +893,16 @@ class Good extends Base
                     $child = Db::name("good_stock")
                         ->alias("a")
                         ->join("warehouse_info b", "a.wsm_code=b.wsm_code", "left")
-//                        ->join("business bus", "bus.companyNo=b.companyNo", "left")
-//                        ->join("supplier s", "s.code=b.supplierNo", "left")
                         ->where(['a.spuCode' => $value['spuCode'], "a.is_del" => 0])
                         ->where("b.wsm_type","<>",2)
-                        ->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,(a.wait_out_stock+a.usable_stock) total_stock,a.warn_stock,b.supplierNo,b.companyNo")
+                        ->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,(a.wait_out_stock+a.usable_stock) total_stock,a.warn_stock,b.supplierNo,b.companyNo,b.contactor_name")
                         ->select()
                         ->toArray();
 
                     foreach ($child as &$vvv){
                         $names = $userCommon->handle('getCodeAndName',['code'=>[$vvv['supplierNo'],$vvv['companyNo']]]);
+                        $person = get_personid_by_supplierNo($vvv['supplierNo'],"person");
+                        $vvv['person'] =$person[$vvv['supplierNo']]??"";
                         $vvv['supplierName'] = $names['data'][$vvv['supplierNo']]??'';
                         $vvv['company'] = $names['data'][$vvv['companyNo']]??'';
                     }

app/admin/controller/OrderOutChild.php

@@ -502,7 +502,7 @@ class OrderOutChild extends Base
         $val = Validate::rule([
             'outChildCode|发货工单号' => 'require|max:255',
             'post_name|物流公司' => 'require|max:255',
-            'post_code|物流单号' => 'require|alphaDash|max:255',
+            'post_code|物流单号' => 'require|max:255',
             'post_fee|物流费用' => 'require|egt:0|max:99999999.99'
         ]);
 

app/admin/controller/Sale.php

@@ -875,6 +875,7 @@ class Sale extends Base
         if ($sale_price < $zxinfo['sale_price']) {
             return error_show(1003, "修改的销售单价不能低于原来的销售单价");
         }
+         $goodtype = isset($this->post['goodtype']) && $this->post['goodtype'] !== '' ? intval($this->post['goodtype']) : '1';
         $sendtype = isset($this->post['sendtype']) && $this->post['sendtype'] != "" ? intval($this->post['sendtype']) : "";
         if ($sendtype == "") {
             return error_show(1003, "参数sendtype不能为空");
@@ -1003,7 +1004,7 @@ class Sale extends Base
                 "send_num" => 0,
                 "wsend_num" => $good_num,
                 "send_status" => 1,
-                "good_type" => 1,
+                "good_type" =>$goodtype,
                 "send_type" => $sendtype,
                 "supplierNo" => $companyNo,
                 "supplierName" =>$companyinfo['data'][$companyNo]??"",
@@ -4648,8 +4649,8 @@ class Sale extends Base
         $list = Db::name("order_out")
             ->alias('a')
             ->field('"" as 序号,a.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,b.orderCode as 确认单号,b.addtime as 确认单时间,
-            b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,po.supplier_name as 供应商名称,po.supplierNo as 供应商编号,po.nake_fee as 裸价,
-            a.post_fee as 物流费,b.send_type as 发货方式,po.good_price as 采购单价,b.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,a.send_num 发货数量,
+            b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,b.supName as 供应商名称,b.supNo as 供应商编号,
+            a.post_fee as 物流费,b.send_type as 发货方式,b.remark as 确认单备注,po.good_num as 采购数量,a.send_num 发货数量,
             oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.addr_code,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,
             b.platform_order 平台订单号,a.post_name 发货申请单物流公司,a.post_code 发货申请单物流单号,a.post_fee 发货申请单物流费用,a.remark 发货申请单备注,a.apply_name 申请人,b.cat_id 商品分类')
             ->whereIn('a.outCode', $outCodes)