|
|
|
|
@ -53,6 +53,8 @@ import org.springblade.common.constant.orderpackage.*;
|
|
|
|
|
import org.springblade.common.exception.CustomerException; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.redis.cache.BladeRedis; |
|
|
|
|
import org.springblade.core.redis.lock.LockType; |
|
|
|
|
import org.springblade.core.redis.lock.RedisLockClient; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.ObjectUtil; |
|
|
|
|
import org.springblade.core.tool.utils.StringUtil; |
|
|
|
|
@ -62,6 +64,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
|
|
@Slf4j |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@ -110,6 +113,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final BladeRedis redis; |
|
|
|
|
private final RedisLockClient redisLockClient; |
|
|
|
|
private final IRegionFeign regionFeign; |
|
|
|
|
private final IBasicdataBrandClient basicdataBrandClient; |
|
|
|
|
|
|
|
|
|
@ -813,7 +817,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
|
|
|
|
|
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
if(!Objects.isNull(warehouseWaybillEntity)){ |
|
|
|
|
entity.setWaybillId(warehouseWaybillEntity.getId()); |
|
|
|
|
entity.setWaybillNumber(waybillNo); |
|
|
|
|
}else{ |
|
|
|
|
Long waybillId = saveWaybillEntity(waybillNo); |
|
|
|
|
entity.setWaybillId(waybillId); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String brand = distributionStockArticleEntity.getBrand(); |
|
|
|
|
@ -894,186 +900,197 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void saveWaybillEntity(String waybillNo) { |
|
|
|
|
private Long saveWaybillEntity(String waybillNo) { |
|
|
|
|
log.info("#################handleDataToPlatform.saveWaybillEntity: {}", waybillNo); |
|
|
|
|
|
|
|
|
|
if (StringUtil.isBlank(waybillNo)) { |
|
|
|
|
return; |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(redis.exists("dealwithWaybillNo:"+waybillNo)){ |
|
|
|
|
log.info("###########saveWaybillEntity: 已有保存数据 waybillNo={}",waybillNo); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// if (redis.exists("dealwithWaybillNo:" + waybillNo)) {
|
|
|
|
|
// log.info("###########saveWaybillEntity: 已有保存数据 waybillNo={}", waybillNo);
|
|
|
|
|
// return waybillId;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//通过运单号先去查询新系统是否存在这个运单号
|
|
|
|
|
WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
log.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill); |
|
|
|
|
|
|
|
|
|
if (Objects.isNull(warehouseWaybill)) { |
|
|
|
|
redis.setEx("dealwithWaybillNo:"+waybillNo,waybillNo,30L); |
|
|
|
|
//如果新系统中不存在这个运单，那么就去查询老系统的运单数据
|
|
|
|
|
WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); |
|
|
|
|
log.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity); |
|
|
|
|
if (Objects.isNull(wayBillEntity)) { |
|
|
|
|
log.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo); |
|
|
|
|
throw new CustomerException("老系统中未找到对应运单"); |
|
|
|
|
} |
|
|
|
|
String startSite = wayBillEntity.getStartSite();//始发仓名称
|
|
|
|
|
BasicdataWarehouseEntity starthouse = basicdataWarehouseClient.findByName(startSite); |
|
|
|
|
String warehouseName = wayBillEntity.getWarehouseName();//目的仓
|
|
|
|
|
BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); |
|
|
|
|
Integer number = wayBillEntity.getNumber();//运单总数量
|
|
|
|
|
String packname = wayBillEntity.getPackname(); |
|
|
|
|
String agent = wayBillEntity.getAgent(); |
|
|
|
|
|
|
|
|
|
warehouseWaybill = new WarehouseWaybillEntity(); |
|
|
|
|
warehouseWaybill.setTenantId(TenantNum.HUITONGCODE); |
|
|
|
|
warehouseWaybill.setCreateUser(1714696768639311873L); |
|
|
|
|
warehouseWaybill.setUpdateUser(1714696768639311873L); |
|
|
|
|
warehouseWaybill.setCreateDept(1649331096241836033L); |
|
|
|
|
warehouseWaybill.setWaybillNo(waybillNo); |
|
|
|
|
warehouseWaybill.setDestinationWarehouseName(warehouseName); |
|
|
|
|
warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); |
|
|
|
|
warehouseWaybill.setDepartureWarehouseName(startSite); |
|
|
|
|
warehouseWaybill.setDepartureWarehouseId(Objects.isNull(starthouse) ? null : starthouse.getId()); |
|
|
|
|
warehouseWaybill.setCustomerTrain(wayBillEntity.getCarNo()); |
|
|
|
|
warehouseWaybill.setBrand(wayBillEntity.getBrand()); |
|
|
|
|
String sendCompany = wayBillEntity.getSendCompany();//发货单位
|
|
|
|
|
String takeCompany = wayBillEntity.getTakeCompany();//收货单位
|
|
|
|
|
BasicdataClientEntity sendClient = basicdataClientClient.findByName(sendCompany); |
|
|
|
|
BasicdataClientEntity takeClient = basicdataClientClient.findByName(takeCompany); |
|
|
|
|
if (!Objects.isNull(sendClient)) { |
|
|
|
|
Long clientEntityId = sendClient.getId();//基础客户
|
|
|
|
|
warehouseWaybill.setShipperId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
if (!Objects.isNull(takeClient)) { |
|
|
|
|
Long clientEntityId = takeClient.getId();//基础客户
|
|
|
|
|
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3); |
|
|
|
|
if (!Objects.isNull(basicdataStoreBusinessEntity)) { |
|
|
|
|
warehouseWaybill.setServiceType(Integer.parseInt(basicdataStoreBusinessEntity.getMold())); |
|
|
|
|
String lockKey = "dealwithWaybillNo:" + waybillNo; |
|
|
|
|
Long aLong = null; |
|
|
|
|
boolean flag = false; |
|
|
|
|
try { |
|
|
|
|
flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 20000, 30000, TimeUnit.MILLISECONDS); |
|
|
|
|
} catch (InterruptedException e) { |
|
|
|
|
throw new RuntimeException(e); |
|
|
|
|
} |
|
|
|
|
if(flag){ |
|
|
|
|
//通过运单号先去查询新系统是否存在这个运单号
|
|
|
|
|
WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
log.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill); |
|
|
|
|
|
|
|
|
|
if (Objects.isNull(warehouseWaybill)) { |
|
|
|
|
redis.setEx("dealwithWaybillNo:" + waybillNo, waybillNo, 30L); |
|
|
|
|
//如果新系统中不存在这个运单，那么就去查询老系统的运单数据
|
|
|
|
|
WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); |
|
|
|
|
log.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity); |
|
|
|
|
if (Objects.isNull(wayBillEntity)) { |
|
|
|
|
log.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo); |
|
|
|
|
throw new CustomerException("老系统中未找到对应运单"); |
|
|
|
|
} |
|
|
|
|
warehouseWaybill.setConsigneeId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
warehouseWaybill.setShipper(sendCompany); |
|
|
|
|
warehouseWaybill.setShipperName(wayBillEntity.getSendPerson()); |
|
|
|
|
warehouseWaybill.setShipperMobile(wayBillEntity.getSendMobile()); |
|
|
|
|
warehouseWaybill.setShipperAddress(wayBillEntity.getSendAddress()); |
|
|
|
|
warehouseWaybill.setConsignee(takeCompany); |
|
|
|
|
warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); |
|
|
|
|
warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); |
|
|
|
|
warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); |
|
|
|
|
String startSite = wayBillEntity.getStartSite();//始发仓名称
|
|
|
|
|
BasicdataWarehouseEntity starthouse = basicdataWarehouseClient.findByName(startSite); |
|
|
|
|
String warehouseName = wayBillEntity.getWarehouseName();//目的仓
|
|
|
|
|
BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); |
|
|
|
|
Integer number = wayBillEntity.getNumber();//运单总数量
|
|
|
|
|
String packname = wayBillEntity.getPackname(); |
|
|
|
|
String agent = wayBillEntity.getAgent(); |
|
|
|
|
|
|
|
|
|
warehouseWaybill = new WarehouseWaybillEntity(); |
|
|
|
|
warehouseWaybill.setTenantId(TenantNum.HUITONGCODE); |
|
|
|
|
warehouseWaybill.setCreateUser(1714696768639311873L); |
|
|
|
|
warehouseWaybill.setUpdateUser(1714696768639311873L); |
|
|
|
|
warehouseWaybill.setCreateDept(1649331096241836033L); |
|
|
|
|
warehouseWaybill.setWaybillNo(waybillNo); |
|
|
|
|
warehouseWaybill.setDestinationWarehouseName(warehouseName); |
|
|
|
|
warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); |
|
|
|
|
warehouseWaybill.setDepartureWarehouseName(startSite); |
|
|
|
|
warehouseWaybill.setDepartureWarehouseId(Objects.isNull(starthouse) ? null : starthouse.getId()); |
|
|
|
|
warehouseWaybill.setCustomerTrain(wayBillEntity.getCarNo()); |
|
|
|
|
warehouseWaybill.setBrand(wayBillEntity.getBrand()); |
|
|
|
|
String sendCompany = wayBillEntity.getSendCompany();//发货单位
|
|
|
|
|
String takeCompany = wayBillEntity.getTakeCompany();//收货单位
|
|
|
|
|
BasicdataClientEntity sendClient = basicdataClientClient.findByName(sendCompany); |
|
|
|
|
BasicdataClientEntity takeClient = basicdataClientClient.findByName(takeCompany); |
|
|
|
|
if (!Objects.isNull(sendClient)) { |
|
|
|
|
Long clientEntityId = sendClient.getId();//基础客户
|
|
|
|
|
warehouseWaybill.setShipperId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
if (!Objects.isNull(takeClient)) { |
|
|
|
|
Long clientEntityId = takeClient.getId();//基础客户
|
|
|
|
|
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3); |
|
|
|
|
if (!Objects.isNull(basicdataStoreBusinessEntity)) { |
|
|
|
|
warehouseWaybill.setServiceType(Integer.parseInt(basicdataStoreBusinessEntity.getMold())); |
|
|
|
|
} |
|
|
|
|
warehouseWaybill.setConsigneeId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
warehouseWaybill.setShipper(sendCompany); |
|
|
|
|
warehouseWaybill.setShipperName(wayBillEntity.getSendPerson()); |
|
|
|
|
warehouseWaybill.setShipperMobile(wayBillEntity.getSendMobile()); |
|
|
|
|
warehouseWaybill.setShipperAddress(wayBillEntity.getSendAddress()); |
|
|
|
|
warehouseWaybill.setConsignee(takeCompany); |
|
|
|
|
warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); |
|
|
|
|
warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); |
|
|
|
|
warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); |
|
|
|
|
// String arriveSite = wayBillEntity.getArriveSite();
|
|
|
|
|
Integer arriveSiteId = wayBillEntity.getArriveSiteId(); |
|
|
|
|
String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); |
|
|
|
|
Integer arriveSiteId = wayBillEntity.getArriveSiteId(); |
|
|
|
|
String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); |
|
|
|
|
// String code = regionFeign.getCode(arriveSite);
|
|
|
|
|
warehouseWaybill.setDestinationCode(code); |
|
|
|
|
warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); |
|
|
|
|
warehouseWaybill.setGoodsName(packname); |
|
|
|
|
warehouseWaybill.setTotalCount(number); |
|
|
|
|
warehouseWaybill.setStockCount(1); |
|
|
|
|
warehouseWaybill.setWaybillType(1); |
|
|
|
|
warehouseWaybill.setTotalWeight(wayBillEntity.getWeight()); |
|
|
|
|
warehouseWaybill.setTotalVolume(wayBillEntity.getVolume()); |
|
|
|
|
warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType()); |
|
|
|
|
warehouseWaybill.setUrgency(wayBillEntity.getUrgency()); |
|
|
|
|
warehouseWaybill.setReceiptCount(wayBillEntity.getReceiptNum()); |
|
|
|
|
warehouseWaybill.setReceiptRequirement(wayBillEntity.getReceiptAsk()); |
|
|
|
|
//--------------2023-07-28-------------
|
|
|
|
|
warehouseWaybill.setCollectPay(wayBillEntity.getDPay()); |
|
|
|
|
warehouseWaybill.setReceivedCollectPay(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setReplacePrice(wayBillEntity.getReplacePrice()); |
|
|
|
|
warehouseWaybill.setReceivedReplacePrice(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setReceivedTotalPrice(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setWaybillType(wayBillEntity.getType()); |
|
|
|
|
warehouseWaybill.setReceivedStatus(0); |
|
|
|
|
|
|
|
|
|
warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); |
|
|
|
|
warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); |
|
|
|
|
warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); |
|
|
|
|
warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); |
|
|
|
|
warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); |
|
|
|
|
warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); |
|
|
|
|
warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); |
|
|
|
|
warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); |
|
|
|
|
warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); |
|
|
|
|
warehouseWaybill.setPayType(wayBillEntity.getPayType()+""); |
|
|
|
|
warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod()+""); |
|
|
|
|
warehouseWaybill.setXPay(wayBillEntity.getXPay()); |
|
|
|
|
warehouseWaybill.setDPay(wayBillEntity.getDPay()); |
|
|
|
|
warehouseWaybill.setHPay(wayBillEntity.getHPay()); |
|
|
|
|
warehouseWaybill.setYPay(wayBillEntity.getYPay()); |
|
|
|
|
warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); |
|
|
|
|
warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType()+""); |
|
|
|
|
warehouseWaybill.setUrgency(wayBillEntity.getUrgency()+""); |
|
|
|
|
warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); |
|
|
|
|
warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); |
|
|
|
|
warehouseWaybill.setTransportType(wayBillEntity.getShippingType()+""); |
|
|
|
|
warehouseWaybill.setRebate(wayBillEntity.getRebate()); |
|
|
|
|
|
|
|
|
|
BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); |
|
|
|
|
if (!Objects.isNull(agentClient)) { |
|
|
|
|
Long clientEntityId = agentClient.getId();//基础客户
|
|
|
|
|
warehouseWaybill.setAgentId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
Date date = new Date(); |
|
|
|
|
warehouseWaybill.setAgent(agent); |
|
|
|
|
warehouseWaybill.setDocumentMakingTime(wayBillEntity.getPreparationTime()); |
|
|
|
|
warehouseWaybill.setRemark(wayBillEntity.getMsg()); |
|
|
|
|
warehouseWaybill.setBatchNo(wayBillEntity.getStartCarsNo()); |
|
|
|
|
warehouseWaybill.setFreezeStatus(0); |
|
|
|
|
warehouseWaybill.setStatus(0); |
|
|
|
|
warehouseWaybill.setIsDeleted(0); |
|
|
|
|
warehouseWaybill.setCreateTime(date); |
|
|
|
|
warehouseWaybill.setUpdateTime(date); |
|
|
|
|
Long aLong = warehouseWaybillClient.addEnntity(warehouseWaybill); |
|
|
|
|
if(aLong != 0){ |
|
|
|
|
|
|
|
|
|
List<WaybillDesEntity> desList = waybillDesClient.getDesList(waybillNo); |
|
|
|
|
List<WarehouseWayBillDetail> warehouseWayBillDetails = new ArrayList<>(); |
|
|
|
|
for (WaybillDesEntity waybillDesEntity : desList) { |
|
|
|
|
WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); |
|
|
|
|
warehouseWayBillDetail.setCreateUser(1714696768639311873L); |
|
|
|
|
warehouseWayBillDetail.setUpdateUser(1714696768639311873L); |
|
|
|
|
warehouseWayBillDetail.setCreateDept(1649331096241836033L); |
|
|
|
|
warehouseWayBillDetail.setWaybillId(aLong); |
|
|
|
|
warehouseWayBillDetail.setWaybillNo(waybillNo); |
|
|
|
|
String goodsName = waybillDesEntity.getName(); |
|
|
|
|
BasicdataCategoryEntity categoryEntity = categoryClient.findByName(goodsName); |
|
|
|
|
if(Objects.isNull(categoryEntity)){ |
|
|
|
|
categoryEntity = new BasicdataCategoryEntity(); |
|
|
|
|
categoryEntity.setName(goodsName); |
|
|
|
|
categoryEntity.setType(1); |
|
|
|
|
categoryEntity.setTenantId(TenantNum.HUITONGCODE); |
|
|
|
|
categoryEntity.setCreateUser(1714696768639311873L); |
|
|
|
|
categoryEntity.setUpdateUser(1714696768639311873L); |
|
|
|
|
categoryEntity.setCreateDept(1649331096241836033L); |
|
|
|
|
Long categoryId = categoryClient.addReturnId(categoryEntity); |
|
|
|
|
warehouseWayBillDetail.setProductId(categoryId); |
|
|
|
|
}else{ |
|
|
|
|
warehouseWayBillDetail.setProductId(categoryEntity.getId()); |
|
|
|
|
warehouseWaybill.setDestinationCode(code); |
|
|
|
|
warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); |
|
|
|
|
warehouseWaybill.setGoodsName(packname); |
|
|
|
|
warehouseWaybill.setTotalCount(number); |
|
|
|
|
warehouseWaybill.setStockCount(1); |
|
|
|
|
warehouseWaybill.setWaybillType(1); |
|
|
|
|
warehouseWaybill.setTotalWeight(wayBillEntity.getWeight()); |
|
|
|
|
warehouseWaybill.setTotalVolume(wayBillEntity.getVolume()); |
|
|
|
|
warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType()); |
|
|
|
|
warehouseWaybill.setUrgency(wayBillEntity.getUrgency()); |
|
|
|
|
warehouseWaybill.setReceiptCount(wayBillEntity.getReceiptNum()); |
|
|
|
|
warehouseWaybill.setReceiptRequirement(wayBillEntity.getReceiptAsk()); |
|
|
|
|
//--------------2023-07-28-------------
|
|
|
|
|
warehouseWaybill.setCollectPay(wayBillEntity.getDPay()); |
|
|
|
|
warehouseWaybill.setReceivedCollectPay(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setReplacePrice(wayBillEntity.getReplacePrice()); |
|
|
|
|
warehouseWaybill.setReceivedReplacePrice(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setReceivedTotalPrice(BigDecimal.ZERO); |
|
|
|
|
warehouseWaybill.setWaybillType(wayBillEntity.getType()); |
|
|
|
|
warehouseWaybill.setReceivedStatus(0); |
|
|
|
|
|
|
|
|
|
warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); |
|
|
|
|
warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); |
|
|
|
|
warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); |
|
|
|
|
warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); |
|
|
|
|
warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); |
|
|
|
|
warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); |
|
|
|
|
warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); |
|
|
|
|
warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); |
|
|
|
|
warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); |
|
|
|
|
warehouseWaybill.setPayType(wayBillEntity.getPayType() + ""); |
|
|
|
|
warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod() + ""); |
|
|
|
|
warehouseWaybill.setXPay(wayBillEntity.getXPay()); |
|
|
|
|
warehouseWaybill.setDPay(wayBillEntity.getDPay()); |
|
|
|
|
warehouseWaybill.setHPay(wayBillEntity.getHPay()); |
|
|
|
|
warehouseWaybill.setYPay(wayBillEntity.getYPay()); |
|
|
|
|
warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); |
|
|
|
|
warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType() + ""); |
|
|
|
|
warehouseWaybill.setUrgency(wayBillEntity.getUrgency() + ""); |
|
|
|
|
warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); |
|
|
|
|
warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); |
|
|
|
|
warehouseWaybill.setTransportType(wayBillEntity.getShippingType() + ""); |
|
|
|
|
warehouseWaybill.setRebate(wayBillEntity.getRebate()); |
|
|
|
|
|
|
|
|
|
BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); |
|
|
|
|
if (!Objects.isNull(agentClient)) { |
|
|
|
|
Long clientEntityId = agentClient.getId();//基础客户
|
|
|
|
|
warehouseWaybill.setAgentId(clientEntityId); |
|
|
|
|
} |
|
|
|
|
Date date = new Date(); |
|
|
|
|
warehouseWaybill.setAgent(agent); |
|
|
|
|
warehouseWaybill.setDocumentMakingTime(wayBillEntity.getPreparationTime()); |
|
|
|
|
warehouseWaybill.setRemark(wayBillEntity.getMsg()); |
|
|
|
|
warehouseWaybill.setBatchNo(wayBillEntity.getStartCarsNo()); |
|
|
|
|
warehouseWaybill.setFreezeStatus(0); |
|
|
|
|
warehouseWaybill.setStatus(0); |
|
|
|
|
warehouseWaybill.setIsDeleted(0); |
|
|
|
|
warehouseWaybill.setCreateTime(date); |
|
|
|
|
warehouseWaybill.setUpdateTime(date); |
|
|
|
|
aLong = warehouseWaybillClient.addEnntity(warehouseWaybill); |
|
|
|
|
if (aLong != 0) { |
|
|
|
|
redis.setEx("dealwithWaybillNoId:" + waybillNo,aLong, 30L); |
|
|
|
|
List<WaybillDesEntity> desList = waybillDesClient.getDesList(waybillNo); |
|
|
|
|
List<WarehouseWayBillDetail> warehouseWayBillDetails = new ArrayList<>(); |
|
|
|
|
for (WaybillDesEntity waybillDesEntity : desList) { |
|
|
|
|
WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); |
|
|
|
|
warehouseWayBillDetail.setCreateUser(1714696768639311873L); |
|
|
|
|
warehouseWayBillDetail.setUpdateUser(1714696768639311873L); |
|
|
|
|
warehouseWayBillDetail.setCreateDept(1649331096241836033L); |
|
|
|
|
warehouseWayBillDetail.setWaybillId(aLong); |
|
|
|
|
warehouseWayBillDetail.setWaybillNo(waybillNo); |
|
|
|
|
String goodsName = waybillDesEntity.getName(); |
|
|
|
|
BasicdataCategoryEntity categoryEntity = categoryClient.findByName(goodsName); |
|
|
|
|
if (Objects.isNull(categoryEntity)) { |
|
|
|
|
categoryEntity = new BasicdataCategoryEntity(); |
|
|
|
|
categoryEntity.setName(goodsName); |
|
|
|
|
categoryEntity.setType(1); |
|
|
|
|
categoryEntity.setTenantId(TenantNum.HUITONGCODE); |
|
|
|
|
categoryEntity.setCreateUser(1714696768639311873L); |
|
|
|
|
categoryEntity.setUpdateUser(1714696768639311873L); |
|
|
|
|
categoryEntity.setCreateDept(1649331096241836033L); |
|
|
|
|
Long categoryId = categoryClient.addReturnId(categoryEntity); |
|
|
|
|
warehouseWayBillDetail.setProductId(categoryId); |
|
|
|
|
} else { |
|
|
|
|
warehouseWayBillDetail.setProductId(categoryEntity.getId()); |
|
|
|
|
} |
|
|
|
|
warehouseWayBillDetail.setProductName(goodsName); |
|
|
|
|
warehouseWayBillDetail.setNum(waybillDesEntity.getNum()); |
|
|
|
|
warehouseWayBillDetail.setPrice(waybillDesEntity.getPrice()); |
|
|
|
|
warehouseWayBillDetail.setVolume(waybillDesEntity.getVolume()); |
|
|
|
|
warehouseWayBillDetail.setWeight(waybillDesEntity.getWeight()); |
|
|
|
|
warehouseWayBillDetail.setSubtotalFreight(waybillDesEntity.getTotalDesPrice()); |
|
|
|
|
warehouseWayBillDetail.setChargeType(waybillDesEntity.getPic()); |
|
|
|
|
warehouseWayBillDetails.add(warehouseWayBillDetail); |
|
|
|
|
} |
|
|
|
|
warehouseWayBillDetail.setProductName(goodsName); |
|
|
|
|
warehouseWayBillDetail.setNum(waybillDesEntity.getNum()); |
|
|
|
|
warehouseWayBillDetail.setPrice(waybillDesEntity.getPrice()); |
|
|
|
|
warehouseWayBillDetail.setVolume(waybillDesEntity.getVolume()); |
|
|
|
|
warehouseWayBillDetail.setWeight(waybillDesEntity.getWeight()); |
|
|
|
|
warehouseWayBillDetail.setSubtotalFreight(waybillDesEntity.getTotalDesPrice()); |
|
|
|
|
warehouseWayBillDetail.setChargeType(waybillDesEntity.getPic()); |
|
|
|
|
warehouseWayBillDetails.add(warehouseWayBillDetail); |
|
|
|
|
warehouseWaybillDetailClient.addList(warehouseWayBillDetails); |
|
|
|
|
} |
|
|
|
|
warehouseWaybillDetailClient.addList(warehouseWayBillDetails); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); |
|
|
|
|
warehouseWaybill.setUpdateTime(new Date()); |
|
|
|
|
warehouseWaybillClient.updateEntity(warehouseWaybill); |
|
|
|
|
} else { |
|
|
|
|
warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); |
|
|
|
|
warehouseWaybill.setUpdateTime(new Date()); |
|
|
|
|
warehouseWaybillClient.updateEntity(warehouseWaybill); |
|
|
|
|
aLong = warehouseWaybill.getId(); |
|
|
|
|
} |
|
|
|
|
//暂存单与运单的关联
|
|
|
|
|
saveAdvanceData(warehouseWaybill); |
|
|
|
|
redisLockClient.unLock(lockKey, LockType.FAIR); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//暂存单与运单的关联
|
|
|
|
|
saveAdvanceData(warehouseWaybill); |
|
|
|
|
|
|
|
|
|
return aLong; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void saveAdvanceData(WarehouseWaybillEntity warehouseWaybill) { |
|
|
|
|
|
