mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
lewis 2025-04-18 16:32:27 +08:00
commit 463da3cef1
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php
View File

@ -88,6 +88,16 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe
return [];
}
}
if($this->request->get('class_all')){
$where[] = ['top_cate_id', 'in', $this->request->get('class_all')];
}
$ids = StoreProduct::where($where)->column('id');
if ($ids) {
$this->searchWhere[] = ['product_id', 'in', $ids];
$this->ids = $ids;
} else {
return [];
}
return WarehouseProductStorege::where($this->searchWhere)
->field(['id','is_verify','warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'])
->limit($this->limitOffset, $this->limitLength)

18
app/common/service/xlsx/OrderSupplyOutbound.php
View File

@ -48,10 +48,10 @@ class OrderSupplyOutbound
$sheet->setCellValue('B3', '品名');
$sheet->setCellValue('C3', '单位');
$sheet->setCellValue('D3', '数量');
$sheet->setCellValue('E3', '出库单价');
$sheet->setCellValue('F3', '出库总价');
$sheet->setCellValue('G3', '供货价');
$sheet->setCellValue('H3', '供货总价');
$sheet->setCellValue('E3', '进货单价');
$sheet->setCellValue('F3', '进货总价');
$sheet->setCellValue('G3', '零售单价');
$sheet->setCellValue('H3', '零售总价');
$sheet->setCellValue('I3', '利润');
$sheet->setCellValue('J3', '备注');
@ -71,10 +71,10 @@ class OrderSupplyOutbound
$sheet->setCellValue('B' . ($k + 4), $v['store_name']);
$sheet->setCellValue('C' . ($k + 4), $v['unit_name']);
$sheet->setCellValue('D' . ($k + 4), $v['nums']);
$sheet->setCellValue('E' . ($k + 4), $v['price']);
$sheet->setCellValue('F' . ($k + 4), $v['total_price']);
$sheet->setCellValue('G' . ($k + 4), $v['purchase']);
$sheet->setCellValue('H' . ($k + 4), $v['pay_price']);
$sheet->setCellValue('E' . ($k + 4), $v['purchase']);
$sheet->setCellValue('F' . ($k + 4), $v['pay_price']);
$sheet->setCellValue('G' . ($k + 4), $v['price']);
$sheet->setCellValue('H' . ($k + 4), $v['total_price']);
$sheet->setCellValue('I' . ($k + 4), $v['profit']);
$sheet->mergeCells('J' . ($k + 4) . ':K' . $k + 4);
$sheet->setCellValue('J' . ($k + 4), $v['mark']);
@ -84,7 +84,7 @@ class OrderSupplyOutbound
$sheet->setCellValue('A' . ($count + 4),'合计');
$sheet->setCellValue('B' . ($count + 4),$count);
$sheet->setCellValue('J' . ($count + 4),$order['group_title']??'');
// $sheet->setCellValue('J' . ($count + 4),$order['group_title']??'');
$sheet->setCellValue('A' . ($count + 5),'累计接单:');
$sheet->setCellValue('C' . ($count + 5),'预收金额:');