|
@@ -1531,7 +1531,7 @@ class ApplyOrderService extends Service
|
|
|
if(! empty($insert)) ScrappCount::insert($insert);
|
|
|
//获取新增的单据
|
|
|
$result = ScrappCount::whereIn('order_number',$get_order_number)
|
|
|
- ->select('scrapp_num as num','id','dispatch_sub_id','warehouse_no','warehouse_title','result')
|
|
|
+ ->select('scrapp_num as num','id','dispatch_sub_id','warehouse_no','warehouse_title','result','product_no')
|
|
|
->get()->toArray();
|
|
|
|
|
|
//完工入库申请单 半成品
|
|
@@ -1776,7 +1776,7 @@ class ApplyOrderService extends Service
|
|
|
if(! $status) return [false, $msg];
|
|
|
|
|
|
//质检入库申请单 原材料
|
|
|
- list($status, $msg) = $this->createZJSQ($insert, $user, $is_need_warehouse);
|
|
|
+ list($status, $msg) = $this->createZJSQ($all_data, $user, $is_need_warehouse);
|
|
|
if(! $status) return [false, $msg];
|
|
|
}
|
|
|
|