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

Merge pull request 'dev' (#396) from dev into main

Browse Source 
Reviewed-on: #396
This commit is contained in:
mkm 2024-12-18 16:01:30 +08:00
commit 58f7be4779
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/lists/beforehand_order/BeforehandOrderLists.php
View File

@ -110,6 +110,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$item->outbound = '无须出库';
} elseif ($item->order_type == 6) {
$item->order_type_name = '往期补单';
} elseif ($item->order_type == 7) {
$item->order_type_name = '采购订单';
}
$item->msg = '';
$count1 = PurchaseProductOffer::where('order_id', $item->id)->where('buyer_confirm', 0)->count('id');

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

@ -190,9 +190,9 @@ class BeforehandOrderLogic extends BaseLogic
$total_prices = $v['total_price'];
$v['uid'] = $params['user_id'];
$v['store_id'] = $params['store_id'];
$find = StoreBranchProduct::where('store_id', $params['store_id'])->where('product_id', $v['product_id'])->find();
$find = StoreBranchProduct::where('store_id', $params['store_id'])->where('product_id', $v['product_id'])->withTrashed()->find();
if (!$find) {
$product = StoreProduct::where('id', $v['product_id'])->find();
$product = StoreProduct::where('id', $v['product_id'])->withTrashed()->find();
$find = StoreProductLogic::ordinary($product, $params['store_id'], 0, $product);
}
@ -678,6 +678,10 @@ class BeforehandOrderLogic extends BaseLogic
{
$order_info = new OrderInfo();
$order = BeforehandOrder::where('id', $params['id'])->find();
if ($order['order_type'] == 7 && $params['print'] == 1) {
$order->is_buying = 1;
$order->save();
}
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
$data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find();

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

@ -41,13 +41,23 @@ class PurchaseProductOfferLogic extends BaseLogic
{
Db::startTrans();
try {
$procurementOrder = BeforehandOrder::where('order_type', 7)->where('is_buying', 0)->find();
if (empty($procurementOrder)) {
$beforeOrder = BeforehandOrder::where('id', $params['order_id'])->findOrEmpty()->toArray();
unset($beforeOrder['id'], $beforeOrder['create_time'], $beforeOrder['update_time']);
$procurementOrder = new BeforehandOrder();
$procurementOrder->setAttrs($beforeOrder);
$procurementOrder->order_id = getNewOrderId('CG');
$procurementOrder->order_type = 7;
$procurementOrder->save();
}
$mark = $params['mark'] ?? '';
if ($mark == '') {
$mark = BeforehandOrderCartInfo::where('bhoid', $params['order_id'])->where('product_id', $params['product_id'])->value('mark');
}
$find=StoreProduct::where('id',$params['product_id'])->find();
PurchaseProductOffer::create([
'order_id' => $params['order_id'],
'order_id' => $procurementOrder['id'],
'product_id' => $params['product_id'],
'unit' => $params['unit'],
'is_buyer' => $params['is_buyer'],