|
|
@@ -670,8 +670,10 @@ class OrderService
|
|
|
if(!empty($orderHeader['userdefine1']))
|
|
|
$logistic_codes[$orderHeader['userdefine1']] = $orderHeader['userdefine1'];
|
|
|
if(!empty($orderHeader['issuepartyname']) && !empty($orderHeader['customerid'])){
|
|
|
- $value = ['owner_code'=>$orderHeader['customerid'],'issuepartyname'=>$orderHeader['issuepartyname']];
|
|
|
- $key = "owner_code_{$orderHeader['customerid']}_issuepartyname_{$orderHeader['issuepartyname']}";
|
|
|
+ // 商品换行符处理
|
|
|
+ $shop_name = str_replace("\n",' ',$orderHeader['issuepartyname']);
|
|
|
+ $value = ['owner_code'=>$orderHeader['customerid'],'issuepartyname'=>$shop_name];
|
|
|
+ $key = "owner_code_{$orderHeader['customerid']}_issuepartyname_{$shop_name}";
|
|
|
$shop_names[$key] = $value;
|
|
|
}
|
|
|
}
|
|
|
@@ -785,7 +787,9 @@ class OrderService
|
|
|
$batch = $dataHandlerService->getKeyValue(['code'=>$orderHeader->waveno],$batch_map);
|
|
|
$shop['id'] = null;
|
|
|
if($orderHeader->issuepartyname != null && $orderHeader->issuepartyname != '' ){
|
|
|
- $shop = $dataHandlerService->getKeyValue(['name'=>$orderHeader->issuepartyname ?? '','owner_id'=>$owner->id??''],$shop_map);
|
|
|
+ // 商品换行符处理
|
|
|
+ $shop_name = str_replace("\n",' ',$orderHeader['issuepartyname']);
|
|
|
+ $shop = $dataHandlerService->getKeyValue(['name'=>$shop_name ?? '','owner_id'=>$owner->id??''],$shop_map);
|
|
|
}
|
|
|
if(!$batch['id']&&!($orderHeader['status']==90||$orderHeader['status']==00)&&$orderHeader['wave_no']!='*'){
|
|
|
LogService::log(__METHOD__,__FUNCTION__,'波次为空: code='.$orderHeader['orderno']);
|