From f93a8d8a1f9ee048e474d0151fd92f38bbb79e22 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 14 Nov 2024 15:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(warehouse=5Forder):=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在导出功能中添加供应商名称显示
- 修复订单详情导出时的单价计算问题
- 优化导出表格的列标题和内容显示
- 增加对不支持的操作类型进行提示
---
.../warehouse_order/WarehouseOrderController.php | 9 +++++++++
app/common/service/xlsx/WarehouseOrdeRentry.php | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index fa7470f0a..7c20b1dc0 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -13,6 +13,7 @@ use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_order\StoreOrder;
use app\common\model\store_product\StoreProduct;
use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\supplier\Supplier;
use app\common\model\system_store\SystemStore;
use app\common\model\warehouse_order\WarehouseOrder;
use app\common\model\warehouse_product\WarehouseProduct;
@@ -209,6 +210,7 @@ class WarehouseOrderController extends BaseAdminController
$value->unit_name = '';
}
$order['total_num'] += $value->nums;
+ $value->supplier_name= Supplier::where('id', $value->supplier_id)->value('mer_name');
}
$file_path = $xlsx->export($data, $order);
@@ -222,6 +224,9 @@ class WarehouseOrderController extends BaseAdminController
{
$id = $this->request->post('id');
$type = $this->request->post('type');
+ if(in_array($type, [2,3])){
+ return $this->fail('暂不支持此操作');
+ }
$xlsx = new OrderDetail();
$order = WarehouseOrder::where('id', $id)->findOrEmpty();
$system_store = SystemStore::where('id', $order['store_id'])->value('name');
@@ -249,8 +254,12 @@ class WarehouseOrderController extends BaseAdminController
// $value->total_price=bcmul($find['price'],$value['nums'],2);
// $total_price+=$value->total_price;
// }else{
+ if($type==1){
$value->price = $value['purchase'];
+ $value->total_price=bcmul($value['purchase'],$value['nums'],2);
$total_price+=$value->total_price;
+ }
+
// }
$value->cart_num = $value['nums'];
diff --git a/app/common/service/xlsx/WarehouseOrdeRentry.php b/app/common/service/xlsx/WarehouseOrdeRentry.php
index 004964022..05af5bdda 100644
--- a/app/common/service/xlsx/WarehouseOrdeRentry.php
+++ b/app/common/service/xlsx/WarehouseOrdeRentry.php
@@ -34,7 +34,7 @@ class WarehouseOrdeRentry
$sheet->setCellValue('G2', $order['code']??'');
$sheet->setCellValue('A3', '序号');
$sheet->setCellValue('B3', '商品名称');
- $sheet->setCellValue('D3', '规格');
+ $sheet->setCellValue('D3', '供应商');
$sheet->setCellValue('F3', '单位');
$sheet->setCellValue('G3', '单价');
$sheet->setCellValue('H3', '数量');
@@ -53,10 +53,10 @@ class WarehouseOrdeRentry
$spreadsheet->getDefaultStyle()->applyFromArray($defaultStyle);
foreach ($data as $k => $v) {
- $sheet->setCellValue('A' . ($k + 4), $k+1 );
+ $sheet->setCellValue('A' . ($k + 4), $v['product_id'] );
$sheet->setCellValue('B' . ($k + 4), $v['store_name']);
$sheet->mergeCells('B' . ($k + 4) . ':C' . $k + 4);
- $sheet->setCellValue('D' . ($k + 4), $v['store_info']);
+ $sheet->setCellValue('D' . ($k + 4), $v['supplier_name']);
$sheet->mergeCells('D' . ($k + 4) . ':E' . $k + 4);
$sheet->setCellValue('F' . ($k + 4), $v['unit_name']);
$sheet->setCellValue('G' . ($k + 4), $v['purchase']);