|
|
@@ -18,10 +18,11 @@ class PurchaseOrderService extends Service
|
|
|
DB::beginTransaction();
|
|
|
$material_model = PurchaseOrder::where('order_number',$data['order_number'])->first();
|
|
|
$material_model->depart_id = $data['depart_id'] ?? 0;
|
|
|
- $material_model->rate = $data['total'] ?? 0;
|
|
|
+ $material_model->rate = $data['rate'] ?? 0;
|
|
|
$material_model->total = $data['total'] ?? 0;
|
|
|
$material_model->other_fee = $data['other_fee'] ?? 0;
|
|
|
$material_model->discount_fee = $data['discount_fee'] ?? 0;
|
|
|
+ $material_model->purchase_total = $data['purchase_total'] ?? 0;
|
|
|
$material_model->supplier = $data['supplier'] ?? '';
|
|
|
$material_model->purchase_id = $data['purchase_id'] ?? 0;
|
|
|
$material_model->order_type = $data['order_type'];
|
|
|
@@ -63,10 +64,11 @@ class PurchaseOrderService extends Service
|
|
|
DB::beginTransaction();
|
|
|
$material_model = new PurchaseOrder();
|
|
|
$material_model->depart_id = $data['depart_id'] ?? 0;
|
|
|
- $material_model->rate = $data['total'] ?? 0;
|
|
|
+ $material_model->rate = $data['rate'] ?? 0;
|
|
|
$material_model->total = $data['total'] ?? 0;
|
|
|
$material_model->other_fee = $data['other_fee'] ?? 0;
|
|
|
$material_model->discount_fee = $data['discount_fee'] ?? 0;
|
|
|
+ $material_model->purchase_total = $data['purchase_total'] ?? 0;
|
|
|
$material_model->supplier = $data['supplier'] ?? '';
|
|
|
$material_model->purchase_id = $data['purchase_id'] ?? 0;
|
|
|
$material_model->order_type = $data['order_type'];
|
|
|
@@ -104,7 +106,7 @@ class PurchaseOrderService extends Service
|
|
|
|
|
|
$order = PurchaseOrder::where('order_number',$data['order_number'])
|
|
|
->where('del_time',0)
|
|
|
- ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','rate','total','other_fee','discount_fee')
|
|
|
+ ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','rate','total','other_fee','discount_fee','purchase_total')
|
|
|
->first();
|
|
|
if(empty($order)) return [false, '采购订单不存在或已被删除'];
|
|
|
|
|
|
@@ -144,7 +146,7 @@ class PurchaseOrderService extends Service
|
|
|
|
|
|
public function getList($data,$user){
|
|
|
$model = PurchaseOrder::where('del_time',0)
|
|
|
- ->select('order_number','id','depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id')
|
|
|
+ ->select('order_number','id','depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','rate','discount_fee','other_fee','total')
|
|
|
->orderby('id', 'desc');
|
|
|
if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
|
|
|
if(! empty($data['depart_id'])) $model->where('depart_id', $data['depart_id']);
|
|
|
@@ -204,6 +206,10 @@ class PurchaseOrderService extends Service
|
|
|
$res = $this->checkNumber($data['total']);
|
|
|
if(! $res) return [false, '产品总价请输入不超过两位小数并且大于0的数值'];
|
|
|
}
|
|
|
+ if(! empty($data['purchase_total'])){
|
|
|
+ $res = $this->checkNumber($data['purchase_total']);
|
|
|
+ if(! $res) return [false, '采购总价请输入不超过两位小数并且大于0的数值'];
|
|
|
+ }
|
|
|
foreach ($data['product'] as $value){
|
|
|
if(empty($value['number'])) return [false,'产品数量不能为空'];
|
|
|
$res = $this->checkNumber($value['number']);
|
cqpCow