Commit 36c99b4e by 杨树贤

Merge branch 'master' into ysx-寄售相关需求-20241226

parents 3b46af89 c39eda75
...@@ -233,6 +233,7 @@ class SkuApiController extends Controller ...@@ -233,6 +233,7 @@ class SkuApiController extends Controller
'futures_cp_time_day' => $request->input('futures_cp_time_day'), 'futures_cp_time_day' => $request->input('futures_cp_time_day'),
]; ];
if (empty($cpTimeData['cp_time_day']) && $cpTimeData['day_type'] == 1) { if (empty($cpTimeData['cp_time_day']) && $cpTimeData['day_type'] == 1) {
$this->response(-1, '货期有效期天数不能为0'); $this->response(-1, '货期有效期天数不能为0');
} }
......
...@@ -153,6 +153,8 @@ class SkuController extends Controller ...@@ -153,6 +153,8 @@ class SkuController extends Controller
$supplier = $supplier->toArray(); $supplier = $supplier->toArray();
$supplierCodes[$supplier['supplier_code']] = $supplier['supplier_name'] . '(' . $supplier['supplier_code'] . ')'; $supplierCodes[$supplier['supplier_code']] = $supplier['supplier_name'] . '(' . $supplier['supplier_code'] . ')';
} }
$supplierData = SupplierService::getSupplierCodeListForXmSelect();
$this->data['supplierData'] = $supplierData;
$this->data['title'] = '商品有效期配置'; $this->data['title'] = '商品有效期配置';
$this->data['supplierCodes'] = $supplierCodes; $this->data['supplierCodes'] = $supplierCodes;
return $this->view('商品有效期配置'); return $this->view('商品有效期配置');
......
...@@ -86,5 +86,15 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function () ...@@ -86,5 +86,15 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
}); });
Route::match(['get', 'post'], '/test', function () { Route::match(['get', 'post'], '/test', function () {
(new \App\Http\Services\SyncSupplierService())->syncSupplierToErp(2335); \App\Model\SupplierChannelModel::where('supplier_id', 129)->update([
'is_entity' => -1,
'status' => 2,
'update_time' => time(),
]);
\App\Model\SupplierChannelModel::where('supplier_id', 8214)->update([
'is_entity' => 1,
'status' => -2,
'update_time' => time(),
]);
}); });
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
</div> </div>
<div class="layui-form-item" style="display: none" id="supplier_code_div"> <div class="layui-form-item" style="display: none" id="supplier_code_div">
<div class="layui-inline" style="margin-left: 73px;"> <div class="layui-inline" style="margin-left: 73px;">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $statusPresenter->render('supplier_code','供应商编码',null, {!! $multiSelectorPresenter->render('supplier_code','供应商选择','',$supplierData,['required'=>true,'radio'=>'true','width'=>'400px']) !!}
$supplierCodes,['required'=>true,'width'=>'350px']) !!}
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment