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

Merge pull request '修改预订单出库' (#559) from dev into main

Browse Source 
Reviewed-on: #559
This commit is contained in:
mkm 2025-03-26 10:19:06 +08:00
commit 5a00d7a858
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -377,7 +377,6 @@ class BeforehandOrderLogic extends BaseLogic
public static function createOutboundOrder(array $params): bool public static function createOutboundOrder(array $params): bool
{ {
$warehouse_id = $params['warehouse_id']; $warehouse_id = $params['warehouse_id'];
$store_id = $params['store_id'];
$admin_id = $params['admin_id']; $admin_id = $params['admin_id'];
$delivery_time = $params['delivery_time']; $delivery_time = $params['delivery_time'];
$mark = $params['remark'] ?? ''; $mark = $params['remark'] ?? '';
@ -391,6 +390,7 @@ class BeforehandOrderLogic extends BaseLogic
if ($order['outbound_id'] > 0) { if ($order['outbound_id'] > 0) {
throw new BusinessException('该订单已创建出库单'); throw new BusinessException('该订单已创建出库单');
} }
$store_id = $order['store_id'];
$info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray(); $info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray();
$product_column = array_column($info, 'product_id'); $product_column = array_column($info, 'product_id');
$storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select(); $storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select();

2
app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
View File

@ -393,7 +393,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
throw new BusinessException('请选择入库仓库'); throw new BusinessException('请选择入库仓库');
} }
$purchaseProductOffer = PurchaseProductOffer::where('id', $params['id'])->find(); $purchaseProductOffer = PurchaseProductOffer::where('id', $params['id'])->find();
if (empty($purchaseProductOffer) || $params['warehouse_num'] == 0) { if (empty($purchaseProductOffer) || $params['warehouse_num'] == 0 || empty($purchaseProductOffer['total_price'])) {
throw new BusinessException('请先设置采购信息再入库'); throw new BusinessException('请先设置采购信息再入库');
} }
if ($purchaseProductOffer['is_storage'] == 1) { if ($purchaseProductOffer['is_storage'] == 1) {

5
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -215,6 +215,11 @@ class PurchaseProductOfferLogic extends BaseLogic
$params['manufacture'] = !empty($params['manufacture']) ? strtotime($params['manufacture']) : ''; $params['manufacture'] = !empty($params['manufacture']) ? strtotime($params['manufacture']) : '';
$params['expiration_date'] = !empty($params['expiration_date']) ? strtotime($params['expiration_date']) : ''; $params['expiration_date'] = !empty($params['expiration_date']) ? strtotime($params['expiration_date']) : '';
$offer = PurchaseProductOffer::where(['id' => $params['id']])->find(); $offer = PurchaseProductOffer::where(['id' => $params['id']])->find();
$lastPrice = PurchaseProductOffer::where(['product_id' => $offer['product_id']])->where('status', 1)->order('id desc')->value('price');
$currentPrice = bcdiv($params['total_price'], $params['buyer_nums'], 2);
if (!empty($lastPrice) && ($currentPrice > $lastPrice * 3 || $currentPrice < $lastPrice / 3)) {
throw new BusinessException('价格异常，请重新输入');
}
// $uid=Admin::where('id',$params['admin_id'])->value('uid'); // $uid=Admin::where('id',$params['admin_id'])->value('uid');
// if($params['admin_id']!=1){ // if($params['admin_id']!=1){
// if($offer['buyer_id']!=$uid){ // if($offer['buyer_id']!=$uid){