Merge branch 'master-online' into master-online-bn

app/admin/controller/Purch.php

@@ -109,8 +109,10 @@ class Purch extends Base
             $where[]=['on.orderCode',"like", '%'.$orderCode.'%'];
         }
         $role=$this->checkRole();
+        $whereor=[];
         if(!empty($role['write'])){
-            $where[]=["po.cgder_id","in",$role['write']];
+            $whereor[]=["po.cgder_id","in",$role['write']];
+            $whereor[]=["sip.personid","=",$this->uid];
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["po.cgder_id", 'in', get_company_item_user_by_name($company_name)];
@@ -121,20 +123,26 @@ class Purch extends Base
         $count = Db::name("purchease_order")
             ->alias('po')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
+            ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
             ->where($where)
             ->where(function ($query) use ($where) {
                 $query->whereOr([['po.order_type', '<>', 1], ['po.order_source', '=', 0]]);
-            })
-            ->count();
+            })->where(function ($query) use ($whereor) {
+                $query->whereOr($whereor);
+            })->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name("purchease_order")
             ->alias('po')
             ->leftJoin('order_num on','on.cgdNo=po.cgdNo')
             ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
-            ->field('po.*,on.orderCode,u.itemid')
+             ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
+            ->field('po.*,on.orderCode,u.itemid,sip.personid as supplier_cgderid,sip.person as supplier_cgder')
             ->where($where)
             ->where(function($query) use ($where){$query->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]]);})
+            ->where(function ($query) use ($whereor) {
+                $query->whereOr($whereor);
+            })
             ->page($page,$size)
             ->order("po.addtime desc")
             ->select()
@@ -151,9 +159,9 @@ class Purch extends Base
                 $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
                 $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             }
-			$supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
-            $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
-            $value['supplier_cgder'] = $supplierCgder['person'] ??'';
+//			$supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
+//            $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
+//            $value['supplier_cgder'] = $supplierCgder['person'] ??'';
             if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";

app/admin/controller/Sale.php

@@ -4341,6 +4341,7 @@ class Sale extends Base
             ->leftJoin('purchease_order c', 'c.cgdNo=b.cgdNo')
             ->where([
                 ['a.is_del', '=', 0],
+                ['c.order_type', '<>', 1],
                 ['a.outCode', 'in', array_column($param['list'], 'outCode')],
             ])->column('c.supplierNo', 'a.outCode');
 

app/admin/controller/Stat.php

@@ -89,7 +89,7 @@ FROM
 				k.itemid = c.id 
 			     and f.is_del=0
 				AND f.platform_id = a.platform_id 
-				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
+				AND WEEK ( e.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
 				AND DATE_FORMAT ( e.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) AS week_thfee,
 		a.platform_id,
 		c.`name`,

app/command/ImportOrderFromCHandleData.php

@@ -15,11 +15,13 @@ use think\console\input\Option;
 use think\console\Output;
 use think\Exception;
 use think\facade\Cache;
+use think\facade\Config;
 use think\facade\Db;
 
 //C端订单导入-处理
 class ImportOrderFromCHandleData extends Command
 {
+
     protected function configure()
     {
         // 指令配置
@@ -204,6 +206,7 @@ class ImportOrderFromCHandleData extends Command
                         'gold_price' => $ct['cgd_gold_price'],
                         'good_createrid' => $goodinfo['createrid'],
                         'good_creater' => $goodinfo['creater'],//商品创建人
+                         "weight"=>$ct['noble_weight']
                     ];
 
                     $send_num = $extend_data['num'];
@@ -507,7 +510,7 @@ class ImportOrderFromCHandleData extends Command
             "demo_fee" => $data['demo_fee'],
             "nake_fee" => $data['nake_fee'],
             "delivery_fee" => $data['delivery_fee'],
-            #"weight"=>$data['weight'],
+            "weight"=>$data['weight'],
             "diff_weight" => "0",
             "diff_fee" => "0",
             "gold_price" => $data['gold_price'],

app/command/NowReportHandle.php

@@ -179,7 +179,7 @@ class NowReportHandle extends Command
 							wait_in_stock '待入库存数量',
 							wait_out_stock '待出库存数量',
 							usable_stock '可用库存数量',
-							wait_out_stock+usable_stock '当前库存',
+							wait_out_stock+usable_stock '当前库存数量',
 							'' as '可用库存金额',
 							'' as '当前库存金额',
 							'' as '保质期时间',
@@ -187,7 +187,7 @@ class NowReportHandle extends Command
 							wgb.creater as 'CGD.采购员',
 							ws.`name` as '供应商名称',
 							wwi.`name` as '仓库名称',
-							'' as '最近入库时间' ")
+							wp.addtime as '备库创建时间' ")
             ->leftJoin('purchease_order wpo', 'wgs.spuCode = wpo.spuCode and order_source=0')
             ->leftJoin('purchease wp', 'wp.bk_code = wpo.bkcode')
             ->leftJoin('warehouse_info wwi', 'wwi.wsm_code = wgs.wsm_code')
@@ -206,12 +206,11 @@ class NowReportHandle extends Command
             $value['申请部门'] = get_company_name_by_uid(intval($value['申请部门']));
             $value['一级分类'] = isset($cat[0]['name'])?$cat[0]['name']:"";
             $value['可用库存金额'] = bcmul((string)$value['可用库存数量'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
-            $value['当前库存金额'] = bcmul((string)$value['当前库存'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
-            $value['最近入库时间'] =Db::name("purchease_order")->alias("a")->leftJoin("purchease_in c","a.cgdNo=c.cgdNo")->where(["spuCode"=>
-                $value['产品编号'],"order_type"=>1,"order_source"=>0,"c.status"=>[4,6]])->order("a.addtime desc")->value("c.addtime","");
-            if (!empty($value['最近入库时间'])) {
-                $value['保质期时间'] = date('Y-m-d H:i:s', strtotime($value['最近入库时间']) + 31536000);//365天之后
-                $value['库存天数'] = bcdiv((string)(time() - strtotime($value['最近入库时间'])), (string)(24 * 3600));//365天之后
+            $value['当前库存金额'] = bcmul((string)$value['当前库存数量'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
+//            $value['最近入库时间'] =Db::name("purchease_order")->alias("a")->leftJoin("purchease_in c","a.cgdNo=c.cgdNo")->where(["spuCode"=>$value['产品编号'],"order_type"=>1,"order_source"=>0,"c.status"=>[4,6]])->order("a.addtime desc")->value("c.addtime","");
+            if (!empty($value['备库创建时间'])) {
+                $value['保质期时间'] = date('Y-m-d H:i:s', strtotime($value['备库创建时间']) + 31536000);//365天之后
+                $value['库存天数'] = bcdiv((string)(time() - strtotime($value['备库创建时间'])), (string)(24 * 3600));//365天之后
             }
             yield $list[] = $value;
         }
@@ -423,7 +422,7 @@ class NowReportHandle extends Command
                                wpo.good_name as '商品名称',
                             if(wpi.status=4,wpi.send_num,wpi.wsm_num) '入库数量',
 	                        round( if(wpi.status=4,wpi.send_num,wpi.wsm_num) * good_price, 2 ) '入库金额',
-                               wpo.updatetime '本次入库时间',
+                               wpi.updatetime '本次入库时间',
                             wgb.tax/100 '采购税率',
                             '' as '不含税入库金额',
                             ''  as '税额',
@@ -433,7 +432,8 @@ class NowReportHandle extends Command
                                wpo.good_price '成本裸价',
                                wsm_type '仓库类型',
                                ws.name '供应商名称',
-                               wwi.name '仓库名称'
+                               wwi.name '仓库名称',
+                               wp.addtime '备库创建时间'
              ")->cursor();
         $data=[];
         foreach($list as $value){