|
|
@@ -393,11 +393,17 @@ class Good extends Base
|
|
|
$data['unit'] = isset($unit['unit'])?$unit['unit']:'';
|
|
|
$data['cat_info'] = made($data['cat_id'],[]);
|
|
|
$spec = Db::name("good_spec")->where(["spuCode"=>$good_platform['spuCode'],"is_del"=>0])->select()->toArray();
|
|
|
- $supplier = Db::name("supplier")->where(["code"=>$data['supplierNo']])->find();
|
|
|
- $data['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$data['supplierNo'],$data['companyNo']]]);
|
|
|
+// $supplier = Db::name("supplier")->where(["code"=>$data['supplierNo']])->find();
|
|
|
+ $data['supplierName'] = $names['data'][$data['supplierNo']]??'';//isset($supplier['name'])?$supplier['name']:"";
|
|
|
+
|
|
|
+// $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
|
|
|
+ $data['company'] = $names['data'][$data['companyNo']]??'';//isset($company['company'])?$company['company']:"";
|
|
|
+
|
|
|
$data['noble_name']=isset($data['noble_metal'])&&$data['noble_metal']!=0?$this->noble[$data['noble_metal']] :"";
|
|
|
- $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
|
|
|
- $data['company'] = isset($company['company'])?$company['company']:"";
|
|
|
+
|
|
|
if($data['brand_id']!=0){
|
|
|
$brand=Db::name("brand")->where(["id"=>$data['brand_id']])->find();
|
|
|
$data["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
|
|
|
@@ -608,16 +614,23 @@ class Good extends Base
|
|
|
$page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
|
|
|
$list = Db::name("good_stock")->where($condition)->page($page,$size)->order("addtime desc")->select();
|
|
|
$data=[];
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+
|
|
|
foreach ($list as $key=>$value){
|
|
|
$temp=[];
|
|
|
if($value['wsm_code']!=""){
|
|
|
$wsm = Db::name("warehouse_info")
|
|
|
->alias("a")
|
|
|
- ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
- ->leftJoin("business bus","a.companyNo=bus.companyNo")
|
|
|
+// ->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
+// ->leftJoin("business bus","a.companyNo=bus.companyNo")
|
|
|
->where(['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])
|
|
|
- ->field("a.name as wsm_name,wsm_code,a.supplierNo,b.name supplierName,a.companyNo,bus.company")
|
|
|
+ ->field("a.name as wsm_name,wsm_code,a.supplierNo,a.companyNo")
|
|
|
->find();
|
|
|
+
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$wsm['supplierNo'],$wsm['companyNo']]]);
|
|
|
+ $wsm['supplierName'] = $names['data'][$wsm['supplierNo']]??'';
|
|
|
+ $wsm['company'] = $names['data'][$wsm['companyNo']]??'';
|
|
|
}
|
|
|
$temp['wsm_name'] = isset($wsm['wsm_name'])?$wsm['wsm_name']:"";
|
|
|
$temp['wsm_code']=$value['wsm_code'];
|
|
|
@@ -730,15 +743,17 @@ class Good extends Base
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$data=[];
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
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")
|
|
|
+// ->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,b.name supplierName,a.companyNo,bus.company")
|
|
|
+ ->field("a.name as wsm_name,wsm_code,a.supplierNo,a.companyNo")
|
|
|
->find();
|
|
|
$good = Db::name("good_stock")
|
|
|
->alias("a")
|
|
|
@@ -747,6 +762,10 @@ class Good extends Base
|
|
|
->select()
|
|
|
->toArray();
|
|
|
|
|
|
+ $names = $userCommon->handle('getCodeAndName', [$wsm['supplierNo'], $wsm['companyNo']]);
|
|
|
+ $wsm['supplierName'] = $names['data'][$wsm['supplierNo']] ?? '';
|
|
|
+ $wsm['company'] = $names['data'][$wsm['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');
|
|
|
@@ -843,19 +862,26 @@ class Good extends Base
|
|
|
$good_unit_s = Db::name("unit")->whereIn('id', array_column($list, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
|
|
|
$brands = Db::name("brand")->whereIn('id', array_column($list, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
|
|
|
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
foreach ($list as $key => $value) {
|
|
|
$temp = [];
|
|
|
if ($value['spuCode'] != "") {
|
|
|
$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")
|
|
|
+// ->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,s.name supplierName,b.companyNo,bus.company")
|
|
|
+ ->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")
|
|
|
->select()
|
|
|
->toArray();
|
|
|
+
|
|
|
+ foreach ($child as &$val){
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>[$val['supplierNo'],$val['companyNo']]]);
|
|
|
+ $val['supplierName'] = $names['data'][$val['supplierNo']]??'';
|
|
|
+ $val['company'] = $names['data'][$val['companyNo']]??'';
|
|
|
+ }
|
|
|
// echo Db::name("good_stock")->getLastSql();
|
|
|
}
|
|
|
$temp['good_name'] = $value['good_name'];
|
|
|
@@ -1058,15 +1084,21 @@ class Good extends Base
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+
|
|
|
foreach ($list as &$value){
|
|
|
$wsm = Db::name("warehouse_info")
|
|
|
->alias("a")
|
|
|
- ->Join("supplier b","a.supplierNo=b.code","left")
|
|
|
- ->Join("business bus","bus.companyNo=a.companyNo","left")
|
|
|
+// ->Join("supplier b","a.supplierNo=b.code","left")
|
|
|
+// ->Join("business bus","bus.companyNo=a.companyNo","left")
|
|
|
->where(['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])
|
|
|
->field("a.name as wsm_name,wsm_code,b.code,b.name,bus.company,bus.companyNo")
|
|
|
->find();
|
|
|
|
|
|
+ $names = $userCommon->handle('getCodeAndName', ['code' => [$wsm['supplierNo'], $wsm['companyNo']]]);
|
|
|
+ $wsm['supplierName'] = $names['data'][$wsm['supplierNo']] ?? '';
|
|
|
+ $wsm['company'] = $names['data'][$wsm['companyNo']] ?? '';
|
|
|
+
|
|
|
// $godd = Db::name("good")->field('id,good_name,cat_id,is_stock')->where(["spuCode" => $value['spuCode'], "is_del" => 0])->find();
|
|
|
// $value['good_name']=isset($godd['good_name'])? $godd['good_name']:"";
|
|
|
// $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";
|
|
|
@@ -1161,19 +1193,36 @@ class Good extends Base
|
|
|
// ->select();halt($list);
|
|
|
// ->toArray();
|
|
|
$data = [];
|
|
|
+
|
|
|
+ $platform = Db::name('platform')
|
|
|
+ ->whereIn('id',array_column($list,'platform_code'))
|
|
|
+ ->column('platform_name,platform_code','id');
|
|
|
+
|
|
|
+ $brand = Db::name('brand')
|
|
|
+ ->whereIn('id',array_column($list,'brand_id'))
|
|
|
+ ->column('brand_name','id');
|
|
|
+
|
|
|
+ $unit = Db::name('unit')
|
|
|
+ ->whereIn('id',array_column($list,'good_unit'))
|
|
|
+ ->column('unit','id');
|
|
|
+
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+
|
|
|
+ $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'companyNo'))]);
|
|
|
+
|
|
|
foreach ($list as $value) {
|
|
|
$value['cat_info'] = made($value['cat_id'], []);
|
|
|
- $platform = Db::name("platform")->where(["id" => $value['platform_code']])->find();
|
|
|
- $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name'] : "";
|
|
|
- $value['platform_code_en'] = isset($platform['platform_code']) ? $platform['platform_code'] : "";
|
|
|
- $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
|
|
|
- $value['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
|
|
|
- $brand = Db::name("brand")->where(["id" => $value['brand_id']])->find();
|
|
|
- $value["brand_name"] = isset($brand['brand_name']) ? $brand['brand_name'] : "";
|
|
|
- $unit = Db::name("unit")->where(["id" => $value['good_unit']])->find();
|
|
|
- $value['unit'] = isset($unit['unit']) ? $unit['unit'] : "";
|
|
|
- $company = Db::name("business")->where(["companyNo" => $value['companyNo']])->find();
|
|
|
- $value['company'] = isset($company['company']) ? $company['company'] : "";
|
|
|
+// $platform = Db::name("platform")->where(["id" => $value['platform_code']])->find();
|
|
|
+ $value['platform_name'] = $platform[$value['platform_code']]['platform_name']??'';//isset($platform['platform_name']) ? $platform['platform_name'] : "";
|
|
|
+ $value['platform_code_en'] = $platform[$value['platform_code']]['platform_code']??'';//isset($platform['platform_code']) ? $platform['platform_code'] : "";
|
|
|
+// $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
|
|
|
+ $value['supplier_name'] = $names['data'][$value['supplierNo']]??'';//isset($supplier['name']) ? $supplier['name'] : "";
|
|
|
+// $brand = Db::name("brand")->where(["id" => $value['brand_id']])->find();
|
|
|
+ $value["brand_name"] = $brand[$value['brand_id']]??'';//isset($brand['brand_name']) ? $brand['brand_name'] : "";
|
|
|
+// $unit = Db::name("unit")->where(["id" => $value['good_unit']])->find();
|
|
|
+ $value['unit'] = $unit[$value['good_unit']]??'';//isset($unit['unit']) ? $unit['unit'] : "";
|
|
|
+// $company = Db::name("business")->where(["companyNo" => $value['companyNo']])->find();
|
|
|
+ $value['company'] = $names['data'][$value['companyNo']]??'';//isset($company['company']) ? $company['company'] : "";
|
|
|
$value['stock_total'] = Db::name("good_stock")->where(['spuCode' => $value['spuCode'], "is_del" => 0])->sum("usable_stock");
|
|
|
$value['status'] = $value['exam_status'];
|
|
|
$data[] = $value;
|
|
|
@@ -1262,10 +1311,14 @@ class Good extends Base
|
|
|
->whereIn('id', array_column($list, 'brand_id'))
|
|
|
->column('brand_name', 'id');
|
|
|
|
|
|
- $all_company = Db::name('business')
|
|
|
- ->where('is_del', 0)
|
|
|
- ->whereIn('companyNo', array_column($list, 'companyNo'))
|
|
|
- ->column('company', 'companyNo');
|
|
|
+ $userCommon = new \app\admin\common\User();
|
|
|
+ $names = $userCommon->handle('getCodeAndName', ['code' => array_column($list, 'companyNo')]);
|
|
|
+ $all_company = $names['data'];
|
|
|
+
|
|
|
+// $all_company = Db::name('business')
|
|
|
+// ->where('is_del', 0)
|
|
|
+// ->whereIn('companyNo', array_column($list, 'companyNo'))
|
|
|
+// ->column('company', 'companyNo');
|
|
|
|
|
|
foreach ($list as &$value) {
|
|
|
$value['cat_info'] = made($value['cat_id'], []);
|
