|
|
|
@ -1310,6 +1310,10 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
|
|
|
|
|
distributionStockArticleEntity.setMallCode(advanceEntity.getDealerCode()); |
|
|
|
|
|
|
|
|
|
if (ObjectUtils.isNotNull(wayBillEntity)) { |
|
|
|
|
|
|
|
|
|
distributionStockArticleEntity.setMallName(wayBillEntity.getTakeCompany()); |
|
|
|
|
distributionStockArticleEntity.setMallCode(advanceEntity.getDealerCode()); |
|
|
|
|
|
|
|
|
|
distributionStockArticleEntity.setConsigneeUnit(wayBillEntity.getTakeCompany());//收货单位(经销商)
|
|
|
|
|
distributionStockArticleEntity.setConsigneePerson(wayBillEntity.getTakePerson());//收货人
|
|
|
|
|
distributionStockArticleEntity.setConsigneeAddress(wayBillEntity.getTakeAddress());//收货人地址
|
|
|
|
@ -1466,7 +1470,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
|
|
|
|
|
if(endWarehouseId.equals(warehouseId)){ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); |
|
|
|
|
}else{ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue()); |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|