Browse Source

回库广播

pre-production
汤建军 4 weeks ago
parent
commit
6da28a0d33
  1. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
  4. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
  5. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java

4
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java

@ -112,6 +112,6 @@ public interface IDistributionReservationClient {
* @param nodeFanoutMsg
* @param user
*/
@PostMapping(TOP+"/maintainReservationInfo")
void planRetention(@RequestBody NodeFanoutMsg<ReservationVO> nodeFanoutMsg,@RequestBody BladeUser user);
@PostMapping(TOP+"/planRetention")
void planRetention(@RequestBody NodeFanoutMsg<ReservationVO> nodeFanoutMsg);
}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java

@ -122,8 +122,8 @@ public class DistributionReservationClient implements IDistributionReservationCl
}
@Override
public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
distributionNodeWorkService.planRetention(nodeFanoutMsg,user);
public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg) {
distributionNodeWorkService.planRetention(nodeFanoutMsg);
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java

@ -30,7 +30,7 @@ public interface IDistributionNodeWorkService {
* @param nodeFanoutMsg
* @param user
*/
void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user);
void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg);
/**
* 取消预约

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java

@ -64,7 +64,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
}
@Override
public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg) {
try {
if (distributionProperties.getSendFanoutMsg()) {
rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryRetention.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java

@ -175,7 +175,7 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
redis.setEx(AuthUtil.getTenantId() + ":warehouse:" + warehouseRetentionScan.getWarehouseId() + ":orderPackageCode:" + warehouseRetentionScan.getOrderPackageCode()+ ":retentionSave:",warehouseRetentionScan.getTaskCode(),60L*3L);
distributionSignforClient.updateIsHaveAbnormalPackage(warehouseRetentionScan.getReservationId());
NodeFanoutMsg<ReservationVO> nodeFanoutMsg = buildNodeFanoutMsgByRestention(warehouseRetentionScan.getReservationId(),warehouseRetentionScan);
reservationClient.planRetention(nodeFanoutMsg,AuthUtil.getUser());
reservationClient.planRetention(nodeFanoutMsg);
return R.success("操作成功");
}

Loading…
Cancel
Save