|
|
@@ -63,7 +63,7 @@ class BoxService extends Service
|
|
|
|
|
|
$ids = [];
|
|
|
$sale_ids = [];
|
|
|
- $key_list = [];
|
|
|
+// $key_list = [];
|
|
|
$top_order_no = $data['order_no'];
|
|
|
$data = $data['param'];
|
|
|
foreach ($data as $v) {
|
|
|
@@ -216,7 +216,6 @@ class BoxService extends Service
|
|
|
->select('id','out_order_no','customer_no','customer_name','product_no','product_title','product_size','crt_time as production_time','id as sale_orders_product_id','finished_num as dispatch_complete_quantity','box_num','technology_name','wood_name','crt_time','order_quantity')
|
|
|
->orderBy('id','desc')->get()->toArray();
|
|
|
$product_list = ordersProduct::wherein('sale_orders_product_id',$sale_order_ids)->select('id','out_order_no','customer_no','customer_name','product_no','sale_orders_product_id','product_title','product_size','dispatch_complete_quantity','box_num','technology_name','wood_name','crt_time','production_quantity')->get()->toArray();
|
|
|
-
|
|
|
$model_key_list = [];
|
|
|
foreach ($model as $v){
|
|
|
$model_key_list[$v['id']] = $v;
|
|
|
@@ -233,8 +232,8 @@ class BoxService extends Service
|
|
|
$detail = $model_key_list[$v['sale_orders_product_id']];
|
|
|
$detail['box_type'] = 1;
|
|
|
$detail['id'] = $v['id'];
|
|
|
- $detail['is_box_num'] = $v['box_num'];
|
|
|
- $detail['un_box_num'] = $v['production_quantity'] - $v['box_num'];
|
|
|
+ $detail['box_num'] = $v['box_num'];
|
|
|
+ $detail['un_box_num'] = $v['dispatch_complete_quantity'] - $v['box_num'];
|
|
|
$detail['type'] = 1;
|
|
|
$model[] = $detail;
|
|
|
}
|
|
|
@@ -242,12 +241,13 @@ class BoxService extends Service
|
|
|
|
|
|
$return = [];
|
|
|
$product_key_list = [];
|
|
|
-// var_dump($model);die;
|
|
|
foreach ($model as $v){
|
|
|
if(!isset($v['box_type'])) {
|
|
|
$product_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['product_num'] : 0;
|
|
|
$box_num = isset($product_key_num_list[$v['id']]) ? $product_key_num_list[$v['id']]['box_num'] : 0;
|
|
|
if(($v['order_quantity'] - $product_num) === 0) continue;
|
|
|
+// var_dump($v['order_quantity']);
|
|
|
+// var_dump($v['order_quantity']);
|
|
|
$product_key_list[$v['sale_orders_product_id']] = [
|
|
|
'out_order_no' => $v['out_order_no'],
|
|
|
'production_time' => '未下生产',
|
|
|
@@ -259,7 +259,7 @@ class BoxService extends Service
|
|
|
'id' => -$v['sale_orders_product_id'],
|
|
|
'type' => '2',
|
|
|
'is_box_num' => $v['box_num'] - $box_num,
|
|
|
- 'un_box_num' => $v['order_quantity'] - $v['box_num'] - $product_num,
|
|
|
+ 'un_box_num' => $v['order_quantity'] - ($v['box_num'] - $box_num) - $product_num,
|
|
|
'sale_num' => $v['order_quantity'],
|
|
|
];
|
|
|
}else{
|
|
|
@@ -275,7 +275,7 @@ class BoxService extends Service
|
|
|
'product_size' => $v['product_size'],
|
|
|
'type' => '1',
|
|
|
'is_box_num' => $v['box_num'],
|
|
|
- 'un_box_num' => $v['dispatch_complete_quantity'] - $v['box_num'],
|
|
|
+ 'un_box_num' => $v['un_box_num'],
|
|
|
'sale_num' => $v['order_quantity'],
|
|
|
];
|
|
|
}
|
root