yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-11-30 22:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: #10000 修改

Browse Source
This commit is contained in:
赵世界 2023-04-21 18:06:33 +08:00
parent cf3f7fad4d
commit ffe64ed58b
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Exports/GoodsSkusExport.php
View File

@ -59,7 +59,6 @@ class GoodsSkusExport implements FromCollection, ShouldAutoSize
->when($ids, function ($query, $ids) { ->when($ids, function ($query, $ids) {
return $query->whereIn('id', $ids); return $query->whereIn('id', $ids);
}) })
->where('is_combination', 0)
->with(['goods' => function ($query) { ->with(['goods' => function ($query) {
$query->with(['type:id,name', 'brand:id,name']) $query->with(['type:id,name', 'brand:id,name'])
->orderBy('type_id') ->orderBy('type_id')

2
app/Http/Controllers/Goods/GoodsSkusController.php
View File

@ -52,7 +52,7 @@ class GoodsSkusController extends Controller
$query->where('day', $day); $query->where('day', $day);
}]) }])
->where('is_combination', 0) ->where('is_combination', 0)
->orderByDesc('stock') ->orderBy('updated_at', 'desc')
->paginate($request->get('per_page')); ->paginate($request->get('per_page'));
$fields = implode(',', [ $fields = implode(',', [
'shop_id', 'shop_id',

2
app/Listeners/StockUpdateListener.php
View File

@ -41,7 +41,7 @@ class StockUpdateListener
->select(['goods_id', 'sku_id', 'external_sku_id']) ->select(['goods_id', 'sku_id', 'external_sku_id'])
->where('shop_id', $shop->id) ->where('shop_id', $shop->id)
->where('is_sync', 1) ->where('is_sync', 1)
->where('external_sku_id', $event->goodsSku->goods['goods_code'] . '_' . $event->goodsSku->sku_code) ->where('external_sku_id', $event->goodsSku->external_sku_id)
->get(); ->get();
if ($event->isBatch) { if ($event->isBatch) {
BusinessFactory::init()->make($shop['plat_id'])->setShopWithId($shop['id'])->batchIncrQuantity($businessGoodsSkus->toArray(), $num, false); BusinessFactory::init()->make($shop['plat_id'])->setShopWithId($shop['id'])->batchIncrQuantity($businessGoodsSkus->toArray(), $num, false);

4
resources/frontend/vue.config.js vendored
View File

@ -11,8 +11,8 @@ module.exports = {
proxy: { proxy: {
// 配置代理 // 配置代理
"/api": { "/api": {
target: "http://192.168.247.186:81", // target: "http://192.168.247.186:81",
// target: "http://erp.chutang66.com", target: "http://erp.chutang66.com",
changeOrigin: true, // 开启代理 changeOrigin: true, // 开启代理
pathRewrite: { pathRewrite: {
// 重命名 // 重命名