|
|
@@ -164,12 +164,14 @@ class RejectedBillItemController extends Controller
|
|
|
})($rejectedBill);
|
|
|
if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"当前,实收件:(".json_encode($rejectedBillItems).")},下载件:("
|
|
|
.json_encode($downloadedSkus).")},退单号:{$rejectedBill['logistic_number_return']}",null);
|
|
|
+ $shouldStore=!$isGotMoreThenDownloaded //没有录入超过下载货物数
|
|
|
+ && !($rejectedBill['is_loaded']==1)//并且不是已入库////去掉了或无需入库的判断:||$rejectedBill['is_loaded']===null
|
|
|
+ &&config('api.api_switch_receive_to_wms');//并且配置开
|
|
|
+ if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"自动入库:{$shouldStore}||isGotMoreThenDownloaded={$isGotMoreThenDownloaded}/rejectedBill['is_loaded']={$rejectedBill['is_loaded']}/rejectedBill['is_loaded']={$rejectedBill['is_loaded']}",null);
|
|
|
|
|
|
|
|
|
|
|
|
- if(!$isGotMoreThenDownloaded //没有录入超过下载货物数
|
|
|
- && !($rejectedBill['is_loaded']==1||$rejectedBill['is_loaded']===null)//并且不是已入库或无需入库
|
|
|
- &&config('api.api_switch_receive_to_wms')){ //并且配置开
|
|
|
+ if($shouldStore){
|
|
|
if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,'满足条件,准备从网页主动请求富勒入库:'.$rejectedBill['logistic_number_return'],Auth::user()['id']);
|
|
|
$result_transferToWms=(new InformWMSReceivedEvent($rejectedBill))->directRun();
|
|
|
if($result_transferToWms=='fail')return ['success'=>'false','fail_info'=>'提交至WMS错误,请手动校验、操作WMS并通知相关人员'];
|