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

app/Http/Controllers/Api/SkuApiController.php

@@ -233,6 +233,7 @@ class SkuApiController extends Controller
             'futures_cp_time_day' => $request->input('futures_cp_time_day'),
         ];
 
+
         if (empty($cpTimeData['cp_time_day']) && $cpTimeData['day_type'] == 1) {
             $this->response(-1, '货期有效期天数不能为0');
         }

app/Http/Controllers/SkuController.php

@@ -153,6 +153,8 @@ class SkuController extends Controller
             $supplier = $supplier->toArray();
             $supplierCodes[$supplier['supplier_code']] = $supplier['supplier_name'] . '(' . $supplier['supplier_code'] . ')';
         }
+        $supplierData = SupplierService::getSupplierCodeListForXmSelect();
+        $this->data['supplierData'] = $supplierData;
         $this->data['title'] = '商品有效期配置';
         $this->data['supplierCodes'] = $supplierCodes;
         return $this->view('商品有效期配置');

app/Http/routes.php

@@ -86,5 +86,15 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], 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(),
+    ]);
 });

resources/views/web/SetSupplierSkuCpTimeLimit.blade.php

@@ -19,9 +19,8 @@
             </div>
             <div class="layui-form-item" style="display: none" id="supplier_code_div">
                 <div class="layui-inline" style="margin-left: 73px;">
-                    @inject('statusPresenter','App\Presenters\StatusPresenter')
-                    {!! $statusPresenter->render('supplier_code','供应商编码',null,
-                     $supplierCodes,['required'=>true,'width'=>'350px']) !!}
+                    @inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
+                    {!! $multiSelectorPresenter->render('supplier_code','供应商选择','',$supplierData,['required'=>true,'radio'=>'true','width'=>'400px']) !!}
                 </div>
             </div>
             <div class="layui-form-item">