From 18185dab6c1dc7f29b71bfc318d484094e6ea0ab Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 19 Dec 2024 11:26:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor(warehouse):=20=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改 order_type 字段为 type，提高代码可读性
- 添加 type 字段到 WarehouseOrder 模型，用于区分订单类型
- 更新 WarehouseProductLogic::setOutbound 方法，替代原有的 add 方法
- 优化订单编号生成逻辑，根据订单类型动态生成
---
.../warehouse_order/WarehouseOrderController.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index 5a33b7df1..1053faeee 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -74,10 +74,10 @@ class WarehouseOrderController extends BaseAdminController
$warehouse_id = $this->request->post('warehouse_id');
$delivery_time = $this->request->post('delivery_time');
$mark = $this->request->post('mark');
- $order_type = $this->request->post('order_type', 1);
+ $type = $this->request->post('order_type', 1);
Db::startTrans();
try {
- if($order_type==1){
+ if($type==1){
$code=getNewOrderId('TGY');
}else{
$code=getNewOrderId('BS');
@@ -104,7 +104,8 @@ class WarehouseOrderController extends BaseAdminController
'nums' => $arr['stock'],
'status' => 1,
'admin_id' => $this->adminId,
- 'order_type' => $order_type,
+ 'type' => $type,
+ 'order_type' => 0,
];
$storeProduct = StoreProduct::where('id', $arr['id'])->find();
$data['total_price'] = bcmul($arr['stock'], $storeProduct['purchase'], 2);
@@ -112,7 +113,7 @@ class WarehouseOrderController extends BaseAdminController
$data['oid'] = $res['id'];
$data['financial_pm'] = 0;
$data['price'] = $storeProduct['price'];
- WarehouseProductLogic::add($data);
+ WarehouseProductLogic::setOutbound($data);
$finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();
WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]);
}