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

1.取消志邦的数据推送 和 欧派的老库写入

training
pref_mail@163.com 1 year ago
parent
fbd5464cea
commit
0b9f5dfec9
7 changed files with 55 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
  2. 16
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  3. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java
  4. 30
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java
  5. 8
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java
  6. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java
  7. 18
      blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java

1
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
Unescape View File

@ -47,7 +47,6 @@ public class OpReceivingDataHandler {
String orderPackageCode = packageJSON.getString("Code"); String orderPackageCode = packageJSON.getString("Code");
String receivingTime=null; String receivingTime=null;
try{ try{
receivingTime = packageJSON.getString("CreateTime"); receivingTime = packageJSON.getString("CreateTime");
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage()); log.error(e.getMessage());

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

@ -305,9 +305,9 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
receivingOrderEntity.setPlateNum(valueObject.getString("PlateNum")); receivingOrderEntity.setPlateNum(valueObject.getString("PlateNum"));
receivingOrderEntity.setCarNumber(valueObject.getString("CarNumber")); receivingOrderEntity.setCarNumber(valueObject.getString("CarNumber"));
receivingOrderEntity.setCarrierCode(valueObject.getString("CarrierCode")); receivingOrderEntity.setCarrierCode(valueObject.getString("CarrierCode"));
receivingOrderEntity.setSendTime(valueObject.getDate("SendTime")); receivingOrderEntity.setSendTime(CommonUtil.StringToDateByT(valueObject.getString("SendTime")));
receivingOrderEntity.setArrivalTime(valueObject.getDate("ArrivalTime")); receivingOrderEntity.setArrivalTime(CommonUtil.StringToDateByT(valueObject.getString("ArrivalTime")));
receivingOrderEntity.setReceiveTime(valueObject.getDate("ReceiveTime")); receivingOrderEntity.setReceiveTime(CommonUtil.StringToDateByT(valueObject.getString("ReceiveTime")));
receivingOrderEntity.setReturnNumber(valueObject.getString("ReturnNumber")); receivingOrderEntity.setReturnNumber(valueObject.getString("ReturnNumber"));
receivingOrderEntity.setStatus(0); receivingOrderEntity.setStatus(0);
receivingOrderEntity.setReceiptStatus(0); receivingOrderEntity.setReceiptStatus(0);
@ -407,17 +407,17 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
factoryOrderEntity.setShopReceiver(orderEntity.getString("ShopReceiver")); factoryOrderEntity.setShopReceiver(orderEntity.getString("ShopReceiver"));
factoryOrderEntity.setBrandCode(orderEntity.getString("BrandCode")); factoryOrderEntity.setBrandCode(orderEntity.getString("BrandCode"));
factoryOrderEntity.setBrandName(orderEntity.getString("BrandName")); factoryOrderEntity.setBrandName(orderEntity.getString("BrandName"));
factoryOrderEntity.setFirstShipTime(orderEntity.getDate("FirstShipTime")); factoryOrderEntity.setFirstShipTime(CommonUtil.StringToDateByT(orderEntity.getString("FirstShipTime")));
factoryOrderEntity.setMatingShipTime(orderEntity.getDate("MatingShipTime")); factoryOrderEntity.setMatingShipTime(CommonUtil.StringToDateByT(orderEntity.getString("MatingShipTime")));
factoryOrderEntity.setFirstReceiveTime(orderEntity.getDate("FirstReceiveTime")); factoryOrderEntity.setFirstReceiveTime(CommonUtil.StringToDateByT(orderEntity.getString("FirstReceiveTime")));
factoryOrderEntity.setMatingReceiveTime(orderEntity.getDate("MatingReceiveTime")); factoryOrderEntity.setMatingReceiveTime(CommonUtil.StringToDateByT(orderEntity.getString("MatingReceiveTime")));
Boolean freeze = orderEntity.getBoolean("Freeze"); Boolean freeze = orderEntity.getBoolean("Freeze");
if (freeze) { if (freeze) {
factoryOrderEntity.setFreeze(1); factoryOrderEntity.setFreeze(1);
} else { } else {
factoryOrderEntity.setFreeze(0); factoryOrderEntity.setFreeze(0);
} }
factoryOrderEntity.setOutGoingTime(orderEntity.getDate("OutGoingTime")); factoryOrderEntity.setOutGoingTime(CommonUtil.StringToDateByT(orderEntity.getString("OutGoingTime")));
factoryOrderEntity.setStatus(0); factoryOrderEntity.setStatus(0);
factoryOrderEntity.setReceivingId(receivingId); factoryOrderEntity.setReceivingId(receivingId);
factoryOrderEntity.setReceiptStatus(0); factoryOrderEntity.setReceiptStatus(0);

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java
Unescape View File

@ -56,7 +56,8 @@ public class OpenOrderHandler {
continue; continue;
} }
//通过订单自编号去查询该条订单是属于哪个工厂 //通过订单自编号去查询该条订单是属于哪个工厂
AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); String orderSelfNum =orderNo;
AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum);
if(Objects.isNull(advanceEntity)){ if(Objects.isNull(advanceEntity)){
log.info("##################openOrderStatusHandler: 未找到对应订单 orderNo={}",orderNo); log.info("##################openOrderStatusHandler: 未找到对应订单 orderNo={}",orderNo);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);

30
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java
Unescape View File

@ -53,11 +53,11 @@ public class OrderStatusHandler {
String msg = new String(message.getBody()); String msg = new String(message.getBody());
log.info("##################orderStatusHandler: 处理扫码作业数据"); log.info("##################orderStatusHandler: 处理扫码作业数据");
OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData"); OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData");
String orderNo = orderStatusDTO.getOrderNo();//订单自编号 String orderSelfNum = orderStatusDTO.getOrderNo();//订单自编号
//通过订单自编号去查询该条订单是属于哪个工厂 //通过订单自编号去查询该条订单是属于哪个工厂
AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum);
if (Objects.isNull(advanceEntity)) { if (Objects.isNull(advanceEntity)) {
log.info("##################orderStatusHandler: 未找到对应订单 orderNo={}",orderNo); log.info("##################orderStatusHandler: 未找到对应订单 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
return; return;
} }
@ -69,7 +69,7 @@ public class OrderStatusHandler {
r = panFactoryDataService.handleStatusData(orderStatusDTO); r = panFactoryDataService.handleStatusData(orderStatusDTO);
int code = r.getCode(); int code = r.getCode();
if (code == 400 || code == 200) { if (code == 400 || code == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
} else { } else {
throw new CustomerException(code, r.getMsg()); throw new CustomerException(code, r.getMsg());
@ -79,9 +79,7 @@ public class OrderStatusHandler {
try { try {
r = mtFactoryDataService.handleStatusData(orderStatusDTO); r = mtFactoryDataService.handleStatusData(orderStatusDTO);
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
} catch (CustomerException rc) { } catch (CustomerException rc) {
rc.printStackTrace(); rc.printStackTrace();
@ -91,21 +89,21 @@ public class OrderStatusHandler {
} }
code = r.getCode(); code = r.getCode();
if (code == 400 || code == 200) { if (code == 400 || code == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
} else { } else {
throw new CustomerException(code, r.getMsg()); throw new CustomerException(code, r.getMsg());
} }
break; break;
case FactoryConstant.ZHIBANG: case FactoryConstant.ZHIBANG:
r = zbFactoryDataService.handleStatusData(orderStatusDTO); // r = zbFactoryDataService.handleStatusData(orderStatusDTO);
int resultCode = r.getCode(); // int resultCode = r.getCode();
if(resultCode == 400 || resultCode == 200){ // if (resultCode == 400 || resultCode == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); // log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
// channel.basicAck(deliveryTag,true); //// channel.basicAck(deliveryTag,true);
}else{ // } else {
throw new CustomerException(resultCode,r.getMsg()); // throw new CustomerException(resultCode, r.getMsg());
} // }
break; break;
default: default:
log.info("##################orderStatusHandler: 未知品牌 type={}", type); log.info("##################orderStatusHandler: 未知品牌 type={}", type);

8
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/ReceiveInfoHandler.java
Unescape View File

@ -52,12 +52,12 @@ public class ReceiveInfoHandler {
String msg = new String(message.getBody()); String msg = new String(message.getBody());
log.info("##################receiveInfoHandler：处理签收信息数据"); log.info("##################receiveInfoHandler：处理签收信息数据");
ReceiveInfoDTO receiveInfoDTO = (ReceiveInfoDTO) map.get("messageData"); ReceiveInfoDTO receiveInfoDTO = (ReceiveInfoDTO) map.get("messageData");
String orderCode = receiveInfoDTO.getReceiveBodyList().get(0).getOrderCode(); String orderSelfNum = receiveInfoDTO.getReceiveBodyList().get(0).getOrderCode();
//通过订单自编号去查询该条订单是属于哪个工厂 //通过订单自编号去查询该条订单是属于哪个工厂
AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode); AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum);
if(Objects.isNull(advanceEntity)){ if(Objects.isNull(advanceEntity)){
log.info("##################receiveInfoHandler: 未找到对应订单 orderCode={}",orderCode); log.info("##################receiveInfoHandler: 未找到对应订单 orderSelfNum={}",orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
return; return;
} }
@ -77,7 +77,7 @@ public class ReceiveInfoHandler {
} }
int code = r.getCode(); int code = r.getCode();
if(code == 400 || code == 200){ if(code == 400 || code == 200){
log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderCode); log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderSelfNum);
// channel.basicAck(deliveryTag,true); // channel.basicAck(deliveryTag,true);
}else{ }else{
throw new CustomerException(code,r.getMsg()); throw new CustomerException(code,r.getMsg());

4
blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java
Unescape View File

@ -118,7 +118,11 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService {
//继续判断是否到达目的仓 //继续判断是否到达目的仓
String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
//查询destinationWarehouse logiBillNo plantId数据 //查询destinationWarehouse logiBillNo plantId数据
log.info("handleStatusData >>> unitNo={}",unitNo);
Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo); Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
if(ObjectUtils.isEmpty(supplyData)){
return Resp.fail(400, "未查询到该单据信息");
}
String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
log.warn("##############handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); log.warn("##############handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);

18
blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
Unescape View File

@ -125,7 +125,7 @@ public class TestService {
public void test3() throws IOException { public void test3() throws IOException {
// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
BufferedReader reader = new BufferedReader(new FileReader("F:\\json.txt")); BufferedReader reader = new BufferedReader(new FileReader("F:\\json.txt"));
@ -151,14 +151,14 @@ public class TestService {
String packageStatus = packageJSON.getString("PackageStatus"); String packageStatus = packageJSON.getString("PackageStatus");
String orderPackageCode = packageJSON.getString("Code"); String orderPackageCode = packageJSON.getString("Code");
String receivingTime = packageJSON.getString("CreateTime"); String receivingTime = packageJSON.getString("CreateTime");
if ("已收货".equals(packageStatus)) { // if ("已收货".equals(packageStatus)) {
//真正的处理需要的数据 // //真正的处理需要的数据
try { // try {
panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime); // panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
} }
} }
} }

Write Preview
Loading…
Cancel
Save