diff --git a/app/admin/logic/goods/GoodsLogic.php b/app/admin/logic/goods/GoodsLogic.php index 1a81924..fb8d04c 100644 --- a/app/admin/logic/goods/GoodsLogic.php +++ b/app/admin/logic/goods/GoodsLogic.php @@ -29,6 +29,11 @@ class GoodsLogic extends BaseLogic { Db::startTrans(); try { + $sys_labels=''; + if($params['sys_labels']){ + $sys_labels=explode(',',$params['sys_labels']); + $sys_labels= ','.implode(',',$sys_labels).','; + } Goods::create([ 'name' => $params['name'], 'py' => $params['py'] ?? '', @@ -49,7 +54,7 @@ class GoodsLogic extends BaseLogic 'data' => $params['data'] ?? '', 'more' => $params['more'] ?? '', 'sort' => $params['sort'] ?? '', - 'sys_labels' => $params['sys_labels'], + 'sys_labels' => $sys_labels, ]); Db::commit(); @@ -73,6 +78,11 @@ class GoodsLogic extends BaseLogic { Db::startTrans(); try { + $sys_labels=''; + if($params['sys_labels']){ + $sys_labels=explode(',',$params['sys_labels']); + $sys_labels= ','.implode(',',$sys_labels).','; + } Goods::where('id', $params['id'])->update([ 'name' => $params['name'], 'py' => $params['py'] ?? '', @@ -93,7 +103,7 @@ class GoodsLogic extends BaseLogic 'data' => $params['data'] ?? '', 'more' => $params['more'] ?? '', 'sort' => $params['sort'] ?? '', - 'sys_labels' => $params['sys_labels'], + 'sys_labels' => $sys_labels, ]); Db::commit(); diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php index cf2cf15..6bf3363 100644 --- a/app/admin/logic/operation/OpurchaseclassLogic.php +++ b/app/admin/logic/operation/OpurchaseclassLogic.php @@ -213,13 +213,14 @@ class OpurchaseclassLogic extends BaseLogic } foreach ($supplier_arr as $k => $v) { $goods_offer[] = [ - 'supplier_id' => $v['supplier'], - 'goods_id' => $v['goods'], + 'supplier_id' => $v['id'], + 'goods_id' => $goods['goods'], 'price' => 0, - 'need_num' => $v['nums'] + 'need_num' => $goods['nums'] ]; } - if ($goods_offer) { + d($goods_offer); + if (count($goods_offer)>1) { $res = OpurchaseGoodsOffer::insertAll($goods_offer); if ($res) { return true; diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php index ce17302..0035d9f 100644 --- a/app/admin/logic/supplier/SupplierLogic.php +++ b/app/admin/logic/supplier/SupplierLogic.php @@ -30,13 +30,18 @@ class SupplierLogic extends BaseLogic { Db::startTrans(); try { + $sys_labels=''; + if($params['sys_labels']){ + $sys_labels=explode(',',$params['sys_labels']); + $sys_labels= ','.implode(',',$sys_labels).','; + } $res= Supplier::create([ 'category_id' => $params['category_id'], 'type_id' => $params['type_id'] ?? '', 'mer_name' => $params['mer_name'], 'settle_cycle' => $params['settle_cycle']??15, 'interest_rate' => $params['interest_rate']??0, - 'sys_labels' => $params['sys_labels'] ?? '', + 'sys_labels' => $sys_labels, 'province_id' => $params['province_id'] ?? '', 'city_id' => $params['city_id'] ?? '', 'area_id' => $params['area_id'] ?? '', @@ -141,13 +146,18 @@ class SupplierLogic extends BaseLogic { Db::startTrans(); try { + $sys_labels=''; + if($params['sys_labels']){ + $sys_labels=explode(',',$params['sys_labels']); + $sys_labels= ','.implode(',',$sys_labels).','; + } Supplier::where('id', $params['id'])->update([ 'category_id' => $params['category_id']??'', 'type_id' => $params['type_id'] ?? '', 'mer_name' => $params['mer_name'], 'settle_cycle' => $params['settle_cycle'] ?? 15, 'interest_rate' => $params['interest_rate'] ?? 0, - 'sys_labels' => $params['sys_labels'] ?? '', + 'sys_labels' => $sys_labels, 'province_id' => $params['province_id'] ?? '', 'city_id' => $params['city_id'] ?? '', 'area_id' => $params['area_id'] ?? '',