|
|
@@ -109,7 +109,16 @@ class ControlGoods extends Controller
|
|
|
$store_scope = request('store_scope', '');
|
|
|
$all_data['store_scope'] = $store_scope;
|
|
|
//查询是否存在
|
|
|
- $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'],'platform'=> $all_data['platform']];
|
|
|
+ $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs']];
|
|
|
+ $ControlGoodsModel = $ControlGoodsModel->query();
|
|
|
+ if($all_data['platform'] != ''){
|
|
|
+ $platforms = explode(',', $all_data['platform']);
|
|
|
+ $ControlGoodsModel->where(function ($query) use ($platforms) {
|
|
|
+ foreach ($platforms as $platform) {
|
|
|
+ $query->orWhere('platform', 'like', "%{$platform}%");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
$data = $ControlGoodsModel->where($map)->first();
|
|
|
if ($data) return json_send(['code' => 'error', 'msg' => '记录已存在']);
|
|
|
// 写入数据表
|
|
|
@@ -136,8 +145,17 @@ class ControlGoods extends Controller
|
|
|
$all_data = request()->all();
|
|
|
$store_scope = request('store_scope','');
|
|
|
$all_data['store_scope'] = $store_scope;
|
|
|
- //查询是否存在
|
|
|
- $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'],'platform'=> $all_data['platform']];
|
|
|
+ //查询是否存在
|
|
|
+ $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs']];
|
|
|
+ $ControlGoodsModel = $ControlGoodsModel->query();
|
|
|
+ if($all_data['platform'] != ''){
|
|
|
+ $platforms = explode(',', $all_data['platform']);
|
|
|
+ $ControlGoodsModel->where(function ($query) use ($platforms) {
|
|
|
+ foreach ($platforms as $platform) {
|
|
|
+ $query->orWhere('platform', 'like', "%{$platform}%");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
$data = $ControlGoodsModel->where($map)->where('id', '!=', $id)->first();
|
|
|
if ($data) return json_send(['code' => 'error', 'msg' => '记录已存在']);
|
|
|
// 更新数据表
|