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

feat(admin/controller, retail/CashierclassLogic): 优化采购类商品展示

Browse Source
This commit is contained in:
mkm 2024-05-29 09:38:56 +08:00
parent caaac6882c
commit d8a78633ea
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/controller/operation/OpurchaseclassController.php
View File

@ -112,6 +112,14 @@ class OpurchaseclassController extends BaseAdminController
'is_adopt' => 1 'is_adopt' => 1
]; ];
$item['nums_count'] = OpurchaseGoodsOffer::where($where)->sum('nums'); $item['nums_count'] = OpurchaseGoodsOffer::where($where)->sum('nums');
$offer=OpurchaseGoodsOffer::where($where)->field('delivery_name,delivery_id')->find();
if($offer){
$item['delivery_name']=$offer['delivery_name'];
$item['delivery_id']=$offer['delivery_id'];
}else{
$item['delivery_name']='';
$item['delivery_id']='';
}
}); });
$data['count'] = Opurchaseinfo::where($where)->count(); $data['count'] = Opurchaseinfo::where($where)->count();
$data['lists'] = $res?->toArray(); $data['lists'] = $res?->toArray();

2
app/admin/logic/retail/CashierclassLogic.php
View File

@ -155,7 +155,7 @@ class CashierclassLogic extends BaseLogic
->with('goodsName') ->with('goodsName')
->field('goods,price sell,nums')->select()->each(function($item){ ->field('goods,price sell,nums')->select()->each(function($item){
$item['msg']='预计48小时发货'; $item['msg']='预计48小时发货';
$item['goods_unit']=Unit::where('id',$item['unit'])->value('name'); $item['unit_name']=Unit::where('id',$item['unit'])->value('name');
}); });
$merchant=Merchant::where('mer_id',$find['merchant'])->field('mer_id,uid,mer_name,service_phone,mer_address')->find(); $merchant=Merchant::where('mer_id',$find['merchant'])->field('mer_id,uid,mer_name,service_phone,mer_address')->find();
$merchant['real_name']=User::where('id',$merchant['uid'])->value('real_name'); $merchant['real_name']=User::where('id',$merchant['uid'])->value('real_name');

3
app/api/validate/OpurchaseGoodsOfferValidate.php
View File

@ -42,6 +42,9 @@
if(!isset($v['nums']) || $v['nums'] == '') { if(!isset($v['nums']) || $v['nums'] == '') {
return '第'.($k+1).'行缺少数量'; return '第'.($k+1).'行缺少数量';
} }
if($data['nums']<$v['nums']){
return '第'.($k+1).'行数量不能大于采购数量';
}
} }
return true; return true;
} }