|
|
@@ -89,8 +89,12 @@ class ProcessController extends Controller
|
|
|
}
|
|
|
$docOrders=OracleDOCOrderDetail::where("OrderNo",$wms_code)->get();//出库单
|
|
|
if (count($docOrders)>0){
|
|
|
- $owner=Owner::where("code",$docOrders[0]->customerid)->first();
|
|
|
- if (!$owner)$owner=$this->storeOwner($docOrders[0]->customerid);
|
|
|
+ $owners=Owner::withTrashed()->where("code",$docOrders[0]->customerid)->get();
|
|
|
+ if ($owners->isEmpty()){
|
|
|
+ $owner=$this->storeOwner($docOrders[0]->customerid);
|
|
|
+ }else{
|
|
|
+ $owner=$owners->first();
|
|
|
+ }
|
|
|
if (!$owner)return ['error'=>'找到了入库单，但未查询到货主代码！'];
|
|
|
$commodities=$this->resetData($docOrders,"sku","customerid","qtyordered",'orderlineno');
|
|
|
$processContent=[
|
|
|
@@ -195,7 +199,7 @@ class ProcessController extends Controller
|
|
|
$commodityBarCodeData=[];
|
|
|
$commodityBarCodeTem=[];
|
|
|
$owners_code=array_column($oracleBasSkus->toArray(),'customerid');
|
|
|
- $ownersTem=Owner::whereIn('code',$owners_code)->get();
|
|
|
+ $ownersTem=Owner::withTrashed()->whereIn('code',$owners_code)->get();
|
|
|
$owners=array_column($ownersTem->toArray(),'id','code');
|
|
|
for($i=0;$i<count($oracleBasSkus);$i++){
|
|
|
if (!$owners[$oracleBasSkus[$i]->customerid])$owners[$oracleBasSkus[$i]->customerid]=$this->storeOwner($oracleBasSkus[$i]->customerid);
|
|
|
@@ -227,4 +231,4 @@ class ProcessController extends Controller
|
|
|
$this->log(__METHOD__, 'FLUX二次加工单接口录入货主__' . __FUNCTION__, json_encode($owner), Auth::user()['id']);
|
|
|
return $owner;
|
|
|
}
|
|
|
-}
|
|
|
+}
|
LD