diff --git a/app/admin/logic/goods/GoodsLogic.php b/app/admin/logic/goods/GoodsLogic.php index 195c5a8..1a81924 100644 --- a/app/admin/logic/goods/GoodsLogic.php +++ b/app/admin/logic/goods/GoodsLogic.php @@ -31,25 +31,25 @@ class GoodsLogic extends BaseLogic try { Goods::create([ 'name' => $params['name'], - 'py' => $params['py'], + 'py' => $params['py'] ?? '', 'number' => $params['number'], 'spec' => $params['spec'], 'class' => $params['class'], - 'brand' => $params['brand'], + 'brand' => $params['brand'] ?? '', 'unit' => $params['unit'], 'buy' => $params['buy'], - 'sell' => $params['sell'], - 'retail' => $params['retail'], - 'code' => $params['code'], + 'sell' => $params['sell'] ?? '', + 'retail' => $params['retail'] ?? '', + 'code' => $params['code'] ?? '', 'warehouse' => $params['warehouse'], - 'location' => $params['location'], + 'location' => $params['location'] ?? '', 'stocktip' => $params['stocktip'], 'imgs' => $params['imgs'], 'details' => $params['details'] ? implode(',', $params['details']) : '', - 'data' => $params['data'], - 'more' => $params['more'], - 'sort' => $params['sort'], - 'sys_labels' => $params['sys_labels'] ?? '', + 'data' => $params['data'] ?? '', + 'more' => $params['more'] ?? '', + 'sort' => $params['sort'] ?? '', + 'sys_labels' => $params['sys_labels'], ]); Db::commit(); @@ -74,26 +74,26 @@ class GoodsLogic extends BaseLogic Db::startTrans(); try { Goods::where('id', $params['id'])->update([ - 'name' => $params['name'], - 'py' => $params['py'], - 'number' => $params['number'], - 'spec' => $params['spec'], - 'class' => $params['class'], - 'brand' => $params['brand'], - 'unit' => $params['unit'], - 'buy' => $params['buy'], - 'sell' => $params['sell'], - 'retail' => $params['retail'], - 'code' => $params['code'], - 'warehouse' => $params['warehouse'], - 'location' => $params['location'], - 'stocktip' => $params['stocktip'], - 'imgs' => $params['imgs'], - 'details' => $params['details'] ? implode(',', $params['details']) : '', - 'data' => $params['data'], - 'more' => $params['more'], - 'sort' => $params['sort'], - 'sys_labels' => $params['sys_labels'] ?? '', + 'name' => $params['name'], + 'py' => $params['py'] ?? '', + 'number' => $params['number'], + 'spec' => $params['spec'], + 'class' => $params['class'], + 'brand' => $params['brand'] ?? '', + 'unit' => $params['unit'], + 'buy' => $params['buy'], + 'sell' => $params['sell'] ?? '', + 'retail' => $params['retail'] ?? '', + 'code' => $params['code'] ?? '', + 'warehouse' => $params['warehouse'], + 'location' => $params['location'] ?? '', + 'stocktip' => $params['stocktip'], + 'imgs' => $params['imgs'], + 'details' => $params['details'] ? implode(',', $params['details']) : '', + 'data' => $params['data'] ?? '', + 'more' => $params['more'] ?? '', + 'sort' => $params['sort'] ?? '', + 'sys_labels' => $params['sys_labels'], ]); Db::commit(); diff --git a/app/admin/validate/goods/GoodsValidate.php b/app/admin/validate/goods/GoodsValidate.php index 88e32ea..9ed5255 100644 --- a/app/admin/validate/goods/GoodsValidate.php +++ b/app/admin/validate/goods/GoodsValidate.php @@ -21,10 +21,14 @@ class GoodsValidate extends BaseValidate protected $rule = [ 'id' => 'require', 'name' => 'require', + 'spec' => 'require', 'class' => 'require', - 'brand' => 'require', 'unit' => 'require', - // 'warehouse' => 'require', + 'sys_labels' => 'require', + 'buy' => 'require', + 'warehouse' => 'require', + 'stocktip' => 'require', + 'imgs' => 'require', ]; @@ -35,11 +39,14 @@ class GoodsValidate extends BaseValidate protected $field = [ 'id' => 'id', 'name' => '商品名称', - 'py' => '首拼字母', 'class' => '商品分类', - 'brand' => '商品品牌', + 'spec' => '规格型号', 'unit' => '商品单位', - 'warehouse' => '默认仓库', + 'sys_labels' => '标签', + 'buy' => '购货价格', + 'warehouse' => '默认仓库', + 'stocktip' => '库存阈值', + 'imgs' => '商品图片', ];