Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 5 months ago
parent
commit
442f68f2c5
  1. 3
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
  2. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
  3. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  5. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java
  6. 58
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java
  7. 4
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java
  8. 4
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java
  9. 13
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
  10. 24
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

3
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java

@ -222,4 +222,7 @@ public interface IDistributionStockArticleClient {
@PostMapping(API_PREFIX + "/findWaybillNoByOrderIds")
List<DistributionStockArticleEntity> findWaybillNoByOrderIds(@RequestBody Set<Long> stockArticleIds);
@PostMapping(API_PREFIX + "/updateEntity")
void updateEntity(@RequestBody DistributionStockArticleEntity stockArticleEntity);
}

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@ -160,7 +160,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
abnormalRecordEntity.setRemark("本车次少货("+upWarehouseName+" "+AuthUtil.getNickName()+")");
}else if(dealType.equals(4)){
Long warehouseId = abnormalRecordDTO.getWarehouseId();
Long warehouseId = abnormalRecordEntity.getWarehouseId();
R r = trunklineCarsLoadScanClient.adnormalHasStock(carsLoadScanId,warehouseId);
int code = r.getCode();
if(code != 200){

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@ -451,4 +451,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
return distributionParcelListService.findWaybillNoByOrderIds(stockArticleIds);
}
@Override
public void updateEntity(DistributionStockArticleEntity stockArticleEntity) {
distributionStockArticleService.updateById(stockArticleEntity);
}
}

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -774,6 +774,7 @@
AND ldpll.order_package_loading_status != '20'
AND ldpll.order_package_reservation_status != '20'
AND ldpll.order_package_status != '70'
AND ldpll.order_package_freeze_status = '10'
AND ldpll.conditions != 2
AND ldpll.warehouse_id = #{par.warehouseId}
AND ldsa.type_service = #{par.typeService}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java

@ -59,7 +59,7 @@ public class BusinessPreOrderDataQueueHandler {
if(tenant1.isSuccess() && tenant1.getData() != null ){
Tenant data = tenant1.getData();
if(1==data.getTenantType()){
if(2==data.getTenantType()){
log.info(">>>>>>>>> 当前作业对象 {} 未 商家对象",data.getTenantName() );
return ;
}
@ -71,9 +71,6 @@ public class BusinessPreOrderDataQueueHandler {
if (tenantList.isSuccess()) {
List<Tenant> data = tenantList.getData();
data.forEach(tenant -> {
if (!ObjectUtil.isEmpty(tenant.getTenantType())) {
if (2 == tenant.getTenantType()) {
List<BasicdataClientEntity> basicdataClientEntitysTenantId = basicdataClientClient.findBasicdataClientEntitysTenantId(tenant.getTenantId());
@ -93,7 +90,6 @@ public class BusinessPreOrderDataQueueHandler {
if (list != null && !list.isEmpty()) {
resoveData(tenant,distributionDeliveryListEntity, basicdataClientEntitysTenantId, list);
}
}
}
}

58
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/job/AdvanceJob.java

@ -0,0 +1,58 @@
package com.logpm.factorydata.olo.job;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.logpm.factorydata.olo.entity.DeliveryNoteEntity;
import com.logpm.factorydata.olo.service.DeliveryNoteService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 我乐定时生成暂存单
*
* @author zhaoqiaobo
* @create 2024-04-02
*/
@AllArgsConstructor
@Component
@Slf4j
public class AdvanceJob {
private final DeliveryNoteService deliveryNoteService;
/**
* 定时扫描数据库
* 背景我乐每天晚上凌晨1点拉取订单数据然后存入我乐订单池
* 任务1点半去定时生成暂存单
*
* @param param
* @return
* @throws Exception
*/
@XxlJob("createAdvance")
public ReturnT<String> createAdvance(String param) throws Exception {
// 指定天数生成暂存单或者系统自动处理
DateTime time = DateUtil.date();
if (StrUtil.isNotEmpty(param)) {
time = DateUtil.parseDate(param);
}
// 1 查询出当前拉取的数据
// 大于等于 time 的开始 小于 time 的结束
List<DeliveryNoteEntity> list = deliveryNoteService.list(Wrappers.<DeliveryNoteEntity>lambdaQuery().between(DeliveryNoteEntity::getCreateTime, DateUtil.beginOfDay(time), DateUtil.endOfDay(time)));
// 2 按订单和发货单分组作为一个暂存单
if (CollUtil.isNotEmpty(list)) {
// 3 生成暂存单
deliveryNoteService.buildAdvance(list);
}
return ReturnT.SUCCESS;
}
}

4
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java

@ -153,8 +153,8 @@ public class FactoryOrderListener {
}
if (CollUtil.isNotEmpty(entities)) {
deliveryNoteService.saveBatch(entities);
// 处理暂存单
deliveryNoteService.buildAdvance(entities);
// 处理暂存单 暂存单由定时任务定时生成
// deliveryNoteService.buildAdvance(entities);
FactoryOrderLogEntity logEntity1 = new FactoryOrderLogEntity();
logEntity1.setSaxStatus(SaxStatusEnums.SUCCESS.getCode());
logEntity1.setId(logId);

4
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java

@ -73,7 +73,7 @@ public class NodeDataPushListener {
if (CollUtil.isNotEmpty(content)) {
FactoryNodeEnums factoryNode = NodeMappingEnums.getFactoryByNodeAndStatus(workNodeEnums, 1);
// 1 先处理 批次件 OLO开头的包件 OLO2312064418-20231226010129-1-001 原始包件 2312064418 回传按原始包件回传
content.stream().map(i -> {
content = content.stream().map(i -> {
String packageCode = i.getPackageCode();
if (StrUtil.startWith(packageCode, "OLO")) {
if (StrUtil.isNotEmpty(packageCode)) {
@ -82,7 +82,7 @@ public class NodeDataPushListener {
}
}
return i;
});
}).collect(Collectors.toList());
// 2 先查出 包件+订单 的所有发运分单号和发运单号
Set<String> packageSet = content.stream().map(PushData::getPackageCode).collect(Collectors.toSet());
Set<String> orderSet = content.stream().map(PushData::getOrderCode).collect(Collectors.toSet());

13
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@ -589,6 +589,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
orderId = stockArticleClient.addData(stockArticleEntity);
} else {
stockArticleEntity.setTotalNumber(total);
stockArticleEntity.setGenre(1);
stockArticleClient.saveOrUpdate(stockArticleEntity);
orderId = stockArticleEntity.getId();
@ -852,10 +853,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
stockArticleEntity.setDescriptionGoods(incomeCategoryName);
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consigneeName1);
// 如果在入库的时候发现客户信息不存在,则不设置客户信息 默认采用商配
if (!Objects.isNull(clientEntity)) {
stockArticleEntity.setMallId(clientEntity.getId());
stockArticleEntity.setMallName(clientEntity.getClientName());
stockArticleEntity.setMallCode(clientEntity.getClientCode());
stockArticleEntity.setTypeService(clientEntity.getTypeService()+"");
}
String consignee = waybillEntity.getConsignee();
String consigneeName = waybillEntity.getConsigneeName();
@ -866,10 +870,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
stockArticleEntity.setConsigneeMobile(consigneeMobile);
stockArticleEntity.setConsigneeAddress(consigneeAddress);
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntity.getId(), 3);
if (!Objects.isNull(basicdataStoreBusinessEntity)) {
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
}
// BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntity.getId(), 3);
// if (!Objects.isNull(basicdataStoreBusinessEntity)) {
// stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
// }
}
} else {
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
@ -930,6 +934,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
}
} else {
stockArticleEntity.setTotalNumber(total);
stockArticleEntity.setGenre(1);
updateStockArticleEntities.add(stockArticleEntity);
}
});

24
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@ -3589,6 +3589,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
carsLoadScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setFromWarehouseId(trunklineAdvanceDetailEntity.getNowWarehouseId());
String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus();
if ("0".equals(packageStatus)) {
//未入库
@ -8881,7 +8882,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//查询包件是否签收
DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
if (!Objects.isNull(distributionParcelListEntity)) {
if (!Objects.isNull(signDistributionParcelListEntity)) {
log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(405, "包件已签收");
}
@ -9051,6 +9052,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
currentStockArticleEntity.setId(null);
currentStockArticleEntity.setWarehouseId(warehouseId);
currentStockArticleEntity.setWarehouse(warehouseName);
currentStockArticleEntity.setGenre(1);
currentStockArticleEntity.setHandQuantity(0);
currentStockArticleEntity.setCompleteSet(1);
currentStockArticleEntity.setStockupStatus("10");
@ -9070,6 +9072,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
currentStockArticleEntity.setId(currentOrderId);
} else {
currentOrderId = currentStockArticleEntity.getId();
currentStockArticleEntity.setGenre(1);
distributionStockArticleClient.updateEntity(currentStockArticleEntity);
}
//判断包件当前仓是否是目的仓
@ -9248,12 +9252,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
currentStockArticleEntity.setTransferQuantity(0);
currentStockArticleEntity.setSigninQuantity(0);
currentStockArticleEntity.setIncomingNum(0);
currentStockArticleEntity.setGenre(1);
currentStockArticleEntity.setAllocation(null);
currentStockArticleEntity.setTrays(null);
currentOrderId = distributionStockArticleClient.addData(currentStockArticleEntity);
currentStockArticleEntity.setId(currentOrderId);
} else {
currentOrderId = currentStockArticleEntity.getId();
stockArticleEntity.setGenre(1);
distributionStockArticleClient.updateEntity(stockArticleEntity);
}
//判断包件当前仓是否是目的仓
@ -9406,6 +9413,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
stockArticleEntity.setId(currentOrderId);
} else {
currentOrderId = stockArticleEntity.getId();
stockArticleEntity.setGenre(1);
distributionStockArticleClient.updateEntity(stockArticleEntity);
}
//判断包件当前仓是否是目的仓
@ -9639,7 +9648,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//查询包件是否签收
DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
if (!Objects.isNull(distributionParcelListEntity)) {
if (!Objects.isNull(signDistributionParcelListEntity)) {
log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(405, "包件已签收");
}
@ -9668,6 +9677,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
.eq("scan_code", orderPackageCode)
.eq("scan_status","1");
TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
// if(Objects.isNull(carsLoadScanEntity)){
// QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper1 = new QueryWrapper<>();
// loadScanQueryWrapper1.eq("load_id", loadId)
// .eq("scan_code", orderPackageCode)
// .eq("scan_status","2")
// .eq("unload_node_id", warehouseId);
// carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
// }
//判断是否有装车扫描记录
if (Objects.isNull(carsLoadScanEntity)) {
//没有装车扫码记录

Loading…
Cancel
Save