|
@@ -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']]??'';
|
|
|
}
|