|
|
|
@ -1721,6 +1721,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
advanceDetailModel.setOrderCode(orderCode); |
|
|
|
|
advanceDetailModel.setOrderPackageCode(orderPackageCode); |
|
|
|
|
String brand = advanceEntity.getBrand(); |
|
|
|
|
advanceDetailModel.setBrand(brand); |
|
|
|
|
BasicdataBrandEntity brandEntity = brandMap.get(brand); |
|
|
|
|
if (Objects.isNull(brandEntity)) { |
|
|
|
|
brandEntity = brandMap.get("其他"); |
|
|
|
@ -3327,7 +3328,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
advanceDetailModel.setWarehouseName(warehouseName); |
|
|
|
|
advanceDetailModel.setAdvanceId(advanceEntity.getId()); |
|
|
|
|
advanceDetailModel.setOrderCode(advanceEntity.getOrderCode()); |
|
|
|
|
advanceDetailModel.setBrand(importOrderNoPackageExcelDTO.getBrand()); |
|
|
|
|
advanceDetailModel.setBrand(advanceEntity.getBrand()); |
|
|
|
|
advanceDetailModel.setSystemType("线下"); |
|
|
|
|
|
|
|
|
|
advanceDetailModel.setFirstPackName(firsts); |
|
|
|
|