|
@@ -450,10 +450,12 @@ class SalesOrderService extends Service
|
|
|
$is_choose = false;
|
|
$is_choose = false;
|
|
|
$final_amount = 0;
|
|
$final_amount = 0;
|
|
|
$number = $v['number'];
|
|
$number = $v['number'];
|
|
|
|
|
+ $mark = "";
|
|
|
if($v['id'] == $value['sports_bag_product_info_id']){
|
|
if($v['id'] == $value['sports_bag_product_info_id']){
|
|
|
$is_choose = true;
|
|
$is_choose = true;
|
|
|
$final_amount = $value['final_amount'];
|
|
$final_amount = $value['final_amount'];
|
|
|
$number = $value['number'];
|
|
$number = $value['number'];
|
|
|
|
|
+ $mark = $value['mark'];
|
|
|
}
|
|
}
|
|
|
$bag_pro_tmp[$k]['is_choose'] = $is_choose;
|
|
$bag_pro_tmp[$k]['is_choose'] = $is_choose;
|
|
|
$bag_pro_tmp[$k]['final_amount'] = $final_amount;
|
|
$bag_pro_tmp[$k]['final_amount'] = $final_amount;
|
|
@@ -463,6 +465,7 @@ class SalesOrderService extends Service
|
|
|
$bag_pro_tmp[$k]['size'] = $tmp['size'] ?? "";
|
|
$bag_pro_tmp[$k]['size'] = $tmp['size'] ?? "";
|
|
|
$bag_pro_tmp[$k]['unit'] = $tmp['unit'] ?? "";
|
|
$bag_pro_tmp[$k]['unit'] = $tmp['unit'] ?? "";
|
|
|
$bag_pro_tmp[$k]['bar_code'] = $tmp['bar_code'] ?? "";
|
|
$bag_pro_tmp[$k]['bar_code'] = $tmp['bar_code'] ?? "";
|
|
|
|
|
+ $bag_pro_tmp[$k]['mark'] = $mark ?? "";
|
|
|
$sports_bag_pro[$value['sports_bag_id']][] = $bag_pro_tmp[$k];
|
|
$sports_bag_pro[$value['sports_bag_id']][] = $bag_pro_tmp[$k];
|
|
|
}
|
|
}
|
|
|
}else{
|
|
}else{
|
cqpCow