diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 7d5c44bb6..2178439ae 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -47,6 +47,7 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); +// PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index be07a8d89..921c545f8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -104,6 +104,11 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 服务类型 1 商 2 市 3 自 + */ + @ApiModelProperty(value = "服务类型 1 商 2 市 3 自") + private String typeService; /** * 备货区编号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 86fe0ce4a..10227af89 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -51,5 +51,5 @@ public interface DistributionStockupMapper extends BaseMapper exportDistributionStockup(@Param("ew") Wrapper queryWrapper); - IPage pageList(IPage page, DistributionStockupEntity distributionStockupEntity); + IPage pageList(IPage page,@Param("param") DistributionStockupEntity distributionStockupEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index d602de786..be044ebb3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -42,7 +42,7 @@ LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id LEFT JOIN logpm_basicdata_team_group btg ON lds.loader = btg.id - + lds.tenant_id = #{param.tenantId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8a5b5feae..1d446fe04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -23,6 +23,7 @@ import com.logpm.distribution.vo.DistributionStockupVO; import com.logpm.distribution.excel.DistributionStockupExcel; import com.logpm.distribution.mapper.DistributionStockupMapper; import com.logpm.distribution.service.IDistributionStockupService; +import org.springblade.core.secure.utils.AuthUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -80,6 +81,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl pageList(IPage page, Map distributionStockup) { DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class); + distributionStockupEntity.setTenantId(AuthUtil.getTenantId()); return baseMapper.pageList(page,distributionStockupEntity); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index 02712afe2..69a5740d9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -55,7 +55,7 @@ public class DealWithDataHandler { }else{ if(!currentWarehouseId.equals(destinationWarehouseId)){ log.info("##############dealWithDataHandler: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}",currentWarehouseId,destinationWarehouseId); - channel.basicAck(deliveryTag,false); +// channel.basicAck(deliveryTag,false); }else{ //真正的处理需要的数据 panFactoryDataService.handleDataToPlatform(unitNo); @@ -64,7 +64,7 @@ public class DealWithDataHandler { }else{ log.info("##############dealWithDataHandler: 不用处理的状态 status={}",status); - channel.basicAck(deliveryTag,false); +// channel.basicAck(deliveryTag,false); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java index e1d135768..40cfcaf17 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java @@ -17,7 +17,6 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.IOException; import java.util.Map; import java.util.Objects; @@ -43,7 +42,7 @@ public class OpenOrderHandler { private Integer retryCount = 1; @RabbitHandler - public void openOrderStatusHandler(Map map, Message message, Channel channel) throws IOException { + public void openOrderStatusHandler(Map map, Message message, Channel channel) { // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 final long deliveryTag = message.getMessageProperties().getDeliveryTag(); String msg = new String(message.getBody()); @@ -54,7 +53,7 @@ public class OpenOrderHandler { AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); if(Objects.isNull(advanceEntity)){ log.info("##################openOrderStatusHandler: 未找到对应订单 orderNo={}",orderNo); - channel.basicAck(deliveryTag,true); +// channel.basicAck(deliveryTag,true); return; } String type = advanceEntity.getType();//品牌 @@ -63,20 +62,20 @@ public class OpenOrderHandler { switch (type){ case FactoryConstant.PIANO: r = panFactoryDataService.handleData(orderInfoDTO); + int code = r.getCode(); + if(code == 400 || code == 200){ + log.info("##################openOrderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); +// channel.basicAck(deliveryTag,true); + }else{ + throw new CustomerException(code,r.getMsg()); + } break; // case FactoryConstant.MENGT: // r = mtFactoryDataService.handleData(orderInfoDTO); // break; default: log.info("##################openOrderStatusHandler: 未知品牌 type={}",type); - channel.basicAck(deliveryTag,true); - } - int code = r.getCode(); - if(code == 400 || code == 200){ - log.info("##################openOrderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); - channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(code,r.getMsg()); +// channel.basicAck(deliveryTag,true); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java index c91019eb3..889cb5fb9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java @@ -54,7 +54,7 @@ public class OrderStatusHandler { AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); if(Objects.isNull(advanceEntity)){ log.info("##################orderStatusHandler: 未找到对应订单 orderNo={}",orderNo); - channel.basicAck(deliveryTag,true); +// channel.basicAck(deliveryTag,true); return; } String type = advanceEntity.getType();//品牌 @@ -63,19 +63,27 @@ public class OrderStatusHandler { switch (type){ case FactoryConstant.PIANO: r = panFactoryDataService.handleStatusData(orderStatusDTO); + int code = r.getCode(); + if(code == 400 || code == 200){ + log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); +// channel.basicAck(deliveryTag,true); + }else{ + throw new CustomerException(code,r.getMsg()); + } break; case FactoryConstant.MENGT: r = mtFactoryDataService.handleStatusData(orderStatusDTO); + code = r.getCode(); + if(code == 400 || code == 200){ + log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); +// channel.basicAck(deliveryTag,true); + }else{ + throw new CustomerException(code,r.getMsg()); + } break; default: log.info("##################orderStatusHandler: 未知品牌 type={}",type); } - int code = r.getCode(); - if(code == 400 || code == 200){ - log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); - channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(code,r.getMsg()); - } + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java index 4c3237ff4..dd47f083e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java @@ -58,7 +58,7 @@ public class ReceiveInfoHandler { AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode); if(Objects.isNull(advanceEntity)){ log.info("##################receiveInfoHandler: 未找到对应订单 orderCode={}",orderCode); - channel.basicAck(deliveryTag,true); +// channel.basicAck(deliveryTag,true); return; } String type = advanceEntity.getType();//品牌 @@ -70,17 +70,18 @@ public class ReceiveInfoHandler { // break; case FactoryConstant.MENGT: r = mtFactoryDataService.sendReceiveInfo(receiveInfoDTO); + int code = r.getCode(); + if(code == 400 || code == 200){ + log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderCode); + channel.basicAck(deliveryTag,true); + }else{ + throw new CustomerException(code,r.getMsg()); + } break; default: log.info("##################receiveInfoHandler: 未知品牌 type={}",type); - channel.basicAck(deliveryTag,true); - } - int code = r.getCode(); - if(code == 400 || code == 200){ - log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderCode); - channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(code,r.getMsg()); +// channel.basicAck(deliveryTag,true); } + } }