ad

app/admin/controller/Activity.php

@@ -181,7 +181,7 @@ class Activity extends Base
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") $where[] = ['a.supplierNo', "like", "%$supplierNo%"];
         $name = isset($this->post['name']) && $this->post['name'] !== "" ? trim($this->post['name']) : "";
-        if ($name != "") $where[] = ['b.name', "like", "%$name%"];
+        if ($name != "") $where[] = ['a.supplierName', "like", "%$name%"];
         $start = isset($this->post['start']) && $this->post['start'] !== "" ? trim($this->post['start']) : "";
         if ($start != "") $where[] = ['a.addtime', ">=", $start];
         $end = isset($this->post['end']) && $this->post['end'] !== "" ? trim($this->post['end']) : "";
@@ -192,7 +192,6 @@ class Activity extends Base
 
         $count = Db::name('good_zixun')
             ->alias("a")
-            ->join("supplier b","b.code=a.supplierNo","left")
             ->where($where)
             ->count();
         $total = ceil($count / $size);
@@ -224,20 +223,27 @@ class Activity extends Base
         $all_code = array_merge(array_column($list,'supplierNo'),array_column($list,'companyNo'));
         $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_code]);
+        $depart = get_company_name_by_uid( array_unique(array_column($list,'order_createrid')));
 
 //halt($list);
         $data=[];
         //分类/规格/品牌 等字段取出对应文字
+        $goodbasice = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('status',"spuCode");
+        $good_online = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('id',"spuCode");
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);
-//            $platform = Db::name("platform")->where(["id"=>$value['platform_id']])->find();
+            $value['is_basic']=$goodbasice[$value['spuCode']]?:null;
+            $value['order_creater_depart']=$depart[$value['order_createrid']]?:'';
+            
+            $value['is_online']=isset($good_online[$value['spuCode']])?1:0;
+
             $value['platform_name'] = $all_platform[$value['platform_id']]??'';//isset($platform['platform_name']) ? $platform['platform_name']:"";
             $value['platform_code_en'] = '';//isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
-//            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+
             $value['supplier_name'] = $tmp[$value['supplierNo']] ?? '';//isset($supplier['name']) ? $supplier['name']:"";
-//            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
+
             $value["brand_name"]=$all_brand[$value['brand_id']]??'';//isset($brand['brand_name'])?$brand['brand_name']:"";
-//            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
+
             $value['unit'] =$all_unit[$value['good_unit']]??'';//isset($unit['unit'])?$unit['unit']:"";
 //            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
             $value['company'] = $tmp[$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";

app/admin/controller/Check.php

@@ -27,15 +27,9 @@ public function __construct(App $app)
         $condtion = [['b.is_del', "=", 0], ['c.is_del', "=", 0]];
         $wsmcode = isset($this->post['wsm_code']) && $this->post['wsm_code'] !== "" ? trim($this->post['wsm_code']) : "";
         if ($wsmcode !== "") {
-            //return error_show(1002,"仓库code不能为空");
             $condtion[] = ['c.wsm_code', "=", $wsmcode];
-            // $typecode= Db::name("good_stock")->where(["wsm_code"=>$wsmcode,'is_del'=>0])->column("good_type_code");
         }
-
-//    $good_code =isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
-//    if($good_code!=""){
-//        $condtion[]=['b.type_code',"=",$good_code];
-//    }
+        
         $goodcode = isset($this->post['good_code']) && $this->post['good_code'] !== "" ? trim($this->post['good_code']) : "";
         if ($goodcode != "") {
             // $condtion['a.good_code'] = Db::raw("like '%{$goodcode}%'");

app/admin/controller/DataGroup.php

@@ -46,7 +46,7 @@ class DataGroup extends Base
             });
         }
         if ($param['type'] != '') $rs->where('a.type', $param['type']);
-        if ($param['supplierNo'] != '') $rs->where('a.supplierNo', '%' . $param['supplierNo'], '%');
+//        if ($param['supplierNo'] != '') $rs->where('a.supplierNo', '%' . $param['supplierNo'], '%');
 
         $count = $rs->count('a.id');
 
@@ -68,7 +68,7 @@ class DataGroup extends Base
         $param = $this->request->filter('trim')->only(['title', 'uids', 'type', 'remark' => '', 'supplierNo']);
 
         $val = Validate::rule([
-            'supplierNo|公司名称' => 'require|length:18',
+//            'supplierNo|公司名称' => 'require|length:18',
             'title|用户组名称' => 'require|max:100',
             'uids|组成员' => 'require|array|max:100',
             'type|共享类型' => 'require|number|in:' . DataGroupModel::$type_可编辑 . ',' . DataGroupModel::$type_只读 . ',' . DataGroupModel::$type_不共享,
@@ -82,7 +82,7 @@ class DataGroup extends Base
 
             //添加用户组
             $group_id = Db::name('data_group')->insertGetId([
-                'supplierNo' => $param['supplierNo'],
+//                'supplierNo' => $param['supplierNo'],
                 'title' => $param['title'],
                 'type' => $param['type'],
                 'remark' => $param['remark'],
@@ -279,34 +279,12 @@ class DataGroup extends Base
     //用户组列表（全部）
     public function getDataGroupListAll()
     {
-//        $param = $this->request->filter('trim')->only(['status' => '', 'title' => '', 'type' => '']);
 
-        $db = new DataGroupModel();
-
-//        $rs = $db
-//            ->alias('a')
-//            ->leftJoin('data_group_userid b', 'b.data_group_id=a.id AND b.is_del=' . DataGroupModel::$delete_正常)
-//            ->leftJoin('depart_user u', 'u.uid=b.uid AND u.is_del=0')
-//            ->group('a.id')
-//            ->where('a.is_del', DataGroupModel::$delete_正常);
-
-//        $val = Validate::rule([
-//            'status|状态' => 'number|in:' . DataGroupModel::$status_启用 . ',' . DataGroupModel::$status_禁用,
-//            'title|用户组名称' => 'max:100',
-////            'nickname|成员名称' => 'max:100',
-//            'type|共享类型' => 'number|in:' . DataGroupModel::$type_可编辑 . ',' . DataGroupModel::$type_只读 . ',' . DataGroupModel::$type_不共享,
-//        ]);
 
-//        if (!$val->check($param)) return error_show(1005, $val->getError());
-
-//        if ($param['status'] != '') $rs->where('a.status', $param['status']);
-//        if ($param['title'] != '') $rs->whereLike('a.title', '%' . $param['title'] . '%');
-//        if ($param['nickname'] != '') $rs->whereLike('u.nickname', '%' . $param['nickname'] . '%');
-//        if ($param['type'] != '') $rs->where('a.type', $param['type']);
+        $db = new DataGroupModel();
 
         $list = $db
             ->where('is_del', DataGroupModel::$delete_正常)
-//            ->field('a.*,GROUP_CONCAT(u.nickname) nickname')
             ->field('id,title,status')
             ->order('id', 'desc')
             ->select()

app/admin/controller/Good.php

@@ -489,7 +489,11 @@ class Good extends Base
         $proof =Db::name("good_proof")->where(["spuCode"=>$good_platform['spuCode'],"is_del"=>0])->order("updatetime desc")->field("id,proof_type,proof_url")->find();
         $data['proof'] = isset($proof)&&$proof!=false? $proof:[];
         $data["nakelist"]=$nakearry;
-
+		$data['sale_price'] = 0;
+        if($data['create_source']==1){
+        	$data['sale_price'] = Db::name('sale')->where(['spuCode'=>$good_platform['spuCode'],'order_type'=>3])->value
+        	('sale_price',0);
+        }
         //补充采购员字段
         //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
         $temp_basic_info = Db::name('good_basic')

app/admin/controller/Goodup.php

@@ -1471,6 +1471,11 @@ class Goodup extends Base
         if ($data['is_gold_price'] == 1) {
             $gold = Db::name("gold_price1")->where(["type" => $data['noble_metal'], "status" => 1, "is_del" => 0])->order("addtime desc")->find();
         }
+        $data['cgd_price'] = 0;
+        if($data['create_source']==1){
+        	$data['cgd_price'] = Db::name("purchease_order")->where(["spuCode"=>$supcode,"order_type"=>3])->value
+        	("good_price",0);
+        }
         $data['gold_price'] =isset($gold["price"])?$gold["price"]:0;
             $speclist=[];
         if(!empty($spec)){
@@ -3021,7 +3026,7 @@ class Goodup extends Base
             Db::name("good_zixun")
                 ->where(["is_del" => 0, 'status' => 1])
                 ->whereIn('spuCode', $param['codes'])
-                ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s')]);
+                ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s'),'is_basic'=>1]);
 
             if (!empty($good_insert_data)) Db::name('good')->insertAll($good_insert_data);
 
@@ -3579,7 +3584,7 @@ class Goodup extends Base
             Db::name('good_zixun')
                 ->where(['is_del' => 0, 'status' => 1])
                 ->whereIn('spuCode', $param['codes'])
-                ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s')]);
+                ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s'),"is_basic"=>1]);
 
             if (!empty($good_spec_insert_data)) Db::name('good_spec')->insertAll($good_spec_insert_data);
             

app/admin/controller/Sale.php

@@ -1131,6 +1131,8 @@ class Sale extends Base
                     "is_del" => 0,
                     "createrid" => $zxinfo['createrid'],
                     "creater" => $zxinfo['creater'],
+                    "order_createrid" => $this->uid,
+                    "order_creater" =>  $this->uname,
                     "addtime" => date("Y-m-d H:i:s"),
                     "updatetime" => date("Y-m-d H:i:s"),
                     'proof_type' => $proof_type,//凭证类型