|
|
@@ -268,17 +268,19 @@ class Worker extends Base
|
|
|
->field("sl.code,sl.spec_id,SUM(COALESCE(sd.num,0) * 1) as spec_quantity_sum,SUM(COALESCE(sd.num,0) * COALESCE(sd.labor_cost_money,0)) as spec_labor_cost_money_sum")
|
|
|
->group('sl.spec_id')
|
|
|
->select();
|
|
|
+ $quantity_sum=0;
|
|
|
+ $labor_cost_money_sum=0;
|
|
|
foreach ($list_sum as $item) {
|
|
|
$spec_quantity_sum=$item['spec_quantity_sum'];
|
|
|
$spec_labor_cost_money_sum=$item['spec_labor_cost_money_sum'];
|
|
|
- $this->quantity_sum=bcadd($this->quantity_sum, $spec_quantity_sum,0);
|
|
|
- $this->labor_cost_money_sum=bcadd($this->labor_cost_money_sum, $spec_labor_cost_money_sum,4);
|
|
|
- $this->labor_cost_money_sum = round((float)$this->labor_cost_money_sum, 2);
|
|
|
+ $quantity_sum=bcadd(strval($quantity_sum), strval($spec_quantity_sum),0);
|
|
|
+ $labor_cost_money_sum=bcadd(strval($labor_cost_money_sum), strval($spec_labor_cost_money_sum),4);
|
|
|
+ $labor_cost_money_sum = round((float)$labor_cost_money_sum, 2);
|
|
|
}
|
|
|
|
|
|
$data = [
|
|
|
- 'quantity_sum' => $this->quantity_sum,
|
|
|
- 'labor_cost_money_sum' => $this->labor_cost_money_sum,
|
|
|
+ 'quantity_sum' => $quantity_sum,
|
|
|
+ 'labor_cost_money_sum' => $labor_cost_money_sum,
|
|
|
'list' => empty($list) ? [] :$list
|
|
|
|
|
|
|
|
|
@@ -288,7 +290,6 @@ class Worker extends Base
|
|
|
//获取数量、总价
|
|
|
public function quantity_labor_cost_money(ScanLog $scanLog){
|
|
|
$where = [];
|
|
|
- $limit = $this->request->post('limit/d', 10); //条数
|
|
|
$todayTime = date("Y-m-d");
|
|
|
$startTime = strtotime($todayTime . ' 00:00:00');
|
|
|
$startTime = date('Y-m-d H:i:s', $startTime);
|
|
|
@@ -315,17 +316,19 @@ class Worker extends Base
|
|
|
->field("sl.code,sl.spec_id,SUM(COALESCE(sd.num,0) * 1) as spec_quantity_sum,SUM(COALESCE(sd.num,0) * COALESCE(sd.labor_cost_money,0)) as spec_labor_cost_money_sum")
|
|
|
->group('sl.spec_id')
|
|
|
->select();
|
|
|
+ $quantity_sum=0;
|
|
|
+ $labor_cost_money_sum=0;
|
|
|
foreach ($list_sum as $item) {
|
|
|
$spec_quantity_sum=$item['spec_quantity_sum'];
|
|
|
$spec_labor_cost_money_sum=$item['spec_labor_cost_money_sum'];
|
|
|
- $this->quantity_sum=bcadd($this->quantity_sum, $spec_quantity_sum,0);
|
|
|
- $this->labor_cost_money_sum=bcadd($this->labor_cost_money_sum, $spec_labor_cost_money_sum,4);
|
|
|
- $this->labor_cost_money_sum = round((float)$this->labor_cost_money_sum, 2);
|
|
|
+ $quantity_sum=bcadd(strval($quantity_sum), strval($spec_quantity_sum),0);
|
|
|
+ $labor_cost_money_sum=bcadd(strval($labor_cost_money_sum), strval($spec_labor_cost_money_sum),4);
|
|
|
+ $labor_cost_money_sum = round((float)$labor_cost_money_sum, 2);
|
|
|
}
|
|
|
|
|
|
$data = [
|
|
|
- 'quantity_sum' => $this->quantity_sum,
|
|
|
- 'labor_cost_money_sum' => $this->labor_cost_money_sum
|
|
|
+ 'quantity_sum' => $quantity_sum,
|
|
|
+ 'labor_cost_money_sum' => $labor_cost_money_sum
|
|
|
];
|
|
|
return $data;
|
|
|
}
|