|
|
|
|
@ -37,11 +37,14 @@ import org.springblade.common.exception.CustomerException;
|
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.core.tool.utils.StringUtil; |
|
|
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.function.Function; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@Slf4j |
|
|
|
|
@Service |
|
|
|
|
@ -687,4 +690,550 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
|
|
|
|
|
return baseMapper.findListByExistsAndOrderCodeSet(orderCodeSet); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public boolean saveOrderAndPackages(List<TrunklineAdvanceDetailEntity> advanceDetailEntities, Long warehouseId) { |
|
|
|
|
|
|
|
|
|
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); |
|
|
|
|
if(Objects.isNull(warehouseEntity)){ |
|
|
|
|
log.warn("############saveOrderAndPackages: 仓库信息不存在warehouseId={}",warehouseId); |
|
|
|
|
throw new CustomerException(405,"仓库信息不存在"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailEntities.get(0); |
|
|
|
|
String tenantId = advanceDetailEntity.getTenantId(); |
|
|
|
|
Long userId = AuthUtil.getUserId(); |
|
|
|
|
Long deptId = Func.firstLong(AuthUtil.getDeptId()); |
|
|
|
|
if(Objects.isNull(userId)){ |
|
|
|
|
userId = advanceDetailEntity.getCreateUser(); |
|
|
|
|
} |
|
|
|
|
if(Objects.isNull(deptId)){ |
|
|
|
|
userId = advanceDetailEntity.getCreateDept(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//把advanceDetailEntities所有元素的orderCode作为key分组
|
|
|
|
|
Map<String, List<TrunklineAdvanceDetailEntity>> orderCodeMap = advanceDetailEntities.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getOrderCode)); |
|
|
|
|
Set<String> orderCodeSet = orderCodeMap.keySet(); |
|
|
|
|
|
|
|
|
|
//把advanceDetailEntities中所有元素的waybillId提取到一个Set中
|
|
|
|
|
Set<Long> waybillIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getWaybillId).collect(Collectors.toSet()); |
|
|
|
|
|
|
|
|
|
List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet)); |
|
|
|
|
//把waybillEntityList转化成以id为key的Map
|
|
|
|
|
Map<String, WarehouseWaybillEntity> waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getWaybillNo, Function.identity())); |
|
|
|
|
|
|
|
|
|
//提取出advanceDetailEntities所有元素的advanceId存入Set
|
|
|
|
|
Set<Long> advanceIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet()); |
|
|
|
|
List<TrunklineAdvanceEntity> advanceEntityList = findListByIds(new ArrayList<>(advanceIdSet)); |
|
|
|
|
|
|
|
|
|
Map<String,TrunklineAdvanceEntity> advanceEntityMap = new HashMap<>(); |
|
|
|
|
if(advanceEntityList.isEmpty()){ |
|
|
|
|
advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> stockArticleEntities = stockArticleClient.findListByOrderCodesAndWarehouseId(orderCodeSet,warehouseId); |
|
|
|
|
Map<String, DistributionStockArticleEntity> stockArticleMap = new HashMap<>(); |
|
|
|
|
if(!stockArticleEntities.isEmpty()){ |
|
|
|
|
stockArticleMap = stockArticleEntities.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getOrderCode, Function.identity())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<DistributionParcelListEntity> parcelListEntities = parcelListClient.findListByOrderCodesAndWarehouseId(orderCodeSet,warehouseId); |
|
|
|
|
Map<String, DistributionParcelListEntity> parcelListMap = new HashMap<>(); |
|
|
|
|
if(!parcelListEntities.isEmpty()){ |
|
|
|
|
parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, Function.identity())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Set<String> hasOrderPackageCodes = parcelListMap.keySet(); |
|
|
|
|
|
|
|
|
|
Map<String, DistributionStockArticleEntity> finalStockArticleMap = stockArticleMap; |
|
|
|
|
Map<String, DistributionParcelListEntity> finalParcelListMap = parcelListMap; |
|
|
|
|
Map<String, TrunklineAdvanceEntity> finalAdvanceEntityMap = advanceEntityMap; |
|
|
|
|
Long finalUserId = userId; |
|
|
|
|
Date date = new Date(); |
|
|
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> addStockArticleEntities = new ArrayList<>(); |
|
|
|
|
List<DistributionStockArticleEntity> updateStockArticleEntities = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
orderCodeSet.forEach(orderCode -> { |
|
|
|
|
int total = baseMapper.getAllTotalNum(orderCode); |
|
|
|
|
|
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = finalStockArticleMap.get(orderCode); |
|
|
|
|
if(Objects.isNull(stockArticleEntity)){ |
|
|
|
|
TrunklineAdvanceEntity advanceEntity = finalAdvanceEntityMap.get(orderCode); |
|
|
|
|
if(!Objects.isNull(advanceEntity)){ |
|
|
|
|
String waybillNo = advanceEntity.getWaybillNo(); |
|
|
|
|
|
|
|
|
|
stockArticleEntity = new DistributionStockArticleEntity(); |
|
|
|
|
stockArticleEntity.setTenantId(tenantId); |
|
|
|
|
stockArticleEntity.setCreateUser(finalUserId); |
|
|
|
|
stockArticleEntity.setUpdateUser(finalUserId); |
|
|
|
|
stockArticleEntity.setCreateDept(deptId); |
|
|
|
|
stockArticleEntity.setOrderCode(orderCode); |
|
|
|
|
stockArticleEntity.setServiceNumber(advanceEntity.getServiceNum()); |
|
|
|
|
stockArticleEntity.setWaybillNumber(waybillNo); |
|
|
|
|
stockArticleEntity.setTotalNumber(total); |
|
|
|
|
stockArticleEntity.setHandQuantity(0); |
|
|
|
|
// stockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
|
|
|
|
|
stockArticleEntity.setWarehouse(warehouseEntity.getName()); |
|
|
|
|
stockArticleEntity.setWarehouseId(warehouseId); |
|
|
|
|
stockArticleEntity.setBrand(advanceEntity.getBrand()); |
|
|
|
|
stockArticleEntity.setDescriptionGoods(advanceEntity.getPackName()); |
|
|
|
|
stockArticleEntity.setWarehouseEntryTime(date); |
|
|
|
|
stockArticleEntity.setGenre(1); |
|
|
|
|
|
|
|
|
|
String dealerName = advanceEntity.getDealerName();//暂存单经销商名称
|
|
|
|
|
stockArticleEntity.setDealerCode(advanceEntity.getDealerCode()); |
|
|
|
|
stockArticleEntity.setDealerName(advanceEntity.getDealerName()); |
|
|
|
|
|
|
|
|
|
stockArticleEntity.setTypeService("1");//默认商配
|
|
|
|
|
|
|
|
|
|
if(!StringUtil.isBlank(waybillNo)){ |
|
|
|
|
WarehouseWaybillEntity waybillEntity = waybillEntityMap.get(waybillNo); |
|
|
|
|
if(!Objects.isNull(waybillEntity)){ |
|
|
|
|
Long consigneeId = waybillEntity.getConsigneeId(); |
|
|
|
|
|
|
|
|
|
BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId); |
|
|
|
|
if(!Objects.isNull(clientEntity)){ |
|
|
|
|
stockArticleEntity.setMallId(clientEntity.getId()); |
|
|
|
|
stockArticleEntity.setMallName(clientEntity.getClientName()); |
|
|
|
|
stockArticleEntity.setMallCode(clientEntity.getClientCode()); |
|
|
|
|
} |
|
|
|
|
String consignee = waybillEntity.getConsignee(); |
|
|
|
|
String consigneeName = waybillEntity.getConsigneeName(); |
|
|
|
|
String consigneeMobile = waybillEntity.getConsigneeMobile(); |
|
|
|
|
String consigneeAddress = waybillEntity.getConsigneeAddress(); |
|
|
|
|
stockArticleEntity.setConsigneeUnit(consignee); |
|
|
|
|
stockArticleEntity.setConsigneePerson(consigneeName); |
|
|
|
|
stockArticleEntity.setConsigneeMobile(consigneeMobile); |
|
|
|
|
stockArticleEntity.setConsigneeAddress(consigneeAddress); |
|
|
|
|
|
|
|
|
|
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3); |
|
|
|
|
if(!Objects.isNull(basicdataStoreBusinessEntity)){ |
|
|
|
|
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand()); |
|
|
|
|
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); |
|
|
|
|
if(!Objects.isNull(basicdataClientEntity)){ |
|
|
|
|
String clientType = basicdataClientEntity.getClientType(); |
|
|
|
|
if("5".equals(clientType)){ |
|
|
|
|
stockArticleEntity.setStoreId(basicdataClientEntity.getId()); |
|
|
|
|
stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode()); |
|
|
|
|
stockArticleEntity.setStoreName(basicdataClientEntity.getClientName()); |
|
|
|
|
//查询门店的父级商场
|
|
|
|
|
Long pid = basicdataClientEntity.getPid(); |
|
|
|
|
BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid); |
|
|
|
|
if(!Objects.isNull(pidEntity)){ |
|
|
|
|
String pidEntityClientType = pidEntity.getClientType(); |
|
|
|
|
if("2".equals(pidEntityClientType)){ |
|
|
|
|
//商城
|
|
|
|
|
stockArticleEntity.setMallId(pidEntity.getId()); |
|
|
|
|
stockArticleEntity.setMallName(pidEntity.getClientName()); |
|
|
|
|
stockArticleEntity.setMallCode(pidEntity.getClientCode()); |
|
|
|
|
|
|
|
|
|
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3); |
|
|
|
|
if(!Objects.isNull(basicdataStoreBusinessEntity)){ |
|
|
|
|
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else if("2".equals(clientType)){ |
|
|
|
|
//商城
|
|
|
|
|
stockArticleEntity.setMallId(basicdataClientEntity.getId()); |
|
|
|
|
stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); |
|
|
|
|
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); |
|
|
|
|
|
|
|
|
|
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3); |
|
|
|
|
if(!Objects.isNull(basicdataStoreBusinessEntity)){ |
|
|
|
|
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
stockArticleEntity.setCustomerName(advanceEntity.getCustomerName()); |
|
|
|
|
stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone()); |
|
|
|
|
stockArticleEntity.setCustomerAddress(advanceEntity.getCustomerAddress()); |
|
|
|
|
stockArticleEntity.setStockupStatus("10"); |
|
|
|
|
stockArticleEntity.setReservationStatus("10"); |
|
|
|
|
stockArticleEntity.setOrderStatus("0"); |
|
|
|
|
stockArticleEntity.setGroundingStatus("10"); |
|
|
|
|
stockArticleEntity.setOrderReceiveStatus("10"); |
|
|
|
|
stockArticleEntity.setFreezeStatus("10"); |
|
|
|
|
stockArticleEntity.setNotification(2); |
|
|
|
|
stockArticleEntity.setIsHaveData(2); |
|
|
|
|
stockArticleEntity.setTrainNumber(advanceEntity.getTrainNumber()); |
|
|
|
|
stockArticleEntity.setSortingQuantity(0); |
|
|
|
|
stockArticleEntity.setDeliveryQuantity(0); |
|
|
|
|
stockArticleEntity.setTransferQuantity(0); |
|
|
|
|
stockArticleEntity.setSigninQuantity(0); |
|
|
|
|
addStockArticleEntities.add(stockArticleEntity); |
|
|
|
|
}else{ |
|
|
|
|
stockArticleEntity.setTotalNumber(total); |
|
|
|
|
updateStockArticleEntities.add(stockArticleEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
stockArticleClient.updateByBatchId(updateStockArticleEntities); |
|
|
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> returnStockArticleEntities = stockArticleClient.addReturnList(addStockArticleEntities); |
|
|
|
|
returnStockArticleEntities.addAll(updateStockArticleEntities); |
|
|
|
|
|
|
|
|
|
Map<String,DistributionStockArticleEntity> saMap = returnStockArticleEntities.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getOrderCode, Function.identity())); |
|
|
|
|
|
|
|
|
|
List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>(); |
|
|
|
|
orderCodeMap.keySet().forEach(orderCode->{ |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = saMap.get(orderCode); |
|
|
|
|
if(!Objects.isNull(stockArticleEntity)){ |
|
|
|
|
Long orderId = stockArticleEntity.getId(); |
|
|
|
|
List<TrunklineAdvanceDetailEntity> adList = orderCodeMap.get(orderCode); |
|
|
|
|
adList.forEach(ad->{ |
|
|
|
|
String orderPackageCode = ad.getOrderPackageCode(); |
|
|
|
|
if(!hasOrderPackageCodes.contains(orderPackageCode)){ |
|
|
|
|
String trainNumber = ad.getTrainNumber(); |
|
|
|
|
DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); |
|
|
|
|
parcelList.setCreateUser(finalUserId); |
|
|
|
|
parcelList.setUpdateUser(finalUserId); |
|
|
|
|
parcelList.setCreateDept(deptId); |
|
|
|
|
parcelList.setTenantId(tenantId); |
|
|
|
|
parcelList.setWarehouse(warehouseEntity.getName()); |
|
|
|
|
parcelList.setWarehouseId(warehouseId); |
|
|
|
|
parcelList.setIsTransfer(1); |
|
|
|
|
String waybillNo = ad.getWaybillNo(); |
|
|
|
|
if(StringUtil.isNotBlank(waybillNo)){ |
|
|
|
|
WarehouseWaybillEntity waybillEntity = waybillEntityMap.get(waybillNo); |
|
|
|
|
if(!Objects.isNull(waybillEntity)){ |
|
|
|
|
parcelList.setWaybillId(waybillEntity.getId()); |
|
|
|
|
parcelList.setWaybillNumber(waybillEntity.getWaybillNo()); |
|
|
|
|
parcelList.setSendWarehouseId(waybillEntity.getDepartureWarehouseId()); |
|
|
|
|
parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName()); |
|
|
|
|
Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); |
|
|
|
|
parcelList.setAcceptWarehouseId(destinationWarehouseId); |
|
|
|
|
parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName()); |
|
|
|
|
if(warehouseId.equals(destinationWarehouseId)){ |
|
|
|
|
parcelList.setIsTransfer(0); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
parcelList.setConditions(1); |
|
|
|
|
parcelList.setOrderPackageCode(orderPackageCode); |
|
|
|
|
parcelList.setFirsts(advanceDetailEntity.getFirstPackName()); |
|
|
|
|
parcelList.setSecond(advanceDetailEntity.getSecondPackName()); |
|
|
|
|
parcelList.setThirdProduct(advanceDetailEntity.getThirdPackName()); |
|
|
|
|
parcelList.setQuantity(1); |
|
|
|
|
parcelList.setStockArticleId(orderId); |
|
|
|
|
parcelList.setOrderCode(orderCode); |
|
|
|
|
parcelList.setServiceNumber(advanceDetailEntity.getServiceNum()); |
|
|
|
|
parcelList.setTrainNumber(trainNumber); |
|
|
|
|
parcelList.setAdvanceId(ad.getAdvanceId()); |
|
|
|
|
|
|
|
|
|
Long materialId = advanceDetailEntity.getMaterialId(); |
|
|
|
|
String materialCode = advanceDetailEntity.getMaterialCode(); |
|
|
|
|
String materialName = advanceDetailEntity.getMaterialName(); |
|
|
|
|
if(Objects.isNull(materialId)){ |
|
|
|
|
BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode,materialName); |
|
|
|
|
if(!Objects.isNull(materialEntity)){ |
|
|
|
|
parcelList.setMaterialId(materialEntity.getId()); |
|
|
|
|
parcelList.setMaterialName(materialEntity.getName()); |
|
|
|
|
parcelList.setMaterialCode(materialEntity.getProductCode()); |
|
|
|
|
parcelList.setMaterialUnit(materialEntity.getSpecification()); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId); |
|
|
|
|
if(!Objects.isNull(materialOwnId)){ |
|
|
|
|
parcelList.setMaterialId(materialOwnId.getId()); |
|
|
|
|
parcelList.setMaterialName(materialOwnId.getName()); |
|
|
|
|
parcelList.setMaterialCode(materialOwnId.getProductCode()); |
|
|
|
|
parcelList.setMaterialUnit(materialOwnId.getSpecification()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
parcelList.setBrandName(advanceDetailEntity.getBrand()); |
|
|
|
|
parcelList.setOrderPackageStatus("20"); |
|
|
|
|
parcelList.setOrderPackageFreezeStatus("10"); |
|
|
|
|
parcelList.setOrderPackageGroundingStatus("10"); |
|
|
|
|
parcelList.setOrderPackageStockupStatus("10"); |
|
|
|
|
parcelList.setOrderPackageReservationStatus("10"); |
|
|
|
|
parcelList.setOrderPackageLoadingStatus("10"); |
|
|
|
|
parcelList.setWarehouseEntryTimeEnd(date); |
|
|
|
|
parcelList.setDealerCode(stockArticleEntity.getDealerCode()); |
|
|
|
|
parcelList.setDealerName(stockArticleEntity.getDealerName()); |
|
|
|
|
parcelListEntityList.add(parcelList); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
parcelListClient.addBatch(parcelListEntityList); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
|
|
|
|
|
// String orderCode = advanceDetailEntity.getOrderCode();
|
|
|
|
|
// Long advanceId = advanceDetailEntity.getAdvanceId();
|
|
|
|
|
// String tenantId = advanceDetailEntity.getTenantId();
|
|
|
|
|
// log.info("############saveOrderAndPackage: 保存订单和包件信息 orderPackageCode={}",orderPackageCode);
|
|
|
|
|
//
|
|
|
|
|
// BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
|
|
|
|
|
// if(Objects.isNull(warehouseEntity)){
|
|
|
|
|
// log.warn("############saveOrderAndPackage: 仓库信息不存在warehouseId={}",warehouseId);
|
|
|
|
|
// throw new CustomerException(405,"仓库信息不存在");
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// //1.判断包件是否已经存在
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = parcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
|
|
|
|
|
// if(!Objects.isNull(parcelListEntity)){
|
|
|
|
|
// log.warn("############saveOrderAndPackage: 包件信息已存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
|
|
|
|
|
// return true;
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// TrunklineAdvanceEntity advanceEntity = getById(advanceId);
|
|
|
|
|
// if(Objects.isNull(advanceEntity)){
|
|
|
|
|
// log.warn("############saveOrderAndPackage: 暂存单信息不存在 advanceId={} warehouseId={}",advanceId,warehouseId);
|
|
|
|
|
// throw new CustomerException(405,"暂存单信息不存在");
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// Long userId = AuthUtil.getUserId();
|
|
|
|
|
// Long deptId = null;
|
|
|
|
|
// String deptIds = AuthUtil.getDeptId();
|
|
|
|
|
// String[] split = deptIds.split(",");
|
|
|
|
|
// if(Objects.isNull(userId)){
|
|
|
|
|
// userId = advanceDetailEntity.getCreateUser();
|
|
|
|
|
// }
|
|
|
|
|
// if(CollUtil.isEmpty(Arrays.asList(split))){
|
|
|
|
|
// deptId = Long.parseLong(split[0]);
|
|
|
|
|
// }
|
|
|
|
|
// if(Objects.isNull(deptId)){
|
|
|
|
|
// userId = advanceDetailEntity.getCreateDept();
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// //2.查询订单信息
|
|
|
|
|
// int total = baseMapper.getAllTotalNum(orderCode);
|
|
|
|
|
//
|
|
|
|
|
// Date date = new Date();
|
|
|
|
|
// Long orderId = null;
|
|
|
|
|
// DistributionStockArticleEntity stockArticleEntity = stockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
|
|
|
|
|
// if(Objects.isNull(stockArticleEntity)){
|
|
|
|
|
// log.info("#############saveOrderAndPackage: 订单信息为空，同步订单信息");
|
|
|
|
|
// //订单信息为空
|
|
|
|
|
// String waybillNo = advanceEntity.getWaybillNo();
|
|
|
|
|
//
|
|
|
|
|
// stockArticleEntity = new DistributionStockArticleEntity();
|
|
|
|
|
// stockArticleEntity.setTenantId(tenantId);
|
|
|
|
|
// stockArticleEntity.setCreateUser(userId);
|
|
|
|
|
// stockArticleEntity.setUpdateUser(userId);
|
|
|
|
|
// stockArticleEntity.setCreateDept(deptId);
|
|
|
|
|
// stockArticleEntity.setOrderCode(orderCode);
|
|
|
|
|
// stockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
|
|
|
|
|
// stockArticleEntity.setWaybillNumber(waybillNo);
|
|
|
|
|
// stockArticleEntity.setTotalNumber(total);
|
|
|
|
|
// stockArticleEntity.setHandQuantity(0);
|
|
|
|
|
//// stockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
|
|
|
|
|
// stockArticleEntity.setWarehouse(warehouseEntity.getName());
|
|
|
|
|
// stockArticleEntity.setWarehouseId(warehouseId);
|
|
|
|
|
// stockArticleEntity.setBrand(advanceEntity.getBrand());
|
|
|
|
|
// stockArticleEntity.setDescriptionGoods(advanceEntity.getPackName());
|
|
|
|
|
// stockArticleEntity.setWarehouseEntryTime(date);
|
|
|
|
|
// stockArticleEntity.setGenre(1);
|
|
|
|
|
//
|
|
|
|
|
// String dealerName = advanceEntity.getDealerName();//暂存单经销商名称
|
|
|
|
|
// stockArticleEntity.setDealerCode(advanceEntity.getDealerCode());
|
|
|
|
|
// stockArticleEntity.setDealerName(advanceEntity.getDealerName());
|
|
|
|
|
//
|
|
|
|
|
// stockArticleEntity.setTypeService("1");//默认商配
|
|
|
|
|
//
|
|
|
|
|
// if(!StringUtil.isBlank(waybillNo)){
|
|
|
|
|
// WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
|
|
|
|
|
// if(!Objects.isNull(waybillEntity)){
|
|
|
|
|
// Long consigneeId = waybillEntity.getConsigneeId();
|
|
|
|
|
//
|
|
|
|
|
// BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
|
|
|
|
|
// if(!Objects.isNull(clientEntity)){
|
|
|
|
|
// stockArticleEntity.setMallId(clientEntity.getId());
|
|
|
|
|
// stockArticleEntity.setMallName(clientEntity.getClientName());
|
|
|
|
|
// stockArticleEntity.setMallCode(clientEntity.getClientCode());
|
|
|
|
|
// }
|
|
|
|
|
// String consignee = waybillEntity.getConsignee();
|
|
|
|
|
// String consigneeName = waybillEntity.getConsigneeName();
|
|
|
|
|
// String consigneeMobile = waybillEntity.getConsigneeMobile();
|
|
|
|
|
// String consigneeAddress = waybillEntity.getConsigneeAddress();
|
|
|
|
|
// stockArticleEntity.setConsigneeUnit(consignee);
|
|
|
|
|
// stockArticleEntity.setConsigneePerson(consigneeName);
|
|
|
|
|
// stockArticleEntity.setConsigneeMobile(consigneeMobile);
|
|
|
|
|
// stockArticleEntity.setConsigneeAddress(consigneeAddress);
|
|
|
|
|
//
|
|
|
|
|
// BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
|
|
|
|
|
// if(!Objects.isNull(basicdataStoreBusinessEntity)){
|
|
|
|
|
// stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }else{
|
|
|
|
|
// Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
|
|
|
|
|
// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
|
|
|
|
|
// if(!Objects.isNull(basicdataClientEntity)){
|
|
|
|
|
// String clientType = basicdataClientEntity.getClientType();
|
|
|
|
|
// if("5".equals(clientType)){
|
|
|
|
|
// stockArticleEntity.setStoreId(basicdataClientEntity.getId());
|
|
|
|
|
// stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
|
|
|
|
|
// stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
|
|
|
|
|
// //查询门店的父级商场
|
|
|
|
|
// Long pid = basicdataClientEntity.getPid();
|
|
|
|
|
// BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
|
|
|
|
|
// if(!Objects.isNull(pidEntity)){
|
|
|
|
|
// String pidEntityClientType = pidEntity.getClientType();
|
|
|
|
|
// if("2".equals(pidEntityClientType)){
|
|
|
|
|
// //商城
|
|
|
|
|
// stockArticleEntity.setMallId(pidEntity.getId());
|
|
|
|
|
// stockArticleEntity.setMallName(pidEntity.getClientName());
|
|
|
|
|
// stockArticleEntity.setMallCode(pidEntity.getClientCode());
|
|
|
|
|
//
|
|
|
|
|
// BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
|
|
|
|
|
// if(!Objects.isNull(basicdataStoreBusinessEntity)){
|
|
|
|
|
// stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }else if("2".equals(clientType)){
|
|
|
|
|
// //商城
|
|
|
|
|
// stockArticleEntity.setMallId(basicdataClientEntity.getId());
|
|
|
|
|
// stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
|
|
|
|
|
// stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
|
|
|
|
|
//
|
|
|
|
|
// BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
|
|
|
|
|
// if(!Objects.isNull(basicdataStoreBusinessEntity)){
|
|
|
|
|
// stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
|
|
|
|
|
// stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
|
|
|
|
|
// stockArticleEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
|
|
|
|
|
// stockArticleEntity.setStockupStatus("10");
|
|
|
|
|
// stockArticleEntity.setReservationStatus("10");
|
|
|
|
|
// stockArticleEntity.setOrderStatus("0");
|
|
|
|
|
// stockArticleEntity.setGroundingStatus("10");
|
|
|
|
|
// stockArticleEntity.setOrderReceiveStatus("10");
|
|
|
|
|
// stockArticleEntity.setFreezeStatus("10");
|
|
|
|
|
// stockArticleEntity.setNotification(2);
|
|
|
|
|
// stockArticleEntity.setIsHaveData(2);
|
|
|
|
|
// stockArticleEntity.setTrainNumber(advanceEntity.getTrainNumber());
|
|
|
|
|
// stockArticleEntity.setSortingQuantity(0);
|
|
|
|
|
// stockArticleEntity.setDeliveryQuantity(0);
|
|
|
|
|
// stockArticleEntity.setTransferQuantity(0);
|
|
|
|
|
// stockArticleEntity.setSigninQuantity(0);
|
|
|
|
|
// orderId = stockArticleClient.addData(stockArticleEntity);
|
|
|
|
|
// }else{
|
|
|
|
|
//
|
|
|
|
|
// stockArticleEntity.setTotalNumber(total);
|
|
|
|
|
// stockArticleClient.saveOrUpdate(stockArticleEntity);
|
|
|
|
|
// orderId = stockArticleEntity.getId();
|
|
|
|
|
// }
|
|
|
|
|
// if(Objects.isNull(orderId)){
|
|
|
|
|
// log.warn("##############saveOrderAndPackage: 订单信息有误 orderId={}",orderId);
|
|
|
|
|
// throw new CustomerException(405,"订单信息有误");
|
|
|
|
|
// }
|
|
|
|
|
// log.info("#############saveOrderAndPackage: 订单信息保存成功 orderId={}",orderId);
|
|
|
|
|
//
|
|
|
|
|
// //保存包件信息
|
|
|
|
|
// DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
|
|
|
|
|
// parcelList.setCreateUser(userId);
|
|
|
|
|
// parcelList.setUpdateUser(userId);
|
|
|
|
|
// parcelList.setCreateDept(deptId);
|
|
|
|
|
// parcelList.setTenantId(tenantId);
|
|
|
|
|
// parcelList.setWarehouse(warehouseEntity.getName());
|
|
|
|
|
// parcelList.setWarehouseId(warehouseId);
|
|
|
|
|
// parcelList.setIsTransfer(1);
|
|
|
|
|
// String waybillNo = advanceEntity.getWaybillNo();
|
|
|
|
|
// if(StringUtil.isNotBlank(waybillNo)){
|
|
|
|
|
// WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
|
|
|
|
|
// if(!Objects.isNull(waybillEntity)){
|
|
|
|
|
// parcelList.setWaybillId(waybillEntity.getId());
|
|
|
|
|
// parcelList.setWaybillNumber(waybillEntity.getWaybillNo());
|
|
|
|
|
// parcelList.setSendWarehouseId(waybillEntity.getDepartureWarehouseId());
|
|
|
|
|
// parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName());
|
|
|
|
|
// Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
|
|
|
|
|
// parcelList.setAcceptWarehouseId(destinationWarehouseId);
|
|
|
|
|
// parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName());
|
|
|
|
|
// if(warehouseId.equals(destinationWarehouseId)){
|
|
|
|
|
// parcelList.setIsTransfer(0);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// parcelList.setConditions(1);
|
|
|
|
|
// parcelList.setOrderPackageCode(advanceDetailEntity.getOrderPackageCode());
|
|
|
|
|
// parcelList.setFirsts(advanceDetailEntity.getFirstPackName());
|
|
|
|
|
// parcelList.setSecond(advanceDetailEntity.getSecondPackName());
|
|
|
|
|
// parcelList.setThirdProduct(advanceDetailEntity.getThirdPackName());
|
|
|
|
|
// parcelList.setQuantity(1);
|
|
|
|
|
// parcelList.setStockArticleId(orderId);
|
|
|
|
|
// parcelList.setOrderCode(orderCode);
|
|
|
|
|
// parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
|
|
|
|
|
// parcelList.setTrainNumber(advanceEntity.getTrainNumber());
|
|
|
|
|
// parcelList.setAdvanceId(advanceId);
|
|
|
|
|
//
|
|
|
|
|
// Long materialId = advanceDetailEntity.getMaterialId();
|
|
|
|
|
// String materialCode = advanceDetailEntity.getMaterialCode();
|
|
|
|
|
// String materialName = advanceDetailEntity.getMaterialName();
|
|
|
|
|
// if(Objects.isNull(materialId)){
|
|
|
|
|
// BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode,materialName);
|
|
|
|
|
// if(!Objects.isNull(materialEntity)){
|
|
|
|
|
// parcelList.setMaterialId(materialEntity.getId());
|
|
|
|
|
// parcelList.setMaterialName(materialEntity.getName());
|
|
|
|
|
// parcelList.setMaterialCode(materialEntity.getProductCode());
|
|
|
|
|
// parcelList.setMaterialUnit(materialEntity.getSpecification());
|
|
|
|
|
// }
|
|
|
|
|
// }else{
|
|
|
|
|
// BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId);
|
|
|
|
|
// if(!Objects.isNull(materialOwnId)){
|
|
|
|
|
// parcelList.setMaterialId(materialOwnId.getId());
|
|
|
|
|
// parcelList.setMaterialName(materialOwnId.getName());
|
|
|
|
|
// parcelList.setMaterialCode(materialOwnId.getProductCode());
|
|
|
|
|
// parcelList.setMaterialUnit(materialOwnId.getSpecification());
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
// parcelList.setBrandName(advanceDetailEntity.getBrand());
|
|
|
|
|
// parcelList.setOrderPackageStatus("20");
|
|
|
|
|
// parcelList.setOrderPackageFreezeStatus("10");
|
|
|
|
|
// parcelList.setOrderPackageGroundingStatus("10");
|
|
|
|
|
// parcelList.setOrderPackageStockupStatus("10");
|
|
|
|
|
// parcelList.setOrderPackageReservationStatus("10");
|
|
|
|
|
// parcelList.setOrderPackageLoadingStatus("10");
|
|
|
|
|
// parcelList.setWarehouseEntryTimeEnd(date);
|
|
|
|
|
// parcelList.setDealerCode(stockArticleEntity.getDealerCode());
|
|
|
|
|
// parcelList.setDealerName(stockArticleEntity.getDealerName());
|
|
|
|
|
// Long orderPackageId = parcelListClient.addReturnId(parcelList);
|
|
|
|
|
// if(!Objects.isNull(orderPackageId)){
|
|
|
|
|
// log.info("################saveOrderAndPackage: 包件信息保存成功 OrderPackageCode={}",advanceDetailEntity.getOrderPackageCode());
|
|
|
|
|
// //1.修改订单在库件数和最后入库时间和入库状态
|
|
|
|
|
//
|
|
|
|
|
//// List<DistributionParcelListEntity> parcelListEntityList = parcelListClient.findEntityListByOrderCode(orderCode, warehouseId);
|
|
|
|
|
//// int size = parcelListEntityList.size();
|
|
|
|
|
//// Integer totalNumber = stockArticleEntity.getTotalNumber();//总件数
|
|
|
|
|
//// Integer handQuantity = stockArticleEntity.getHandQuantity();//在库件数
|
|
|
|
|
//// Integer incomingNum = stockArticleEntity.getIncomingNum();//入库件数
|
|
|
|
|
////
|
|
|
|
|
//// if(size == 1){
|
|
|
|
|
//// stockArticleEntity.setWarehouseEntryTime(date);
|
|
|
|
|
//// stockArticleEntity.setWarehouseEntryTimeEnd(new Date());
|
|
|
|
|
//// stockArticleEntity.setHandQuantity(handQuantity+1);
|
|
|
|
|
//// stockArticleEntity.setIncomingNum(incomingNum+1);
|
|
|
|
|
//// }else{
|
|
|
|
|
//// stockArticleEntity.setWarehouseEntryTimeEnd(new Date());
|
|
|
|
|
//// stockArticleEntity.setHandQuantity(handQuantity+1);
|
|
|
|
|
//// stockArticleEntity.setIncomingNum(incomingNum+1);
|
|
|
|
|
//// }
|
|
|
|
|
////
|
|
|
|
|
//// if(incomingNum+1 < totalNumber){
|
|
|
|
|
//// stockArticleEntity.setOrderStatus("10");
|
|
|
|
|
//// }else{
|
|
|
|
|
//// stockArticleEntity.setOrderStatus("20");
|
|
|
|
|
//// }
|
|
|
|
|
//// stockArticleClient.saveOrUpdate(stockArticleEntity);
|
|
|
|
|
// }
|
|
|
|
|
// log.info("#############saveOrderAndPackage: 订单包件信息保存完成 OrderPackageCode={}",advanceDetailEntity.getOrderPackageCode());
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
zhaoqiaobo
10 months ago