|
@@ -7,6 +7,7 @@ use App\Model\ApplyOrder;
|
|
use App\Model\ApplyOrderForYy;
|
|
use App\Model\ApplyOrderForYy;
|
|
use App\Model\Box;
|
|
use App\Model\Box;
|
|
use App\Model\BoxDetail;
|
|
use App\Model\BoxDetail;
|
|
|
|
+use App\Model\BoxWithDispatch;
|
|
use App\Model\DispatchSub;
|
|
use App\Model\DispatchSub;
|
|
use App\Model\EmployeeTeamPermission;
|
|
use App\Model\EmployeeTeamPermission;
|
|
use App\Model\Header_ext;
|
|
use App\Model\Header_ext;
|
|
@@ -229,6 +230,18 @@ class BoxService extends Service
|
|
|
|
|
|
//包装单
|
|
//包装单
|
|
$package_data = $msg->toArray();
|
|
$package_data = $msg->toArray();
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ $dispatch_list = $msg1 ?? [];
|
|
|
|
+ if(! empty($dispatch_list)){
|
|
|
|
+ foreach ($dispatch_list as $key => $value){
|
|
|
|
+ $dispatch_list[$key]['dispatch_id'] = $value['id'];
|
|
|
|
+ unset($dispatch_list[$key]['id']);
|
|
|
|
+ $dispatch_list[$key]['box_id'] = $package_data['id'];
|
|
|
|
+ }
|
|
|
|
+ BoxWithDispatch::insert($dispatch_list);
|
|
|
|
+ }
|
|
|
|
+
|
|
//包装单产品
|
|
//包装单产品
|
|
$boxDetail = new BoxDetail(['channel'=>$package_data['top_order_no']]);
|
|
$boxDetail = new BoxDetail(['channel'=>$package_data['top_order_no']]);
|
|
$boxDetail = $boxDetail->where('del_time',0)
|
|
$boxDetail = $boxDetail->where('del_time',0)
|
|
@@ -507,7 +520,7 @@ class BoxService extends Service
|
|
list($status, $return) = $service->isNeedZJ($sale_order_id);
|
|
list($status, $return) = $service->isNeedZJ($sale_order_id);
|
|
$flag = $return;
|
|
$flag = $return;
|
|
//根据派工数据组织
|
|
//根据派工数据组织
|
|
- $last_update = $last_update2 = $str_tmp = $insert = $get_order_number = [];
|
|
|
|
|
|
+ $last_update = $last_update2 = $str_tmp = $insert = $get_order_number = $return_dispatch = [];
|
|
foreach ($result as $value){
|
|
foreach ($result as $value){
|
|
$need_zj_process = $flag[$value['sale_orders_product_id']] ?? 0;
|
|
$need_zj_process = $flag[$value['sale_orders_product_id']] ?? 0;
|
|
$bad_quantity = $scrapp_id = $for_r = 0;
|
|
$bad_quantity = $scrapp_id = $for_r = 0;
|
|
@@ -589,6 +602,13 @@ class BoxService extends Service
|
|
$tmp['finished_id'] = $t_m;
|
|
$tmp['finished_id'] = $t_m;
|
|
$tmp['team_id'] = $team_tmp;
|
|
$tmp['team_id'] = $team_tmp;
|
|
$last_update2[] = $tmp;
|
|
$last_update2[] = $tmp;
|
|
|
|
+
|
|
|
|
+ if($value['process_id'] == 14) {
|
|
|
|
+ $return_dispatch[] = [
|
|
|
|
+ 'id' => $value['id'],
|
|
|
|
+ 'num' => $value['quantity'],
|
|
|
|
+ ];
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
//生成报工单
|
|
//生成报工单
|
|
@@ -601,9 +621,9 @@ class BoxService extends Service
|
|
list($status,$msg) = $service->createZJFirst($report_id, $insert);
|
|
list($status,$msg) = $service->createZJFirst($report_id, $insert);
|
|
if(! $status) return [false, $msg];
|
|
if(! $status) return [false, $msg];
|
|
//生成因为有不良品需要的返工的业务单据
|
|
//生成因为有不良品需要的返工的业务单据
|
|
- list($status, $msg) = $service->createZJSecond($get_order_number, $user, $dispatch_time, $c_time,$max_id,$team_man,$report_order_number);
|
|
|
|
|
|
+ list($status, $msg) = $service->createZJSecond($get_order_number, $user, $dispatch_time, $c_time,$max_id,$team_man,$report_order_number,$return_dispatch);
|
|
if(! $status) return [false, $msg];
|
|
if(! $status) return [false, $msg];
|
|
- $get_order_number_result = $msg;
|
|
|
|
|
|
+ list($get_order_number_result, $return_dispatch) = $msg;
|
|
//生成完工入库申请单
|
|
//生成完工入库申请单
|
|
list($status, $msg) = $this->createWGSQ($last_update, $user, $c_time);
|
|
list($status, $msg) = $this->createWGSQ($last_update, $user, $c_time);
|
|
if(! $status) return [false, $msg];
|
|
if(! $status) return [false, $msg];
|
|
@@ -617,7 +637,7 @@ class BoxService extends Service
|
|
return [false, $exception->getLine().':'.$exception->getMessage() . ':' . $exception->getFile()];
|
|
return [false, $exception->getLine().':'.$exception->getMessage() . ':' . $exception->getFile()];
|
|
}
|
|
}
|
|
|
|
|
|
- return [true, ''];
|
|
|
|
|
|
+ return [true, $return_dispatch];
|
|
}
|
|
}
|
|
|
|
|
|
public function createbg($insert, $user,$dispatch_time = 0, $order_number = ""){
|
|
public function createbg($insert, $user,$dispatch_time = 0, $order_number = ""){
|