|
@@ -736,9 +736,18 @@ class Good extends Base
|
|
|
->select()
|
|
|
->toArray();
|
|
|
$data=[];
|
|
|
+
|
|
|
+ $action_uids = array_column($list, 'action_uid');
|
|
|
+ $action_uids = array_unique($action_uids);
|
|
|
+ $item = [];
|
|
|
+ foreach ($action_uids as $action_uid) {
|
|
|
+ $items = Db::name("depart_user")->where('uid', $action_uid)->column("itemid");
|
|
|
+ foreach ($items as $it) {
|
|
|
+ $item[$action_uid][] = implode('/', array_column(GetPart($it), 'name'));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
foreach ($list as $value){
|
|
|
- $db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
|
|
|
- $item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
|
|
|
$wsm = Db::name("warehouse_info")
|
|
|
->alias("a")
|
|
|
->Join("supplier b","a.supplierNo=b.code","left")
|
|
@@ -756,7 +765,7 @@ class Good extends Base
|
|
|
$value['code'] =$wsm['code'];
|
|
|
$value['name'] =$wsm['name'];
|
|
|
$value['action_type_cn'] =$this->acton[$value['action_type']];
|
|
|
- $value['item'] =$item;
|
|
|
+ $value['item'] =$item[$value['action_uid']];
|
|
|
$value['can'] =$int;
|
|
|
$value['company'] =$wsm['company']??'';
|
|
|
$value['companyNo'] =$wsm['companyNo']??'';
|