diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java index 07ba2a9bd..177c89910 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java @@ -47,7 +47,6 @@ public class OpReceivingDataHandler { String orderPackageCode = packageJSON.getString("Code"); String receivingTime=null; try{ - receivingTime = packageJSON.getString("CreateTime"); }catch (Exception e){ log.error(e.getMessage()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 8310dee29..638e577b9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -305,9 +305,9 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { receivingOrderEntity.setPlateNum(valueObject.getString("PlateNum")); receivingOrderEntity.setCarNumber(valueObject.getString("CarNumber")); receivingOrderEntity.setCarrierCode(valueObject.getString("CarrierCode")); - receivingOrderEntity.setSendTime(valueObject.getDate("SendTime")); - receivingOrderEntity.setArrivalTime(valueObject.getDate("ArrivalTime")); - receivingOrderEntity.setReceiveTime(valueObject.getDate("ReceiveTime")); + receivingOrderEntity.setSendTime(CommonUtil.StringToDateByT(valueObject.getString("SendTime"))); + receivingOrderEntity.setArrivalTime(CommonUtil.StringToDateByT(valueObject.getString("ArrivalTime"))); + receivingOrderEntity.setReceiveTime(CommonUtil.StringToDateByT(valueObject.getString("ReceiveTime"))); receivingOrderEntity.setReturnNumber(valueObject.getString("ReturnNumber")); receivingOrderEntity.setStatus(0); receivingOrderEntity.setReceiptStatus(0); @@ -407,17 +407,17 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { factoryOrderEntity.setShopReceiver(orderEntity.getString("ShopReceiver")); factoryOrderEntity.setBrandCode(orderEntity.getString("BrandCode")); factoryOrderEntity.setBrandName(orderEntity.getString("BrandName")); - factoryOrderEntity.setFirstShipTime(orderEntity.getDate("FirstShipTime")); - factoryOrderEntity.setMatingShipTime(orderEntity.getDate("MatingShipTime")); - factoryOrderEntity.setFirstReceiveTime(orderEntity.getDate("FirstReceiveTime")); - factoryOrderEntity.setMatingReceiveTime(orderEntity.getDate("MatingReceiveTime")); + factoryOrderEntity.setFirstShipTime(CommonUtil.StringToDateByT(orderEntity.getString("FirstShipTime"))); + factoryOrderEntity.setMatingShipTime(CommonUtil.StringToDateByT(orderEntity.getString("MatingShipTime"))); + factoryOrderEntity.setFirstReceiveTime(CommonUtil.StringToDateByT(orderEntity.getString("FirstReceiveTime"))); + factoryOrderEntity.setMatingReceiveTime(CommonUtil.StringToDateByT(orderEntity.getString("MatingReceiveTime"))); Boolean freeze = orderEntity.getBoolean("Freeze"); if (freeze) { factoryOrderEntity.setFreeze(1); } else { factoryOrderEntity.setFreeze(0); } - factoryOrderEntity.setOutGoingTime(orderEntity.getDate("OutGoingTime")); + factoryOrderEntity.setOutGoingTime(CommonUtil.StringToDateByT(orderEntity.getString("OutGoingTime"))); factoryOrderEntity.setStatus(0); factoryOrderEntity.setReceivingId(receivingId); factoryOrderEntity.setReceiptStatus(0); 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 545cd1d1e..2cffa1d31 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 @@ -56,7 +56,8 @@ public class OpenOrderHandler { continue; } //通过订单自编号去查询该条订单是属于哪个工厂 - AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); + String orderSelfNum =orderNo; + AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum); if(Objects.isNull(advanceEntity)){ log.info("##################openOrderStatusHandler: 未找到对应订单 orderNo={}",orderNo); // 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 d86338751..4526e28a5 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 @@ -48,67 +48,65 @@ public class OrderStatusHandler { @RabbitHandler public void orderStatusHandler(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException { - // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 + // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 final long deliveryTag = message.getMessageProperties().getDeliveryTag(); String msg = new String(message.getBody()); log.info("##################orderStatusHandler: 处理扫码作业数据"); OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData"); - String orderNo = orderStatusDTO.getOrderNo();//订单自编号 + String orderSelfNum = orderStatusDTO.getOrderNo();//订单自编号 //通过订单自编号去查询该条订单是属于哪个工厂 - AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderNo); - if(Objects.isNull(advanceEntity)){ - log.info("##################orderStatusHandler: 未找到对应订单 orderNo={}",orderNo); + AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum); + if (Objects.isNull(advanceEntity)) { + log.info("##################orderStatusHandler: 未找到对应订单 orderNo={}", orderSelfNum); // channel.basicAck(deliveryTag,true); return; } String type = advanceEntity.getType();//品牌 R r = null; - switch (type){ + switch (type) { case FactoryConstant.PIANO: r = panFactoryDataService.handleStatusData(orderStatusDTO); int code = r.getCode(); - if(code == 400 || code == 200){ - log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); + if (code == 400 || code == 200) { + log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); // channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(code,r.getMsg()); + } else { + throw new CustomerException(code, r.getMsg()); } break; case FactoryConstant.MENGT: - try{ + try { r = mtFactoryDataService.handleStatusData(orderStatusDTO); - log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); + log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); - - - }catch (CustomerException rc){ + } catch (CustomerException rc) { rc.printStackTrace(); - if(200!=rc.code||400!=rc.code){ - throw new CustomerException("程序异常，需要重试"); + if (200 != rc.code || 400 != rc.code) { + throw new CustomerException("程序异常，需要重试"); } } code = r.getCode(); - if(code == 400 || code == 200){ - log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); + if (code == 400 || code == 200) { + log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); // channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(code,r.getMsg()); + } else { + throw new CustomerException(code, r.getMsg()); } break; case FactoryConstant.ZHIBANG: - r = zbFactoryDataService.handleStatusData(orderStatusDTO); - int resultCode = r.getCode(); - if(resultCode == 400 || resultCode == 200){ - log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}",orderNo); -// channel.basicAck(deliveryTag,true); - }else{ - throw new CustomerException(resultCode,r.getMsg()); - } +// r = zbFactoryDataService.handleStatusData(orderStatusDTO); +// int resultCode = r.getCode(); +// if (resultCode == 400 || resultCode == 200) { +// log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum); +//// channel.basicAck(deliveryTag,true); +// } else { +// throw new CustomerException(resultCode, r.getMsg()); +// } break; default: - log.info("##################orderStatusHandler: 未知品牌 type={}",type); + log.info("##################orderStatusHandler: 未知品牌 type={}", type); } } 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 c6dc50864..89121acfe 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 @@ -52,12 +52,12 @@ public class ReceiveInfoHandler { String msg = new String(message.getBody()); log.info("##################receiveInfoHandler：处理签收信息数据"); 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)){ - log.info("##################receiveInfoHandler: 未找到对应订单 orderCode={}",orderCode); + log.info("##################receiveInfoHandler: 未找到对应订单 orderSelfNum={}",orderSelfNum); // channel.basicAck(deliveryTag,true); return; } @@ -77,7 +77,7 @@ public class ReceiveInfoHandler { } int code = r.getCode(); if(code == 400 || code == 200){ - log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderCode); + log.info("##################receiveInfoHandler: 该条数据不用处理 orderNo={}",orderSelfNum); // channel.basicAck(deliveryTag,true); }else{ throw new CustomerException(code,r.getMsg()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java index a7a45c475..49da75500 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java @@ -118,7 +118,11 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService { //继续判断是否到达目的仓 String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id //查询destinationWarehouse logiBillNo plantId数据 + log.info("handleStatusData >>> unitNo={}",unitNo); Map supplyData = advanceDetailClient.getSupplyData(unitNo); + if(ObjectUtils.isEmpty(supplyData)){ + return Resp.fail(400, "未查询到该单据信息"); + } String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { log.warn("##############handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index 69dd0cba3..e36a96690 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -125,7 +125,7 @@ public class TestService { public void test3() throws IOException { // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); BufferedReader reader = new BufferedReader(new FileReader("F:\\json.txt")); @@ -151,14 +151,14 @@ public class TestService { String packageStatus = packageJSON.getString("PackageStatus"); String orderPackageCode = packageJSON.getString("Code"); String receivingTime = packageJSON.getString("CreateTime"); - if ("已收货".equals(packageStatus)) { - //真正的处理需要的数据 - try { - panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime); - } catch (Exception e) { - e.printStackTrace(); - } - } +// if ("已收货".equals(packageStatus)) { +// //真正的处理需要的数据 +// try { +// panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } } } }