yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 06:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-采购流程变更

Browse Source
This commit is contained in:
杨建炊 2024-09-05 10:14:22 +08:00
parent a9d04bdf18
commit fcd6735028
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Goods/GoodsCombinationController.php
View File

@ -12,6 +12,7 @@ use App\Models\GoodsSku;
use App\Utils\GeneratorUtils; use App\Utils\GeneratorUtils;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
@ -25,7 +26,7 @@ class GoodsCombinationController extends Controller
$skus = GoodsSku::query() $skus = GoodsSku::query()
->with([ ->with([
'combinationGoods:id,goods_sku_id,item_id,item_num', 'combinationGoods:id,goods_sku_id,item_id,item_num',
'combinationGoods.goodsSkuItem:id,goods_id,title,stock,sale_stock,external_sku_id,updated_at,yesterday_num,reference_price,status', 'combinationGoods.goodsSkuItem:id,name,goods_id,title,stock,sale_stock,external_sku_id,updated_at,yesterday_num,reference_price,status',
'combinationGoods.goodsSkuItem.goods:id,title,img_url', 'combinationGoods.goodsSkuItem.goods:id,title,img_url',
]) ])
->where('is_combination', 1) ->where('is_combination', 1)
@ -66,8 +67,10 @@ class GoodsCombinationController extends Controller
->sum('already_cancel_number'); ->sum('already_cancel_number');
$item['total_orders_num'] = $number - $cancelNumber; $item['total_orders_num'] = $number - $cancelNumber;
foreach ($item['combinationGoods'] as $combinationItem) { foreach ($item['combinationGoods'] as $combinationItem) {
$title = !empty($combinationItem['goodsSkuItem']['goods']['name'])?$combinationItem['goodsSkuItem']['goods']['name']: Log::info("TEST", [$combinationItem]);
$combinationItem['goodsSkuItem']['goods']['title'] . " " . $combinationItem['goodsSkuItem']['title']; $title = !empty($combinationItem['goodsSkuItem']['name']) ? $combinationItem['goodsSkuItem']['name'] :
(!empty($combinationItem['goodsSkuItem']['goods']) ? $combinationItem['goodsSkuItem']['goods']['title']
. " " . $combinationItem['goodsSkuItem']['title'] : $combinationItem['goodsSkuItem']['title']);
$items[] = [ $items[] = [
'cost' => 0, 'cost' => 0,
'external_sku_id' => $combinationItem['goodsSkuItem']['external_sku_id'], 'external_sku_id' => $combinationItem['goodsSkuItem']['external_sku_id'],
@ -79,8 +82,8 @@ class GoodsCombinationController extends Controller
'status' => $combinationItem['goodsSkuItem']['status'], 'status' => $combinationItem['goodsSkuItem']['status'],
'stock' => $combinationItem['goodsSkuItem']['stock'], 'stock' => $combinationItem['goodsSkuItem']['stock'],
'sale_stock' => $combinationItem['goodsSkuItem']['sale_stock'], 'sale_stock' => $combinationItem['goodsSkuItem']['sale_stock'],
'thumb_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], 'thumb_url' => null,
'img_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], 'img_url' => null,//图片暂时去掉
'title' => $title, 'title' => $title,
'updated_at' => $combinationItem['goodsSkuItem']['updated_at'], 'updated_at' => $combinationItem['goodsSkuItem']['updated_at'],
'yesterday_num' => $combinationItem['goodsSkuItem']['yesterday_num'], 'yesterday_num' => $combinationItem['goodsSkuItem']['yesterday_num'],