mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-18 17:07:34 +08:00
parent 3417e462fb
commit 36b5856386
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/admin/logic/goods/GoodsLogic.php
View File

@ -29,6 +29,11 @@ class GoodsLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$sys_labels='';
if($params['sys_labels']){
$sys_labels=explode(',',$params['sys_labels']);
$sys_labels= ','.implode(',',$sys_labels).',';
}
Goods::create([ Goods::create([
'name' => $params['name'], 'name' => $params['name'],
'py' => $params['py'] ?? '', 'py' => $params['py'] ?? '',
@ -49,7 +54,7 @@ class GoodsLogic extends BaseLogic
'data' => $params['data'] ?? '', 'data' => $params['data'] ?? '',
'more' => $params['more'] ?? '', 'more' => $params['more'] ?? '',
'sort' => $params['sort'] ?? '', 'sort' => $params['sort'] ?? '',
'sys_labels' => $params['sys_labels'], 'sys_labels' => $sys_labels,
]); ]);
Db::commit(); Db::commit();
@ -73,6 +78,11 @@ class GoodsLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$sys_labels='';
if($params['sys_labels']){
$sys_labels=explode(',',$params['sys_labels']);
$sys_labels= ','.implode(',',$sys_labels).',';
}
Goods::where('id', $params['id'])->update([ Goods::where('id', $params['id'])->update([
'name' => $params['name'], 'name' => $params['name'],
'py' => $params['py'] ?? '', 'py' => $params['py'] ?? '',
@ -93,7 +103,7 @@ class GoodsLogic extends BaseLogic
'data' => $params['data'] ?? '', 'data' => $params['data'] ?? '',
'more' => $params['more'] ?? '', 'more' => $params['more'] ?? '',
'sort' => $params['sort'] ?? '', 'sort' => $params['sort'] ?? '',
'sys_labels' => $params['sys_labels'], 'sys_labels' => $sys_labels,
]); ]);
Db::commit(); Db::commit();

9
app/admin/logic/operation/OpurchaseclassLogic.php
View File

@ -213,13 +213,14 @@ class OpurchaseclassLogic extends BaseLogic
} }
foreach ($supplier_arr as $k => $v) { foreach ($supplier_arr as $k => $v) {
$goods_offer[] = [ $goods_offer[] = [
'supplier_id' => $v['supplier'], 'supplier_id' => $v['id'],
'goods_id' => $v['goods'], 'goods_id' => $goods['goods'],
'price' => 0, '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); $res = OpurchaseGoodsOffer::insertAll($goods_offer);
if ($res) { if ($res) {
return true; return true;

14
app/admin/logic/supplier/SupplierLogic.php
View File

@ -30,13 +30,18 @@ class SupplierLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$sys_labels='';
if($params['sys_labels']){
$sys_labels=explode(',',$params['sys_labels']);
$sys_labels= ','.implode(',',$sys_labels).',';
}
$res= Supplier::create([ $res= Supplier::create([
'category_id' => $params['category_id'], 'category_id' => $params['category_id'],
'type_id' => $params['type_id'] ?? '', 'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'], 'mer_name' => $params['mer_name'],
'settle_cycle' => $params['settle_cycle']??15, 'settle_cycle' => $params['settle_cycle']??15,
'interest_rate' => $params['interest_rate']??0, 'interest_rate' => $params['interest_rate']??0,
'sys_labels' => $params['sys_labels'] ?? '', 'sys_labels' => $sys_labels,
'province_id' => $params['province_id'] ?? '', 'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '', 'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '', 'area_id' => $params['area_id'] ?? '',
@ -141,13 +146,18 @@ class SupplierLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$sys_labels='';
if($params['sys_labels']){
$sys_labels=explode(',',$params['sys_labels']);
$sys_labels= ','.implode(',',$sys_labels).',';
}
Supplier::where('id', $params['id'])->update([ Supplier::where('id', $params['id'])->update([
'category_id' => $params['category_id']??'', 'category_id' => $params['category_id']??'',
'type_id' => $params['type_id'] ?? '', 'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'], 'mer_name' => $params['mer_name'],
'settle_cycle' => $params['settle_cycle'] ?? 15, 'settle_cycle' => $params['settle_cycle'] ?? 15,
'interest_rate' => $params['interest_rate'] ?? 0, 'interest_rate' => $params['interest_rate'] ?? 0,
'sys_labels' => $params['sys_labels'] ?? '', 'sys_labels' => $sys_labels,
'province_id' => $params['province_id'] ?? '', 'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '', 'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '', 'area_id' => $params['area_id'] ?? '',