|
|
@@ -3208,9 +3208,9 @@ class Fullorder extends Start_Controller {
|
|
|
{
|
|
|
$this->fullorderhb->insert($v);
|
|
|
}
|
|
|
- $post['shouldmoney'] += $v['shouldmoney'];//购买应收金额
|
|
|
- $post['budget'] += $v['budget'];//预估到帐金额
|
|
|
- $post['expressmoney'] += $v['expressmoney'];//物流金额
|
|
|
+ //$post['shouldmoney'] += $v['shouldmoney'];//购买应收金额
|
|
|
+ // $post['budget'] += $v['budget'];//预估到帐金额
|
|
|
+ // $post['expressmoney'] += $v['expressmoney'];//物流金额
|
|
|
//$post['refundy'] += $v['refundy'];//补/退原额
|
|
|
//$post['refundj'] += $v['refundj'];//补/退净额
|
|
|
$post['cost'] += $v['cost'];//成本金额
|
|
|
@@ -3254,7 +3254,7 @@ class Fullorder extends Start_Controller {
|
|
|
}
|
|
|
$zsl += count($wl);
|
|
|
$zccsl += $i;
|
|
|
- $this->fullorder->save(array('merge'=>$u['id'],'mergeid'=>1,'orderremarks'=>' 《合并信息》：'.'已合并到'.$u['orderinfo'].'('.$u['number'].')中； '.$v['orderremarks'],'shouldmoney'=>0,'print'=>1,'libraryconfirm'=>1,'shouldmoney'=>0,'budget'=>0,'whlabel'=>'','fpdata'=>'','shipremarks'=>''),$v['id']);
|
|
|
+ $this->fullorder->save(array('merge'=>$u['id'],'mergeid'=>1,'orderremarks'=>' 《合并信息》：'.'已合并到'.$u['orderinfo'].'('.$u['number'].')中； '.$v['orderremarks'],'print'=>1,'libraryconfirm'=>1,'whlabel'=>'','fpdata'=>'','shipremarks'=>''),$v['id']);
|
|
|
}
|
|
|
}
|
|
|
//计算出单条价值
|
