java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

2024年1月8日15:59:43 

1.一键签收时候欧派数据推送
2.机器签收时的欧派数据推送 获取操作人还有点问题
single_db
Diss 1 year ago
parent
37acaf8bef
commit
54ea1445b4
6 changed files with 146 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/feign/IOuPaiFactoryClinet.java
  2. 49
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  3. 90
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  4. 34
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java
  5. 38
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  6. 7
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java

13
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/feign/IOuPaiFactoryClinet.java
Unescape View File

@ -1,14 +1,16 @@
package com.logpm.factory.oupai.feign;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.logpm.factory.comfac.dto.OrderStatusDTO;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.security.NoSuchAlgorithmException;
/*
* logisticsplatform-service
* @Author Diss
@ -20,11 +22,16 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface IOuPaiFactoryClinet {
String API_PREFIX = "/oupai/client";
String TOP = API_PREFIX + "/newSystemHandleStatusData";
String TEST = API_PREFIX + "/test";
String NEWSYSTEMHANDLESTATUSDATASIGNFORONE = API_PREFIX + "/newSystemHandleStatusDataSignforOne";
@PostMapping(TOP)
R newSystemHandleStatusData(@RequestBody OrderStatusDTO orderStatusDTO);
@PostMapping(NEWSYSTEMHANDLESTATUSDATASIGNFORONE)
R newSystemHandleStatusDataSignforOne(@RequestParam String status, // 状态
@RequestParam String unitNo, //包条码
@RequestParam String operationTime, // 签收时间
@RequestParam String username) //签收人
throws NoSuchAlgorithmException, JsonProcessingException;
}

49
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
Unescape View File

@ -46,7 +46,10 @@ import org.springblade.common.constant.stockup.StockupStatusConstant;
import org.springblade.common.constant.stockup.StockupTypeConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
@ -100,6 +103,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
private final IDistrilbutionBillPackageService billPackageService;
private final IDistributionReservationZeroPackageService zeroPackageService;
// private DistributionReservationMapper reservationService;
private final DistributionSignforMapper distributionSignforService;
@Override
@Async
@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
@ -1453,6 +1459,19 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
} catch (Exception e) {
throw new RuntimeException(e);
}
case "欧派":
//推送到欧派
try {
DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = distributionReservationStockarticleService.getOne(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
.eq(DistributionReservationStockarticleEntity::getStockArticleId, distributionParcelListEntity.getStockArticleId()));
DistributionSignforEntity distributionSignfor = distributionSignforService.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime,
distributionSignfor.getSigneeName() );//*签收人*//
log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime,
distributionSignfor.getSigneeName() );
} catch (Exception e) {
throw new RuntimeException(e);
}
break;
//其他.....
}
@ -1465,7 +1484,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
@Async
public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
String brands = "梦天,欧派";//可追加
log.info(">>>>>>>>>>> 签收推送 对象tmy {}", "signingId="+signingId+"warehouseName="+warehouseName+"warehouseId="+warehouseId);
//查询签收信息
DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);
if (Func.isNotEmpty(distributionSignforEntity)) {
@ -1535,21 +1554,23 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) {
// 查询预约单下面的包间信息
log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity);
List<DistributionParcelListEntity> distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity);
for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode());
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>distributionParcelListEntities: {}",distributionParcelListEntities);
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>distributionParcelListEntity: {}",distributionParcelListEntity);
// todo 查询签收信息
orderStatusDTO.setUsername("111");
DistributionSignforEntity distributionSignfor = distributionSignforService.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //单号
orderStatusDTO.setUsername(distributionSignfor.getSigneeName()); //操作人名称
orderStatusDTO.setStatus("7");
// orderStatusDTO.setOperationTime();
orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime()); //时间
System.out.println(orderStatusDTO);
ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO);
}
@ -1570,17 +1591,17 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
}
//TODO 需要测试
/**
* 根据预约单查询预约单下面的订单下面的包件
* 并且状态为已签收的包件
* @param distributionReservationStockarticleEntity
* @return
* @return List<DistributionParcelListEntity>
*/
private List<DistributionParcelListEntity> buildOpByReservationId(DistributionReservationStockarticleEntity distributionReservationStockarticleEntity) {
//
return null;
Long stockArticleId = distributionReservationStockarticleEntity.getStockArticleId();//订单id
List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.getParcelListByStockArticleId(stockArticleId);
return distributionParcelListEntities;
}
@Override

90
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -1051,31 +1051,31 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
//维护配送任务
distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
//TODO 在调用出库接口 通知欧派
DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.getByReservationId(distrilbutionloadingscanDTO.getReservationId());
// Long reservationId = distributionSignfor.getReservationId();
// DistributionSignforEntity distributionSignforEntity1 = distributionSignforMapper.getByReservationId(reservationId);
BladeUser user = AuthUtil.getUser();
OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
orderStatusDTO.setStatus("7");//状态
orderStatusDTO.setOperationTime(simpleDateFormat.format(new Date()));//操作时间
//orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName()); //签收人(名称)
orderStatusDTO.setUsername(user.getUserName()); //签收人(名称)
orderStatusDTO.setUnitNo(distrilbutionloadingscanDTO.getBarcode()); //包条码
orderStatusDTO.setCurrentWarehouse(String.valueOf(myCurrentWarehouse.getWarehouseCode())); //当前仓库ID
DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
Long stockArticleId = parcelListEntity.getStockArticleId();
distributionStockArticle.setId(stockArticleId); // 需要一个stock_article_id` bigint(20) DEFAULT NULL COMMENT '在库订单ID',
DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle));
String brand = distributionStockArticleEntity.getBrand();
Map<String, Object> mapState = new HashMap<>();
mapState.put("orderStatusDTO", orderStatusDTO);
mapState.put("brand", brand);
//TODO 在调用出库接口 通知欧派 准备删除
//
// DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.getByReservationId(distrilbutionloadingscanDTO.getReservationId());
//
//// Long reservationId = distributionSignfor.getReservationId();
//// DistributionSignforEntity distributionSignforEntity1 = distributionSignforMapper.getByReservationId(reservationId);
//
// BladeUser user = AuthUtil.getUser();
// OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
// orderStatusDTO.setStatus("7");//状态
// orderStatusDTO.setOperationTime(simpleDateFormat.format(new Date()));//操作时间
// //orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName()); //签收人(名称)
// orderStatusDTO.setUsername(user.getUserName()); //签收人(名称)
// orderStatusDTO.setUnitNo(distrilbutionloadingscanDTO.getBarcode()); //包条码
// orderStatusDTO.setCurrentWarehouse(String.valueOf(myCurrentWarehouse.getWarehouseCode())); //当前仓库ID
//
// DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
// Long stockArticleId = parcelListEntity.getStockArticleId();
// distributionStockArticle.setId(stockArticleId); // 需要一个stock_article_id` bigint(20) DEFAULT NULL COMMENT '在库订单ID',
// DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle));
// String brand = distributionStockArticleEntity.getBrand();
//
// Map<String, Object> mapState = new HashMap<>();
// mapState.put("orderStatusDTO", orderStatusDTO);
// mapState.put("brand", brand);
// rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, mapState);
return Resp.scanSuccess("签收成功", str);
@ -2707,26 +2707,26 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
}
//TODO 调用出库接口
for (DistributionParcelListEntity distributionParcelListEntity : parcelListEntityList) {
//根据ID获取品牌
DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
distributionStockArticle.setId(distributionParcelListEntity.getStockArticleId());
DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle));
String brand = distributionStockArticleEntity.getBrand(); //获取品牌
OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
orderStatusDTO.setStatus("7");//状态
orderStatusDTO.setOperationTime(simpleDateFormat.format(new Date()));//操作时间
orderStatusDTO.setUsername(user.getUserName()); //签收人(名称)
orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //包条码
orderStatusDTO.setCurrentWarehouse(String.valueOf(distributionParcelListEntity.getWarehouseId())); //当前仓库ID
Map<String, Object> mapState = new HashMap<>();
mapState.put("orderStatusDTO", orderStatusDTO);
mapState.put("brand", brand);
//rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, mapState);
rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING, mapState);
System.out.println("发送消息成功");
}
// for (DistributionParcelListEntity distributionParcelListEntity : parcelListEntityList) {
// //根据ID获取品牌
// DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
// distributionStockArticle.setId(distributionParcelListEntity.getStockArticleId());
// DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle));
// String brand = distributionStockArticleEntity.getBrand(); //获取品牌
//
// OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
// orderStatusDTO.setStatus("7");//状态
// orderStatusDTO.setOperationTime(simpleDateFormat.format(new Date()));//操作时间
// orderStatusDTO.setUsername(user.getUserName()); //签收人(名称)
// orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //包条码
// orderStatusDTO.setCurrentWarehouse(String.valueOf(distributionParcelListEntity.getWarehouseId())); //当前仓库ID
// Map<String, Object> mapState = new HashMap<>();
// mapState.put("orderStatusDTO", orderStatusDTO);
// mapState.put("brand", brand);
// //rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_QUEUE, mapState);
// rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING, mapState);
// System.out.println("发送消息成功");
// }
//维护客户信息状态

34
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/feign/OuPaiFactoryClinet.java
Unescape View File

@ -1,18 +1,23 @@
package com.logpm.factory.oupai.feign;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.logpm.factory.comfac.dto.OrderStatusDTO;
import com.logpm.factory.oupai.service.IOuPaiFactoryService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.RabbitConstant;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -25,6 +30,7 @@ import java.util.Map;
@ApiIgnore
@RestController
@AllArgsConstructor
@Slf4j
public class OuPaiFactoryClinet implements IOuPaiFactoryClinet{
@Autowired
@ -36,22 +42,40 @@ public class OuPaiFactoryClinet implements IOuPaiFactoryClinet{
@PostMapping(TOP)
public R newSystemHandleStatusData(OrderStatusDTO orderStatusDTO) {
Map<String,Object> map = new HashMap();
log.info(">>>>>>> 文员复核 start");
Map<String,Object> map = new HashMap<>();
String json = JSONObject.toJSONString(orderStatusDTO);
map.put("messageData",json);
rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING, map,message -> {
message.getMessageProperties()
.setHeader("x-delay", 5000);
return message;
});
log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
return R.success("");
// return ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO);
}
@Override
public R newSystemHandleStatusDataSignforOne(String status, String unitNo, String operationTime, String username) throws NoSuchAlgorithmException, JsonProcessingException {
log.info(">>>>>>> 签收扫描 start");
Map<String,Object> map = new HashMap<>();
JSONObject jsonObject = new JSONObject();
jsonObject.put("unitNo",unitNo);
jsonObject.put("operationTime",operationTime);
jsonObject.put("status",status);
jsonObject.put("username",username);
map.put("messageData",jsonObject.toJSONString());
rabbitTemplate.convertAndSend(RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_EXCHANGE, RabbitConstant.NEW_SYSTEM_RECEIVE_INFO_ROUTING, map,message -> {
message.getMessageProperties()
.setHeader("x-delay", 5000);
return message;
});
log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
return R.success("");
}
}

38
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -547,6 +547,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
@Override
public R newSystemHandleStatusData(OrderStatusDTO orderStatusDTO) {
log.info("》》》》》》》》》》》》 newSystemHandleStatusData的DTO数据 查看是否到达方法{}", orderStatusDTO);
// 推送数据
String status = orderStatusDTO.getStatus();
String unitNo = orderStatusDTO.getUnitNo();
@ -557,29 +558,30 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
return Resp.fail(400, "当前数据的状态不推送");
}
//继续判断是否到达目的仓
String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
//查询destinationWarehouse logiBillNo plantId数据
log.info("oupai-handleStatusData >>> unitNo={}", unitNo);
R<DistributionParcelListEntity> distributionParcelListEntity = distributionParcelListClient.queryOrderByOrderPackageCode(unitNo);
if (ObjectUtils.isEmpty(distributionParcelListEntity.getData())) {
return Resp.fail(400, "未查询到该单据信息");
}
String destinationWarehouseId = String.valueOf(distributionParcelListEntity.getData().getAcceptWarehouseId());//目的仓id
if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "仓库数据有误");
}
if (!currentWarehouseId.equals(destinationWarehouseId)) {
log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "不是目的仓");
}
//继续判断是否到达目的仓 // 不需要这个字段来判断了
// String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
// //查询destinationWarehouse logiBillNo plantId数据
// log.info("oupai-handleStatusData >>> unitNo={}", unitNo);
// R<DistributionParcelListEntity> distributionParcelListEntity = distributionParcelListClient.queryOrderByOrderPackageCode(unitNo);
// if (ObjectUtils.isEmpty(distributionParcelListEntity.getData())) {
// return Resp.fail(400, "未查询到该单据信息");
// }
// String destinationWarehouseId = String.valueOf(distributionParcelListEntity.getData().getAcceptWarehouseId());//目的仓id
// if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
// log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
// return Resp.fail(400, "仓库数据有误");
// }
//
// if (!currentWarehouseId.equals(destinationWarehouseId)) {
// log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
// return Resp.fail(400, "不是目的仓");
// }
// 查询这个包件对应到新系统的订单
FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo);
if (Objects.isNull(factoryOrder)) {
log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息", orderStatusDTO.getUnitNo());
return Resp.fail(400, "未查询到该单据推送订单信息");
}
// 如何判断这个包间是非干仓配的数据

7
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java
Unescape View File

@ -5,6 +5,7 @@ package com.logpm.factory.receiver;
* @Create 2024/1/4 17:41
*/
import com.alibaba.fastjson.JSON;
import com.logpm.factory.comfac.constant.FactoryConstant;
import com.logpm.factory.comfac.dto.OrderStatusDTO;
import com.logpm.factory.oupai.service.IOuPaiFactoryService;
@ -33,11 +34,15 @@ public class NewSystemReceiveInfoHandler {
@Autowired
private IOuPaiFactoryService ouPaiFactoryService;
@RabbitHandler
public void newSystemReceiveInfoHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException {
// 欧派的订单会进来进行推送
String json = (String) map.get("messageData");
OrderStatusDTO orderStatusDTO = JSON.parseObject(json, OrderStatusDTO.class);
log.info(">>>>>>>>>>>>> {}",json);
log.info("##################receiveInfoHandler：处理签收信息数据 {}",orderStatusDTO);
ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO);
}
}

Write Preview
Loading…
Cancel
Save