diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 7bc744434..2504b513f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.factory.comfac.service.impl; +import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -96,6 +97,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private final IFactoryPackageDetailService factoryPackageDetailService; + /** + * 目前推送的基地 + */ + private String [] jidiCanshu ={"双流基地","无锡基地"}; + /** * 处理皮阿诺数据推送到汇通老库 */ @@ -147,7 +153,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setSenderMobile(StringUtil.isBlank(panFactoryOrder.getSenderMobile()) ? "" : panFactoryOrder.getSenderMobile());//发货人电话 可以为空 advanceEntity.setSenderAddress(StringUtil.isBlank(panFactoryOrder.getSenderAddress()) ? "" : panFactoryOrder.getSenderAddress()); //发货地址 可以为空 advanceEntity.setSenderName(StringUtil.isBlank(panFactoryOrder.getSendFactory()) ? "" : panFactoryOrder.getSendFactory()); //发货工厂名称 可以为空 - advanceEntity.setAdministratorsId(1078);// 导入人 + advanceEntity.setAdministratorsId(1093);// 导入人 advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 @@ -221,7 +227,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setServiceNum(StringUtil.isBlank(panFactoryOrder.getServiceNum()) ? "" : panFactoryOrder.getServiceNum());//服务号 advanceDetailEntity.setAdmin("");// - advanceDetailEntity.setAdministratorsId(0);//导入人 + advanceDetailEntity.setAdministratorsId(1126);//导入人 // advanceDetailEntity.setDueDate(0);//交期 advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// @@ -250,7 +256,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { detailProductEntity.setDelivernum(Objects.isNull(panPackageList.getQuantity()) ? 0 : panPackageList.getQuantity()); detailProductEntity.setProducttype(""); detailProductEntity.setBuyTime(""); - detailProductEntity.setAdministratorsId(0); + detailProductEntity.setAdministratorsId(1126); detailProductEntity.setDeleteTime(0); detailProductEntity.setCreateTime(LocalDate.now()); saveList.add(detailProductEntity); @@ -401,9 +407,18 @@ public class AsyncDataServiceImpl implements IAsyncDataService { // 需要从老系统进行订单数据查询 AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode(),carNumber); if (ObjectUtils.isNull(advanceEntity)) { + + + //todo 先阶段值推送老系统的双流和无锡 + if(!ArrayUtil.contains(jidiCanshu,receivingOrderEntity.getCurrentWarehouseName())){ + log.info("推送老系统失败，当前仓库不是双流和无锡，推送失败 {}",receivingOrderEntity.getCurrentWarehouseName()); + continue; + } + + advanceEntity = new AdvanceEntity(); advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号 - advanceEntity.setSiteName(""); // 基地 TODO 需要映射 + advanceEntity.setSiteName(receivingOrderEntity.getCurrentWarehouseName()); // 基地 TODO 需要映射 advanceEntity.setArea(""); // 区域 advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空 advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空 @@ -434,13 +449,19 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setSenderMobile("");//发货人电话 可以为空 advanceEntity.setSenderAddress(""); //发货地址 可以为空 advanceEntity.setSenderName(""); //发货工厂名称 可以为空 - advanceEntity.setAdministratorsId(1078);// 导入人 + advanceEntity.setAdministratorsId(1126);// 导入人 advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCarsNum(receivingOrderEntity.getCarNumber()); advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 // Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); + + + advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射 + + + advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单 advanceEntity.setOldId(0);// advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态：1=正常，2=冻结 @@ -538,7 +559,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号 advanceDetailEntity.setAdmin("");// - advanceDetailEntity.setAdministratorsId(0);//导入人 + advanceDetailEntity.setAdministratorsId(1126);//导入人 advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity); @@ -657,7 +678,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { detailProductEntity.setDelivernum(Objects.isNull(zbPackageInfoEntity.getPlanQty()) ? 0 : zbPackageInfoEntity.getPlanQty()); detailProductEntity.setProducttype(""); detailProductEntity.setBuyTime(""); - detailProductEntity.setAdministratorsId(0); + detailProductEntity.setAdministratorsId(1126); detailProductEntity.setDeleteTime(0); detailProductEntity.setCreateTime(LocalDate.now()); saveList.add(detailProductEntity); @@ -697,7 +718,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { detailProductEntity.setDelivernum(1); detailProductEntity.setProducttype(""); detailProductEntity.setBuyTime(""); - detailProductEntity.setAdministratorsId(0); + detailProductEntity.setAdministratorsId(1126); detailProductEntity.setDeleteTime(0); detailProductEntity.setCreateTime(LocalDate.now()); saveList.add(detailProductEntity); @@ -781,7 +802,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号 advanceDetailEntity.setAdmin("");// - advanceDetailEntity.setAdministratorsId(0);//导入人 + advanceDetailEntity.setAdministratorsId(1126);//导入人 // advanceDetailEntity.setDueDate(0);//交期 advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// @@ -881,8 +902,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setSenderMobile(StringUtil.isBlank(zbReceiptEntity.getSenderMobile()) ? "" : zbReceiptEntity.getSenderMobile());//发货人电话 可以为空 advanceEntity.setSenderAddress(StringUtil.isBlank(zbReceiptEntity.getSenderAddress()) ? "" : zbReceiptEntity.getSenderAddress()); //发货地址 可以为空 advanceEntity.setSenderName(StringUtil.isBlank(zbReceiptEntity.getSenderName()) ? "" : zbReceiptEntity.getSenderName()); //发货工厂名称 可以为空 - // todo 需要运营提供 1080为线上测试环境 - advanceEntity.setAdministratorsId(1080);// 导入人 + // todo 需要运营提供 1080为线上测试环境 1126为正式 + advanceEntity.setAdministratorsId(1126);// 导入人 advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 @@ -1033,7 +1054,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setSenderMobile("");//发货人电话 可以为空 advanceEntity.setSenderAddress(""); //发货地址 可以为空 advanceEntity.setSenderName(""); //发货工厂名称 可以为空 - advanceEntity.setAdministratorsId(1078);// 导入人 + advanceEntity.setAdministratorsId(1094);// 导入人 advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCarsNum(StringUtil.isBlank(mtFactoryOrderMain.getInvoiceOrderCode()) ? "" : mtFactoryOrderMain.getInvoiceOrderCode()); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 @@ -1071,7 +1092,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode());//服务号 advanceDetailEntity.setAdmin("");// - advanceDetailEntity.setAdministratorsId(0);//导入人 + advanceDetailEntity.setAdministratorsId(1094);//导入人 // advanceDetailEntity.setDueDate(0);//交期 advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java index c64cb868e..72d7b38f0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java @@ -63,7 +63,7 @@ public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl longs, String data) { - if(StringUtils.isNotEmpty(data)){ + if(StringUtils.isEmpty(data)){ data = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java index 3349b2c7b..ba01a4883 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java @@ -47,231 +47,246 @@ public class OpSignDataHandler { public void opSignDataHandler(Map map, Message message, Channel channel) throws IOException { // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 log.info("##################opSignDataHandler: 处理欧派收货数据到新系统"); - OpOrderStatusLogEntity opOrderStatusLogEntity = (OpOrderStatusLogEntity) map.get("messageData"); - String args = opOrderStatusLogEntity.getArgs(); - JSONObject jsonObject = JSONObject.parseObject(args); - JSONArray jsonArray = jsonObject.getJSONArray("value"); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject valueObject = jsonArray.getJSONObject(i); - JSONObject outGoingOrder = valueObject.getJSONObject("OutGoingOrder"); - String outGoingOrderCode = outGoingOrder.getString("Code"); - JSONObject store = valueObject.getJSONObject("Store"); - JSONArray packages = valueObject.getJSONArray("Packages"); - String status = outGoingOrder.getString("Status"); - //先查询是否已经有数据存在系统中 - OpOutGoingOrderEntity opOutGoingOrderEntity = opOutGoingOrderService.getEntityByCode(outGoingOrderCode); - Long outGoingOrderId = null; - if(Objects.isNull(opOutGoingOrderEntity)){ - //如果是空则新增 - opOutGoingOrderEntity = new OpOutGoingOrderEntity(); - opOutGoingOrderEntity.setCode(outGoingOrderCode); - if("新建".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(0); - }else if("已调度".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(1); - }else if("已发运".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(2); - }else if("已签收".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(3); - }else if("部分签收".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(4); - }else if("待处理".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(5); - } - JSONObject warehouse = outGoingOrder.getJSONObject("Warehouse"); - if(!Objects.isNull(warehouse)){ - opOutGoingOrderEntity.setWarehouseCode(warehouse.getString("Code")); - opOutGoingOrderEntity.setWarehouseName(warehouse.getString("Name")); - opOutGoingOrderEntity.setWarehouseAddress(warehouse.getString("Address")); - } - JSONObject truck = outGoingOrder.getJSONObject("Truck"); - if(!Objects.isNull(truck)){ - opOutGoingOrderEntity.setTruckPlate(truck.getString("Plate")); - } - opOutGoingOrderEntity.setDeliveryDate(CommonUtil.StringToDateByT(outGoingOrder.getString("DeliveryDate"))); - opOutGoingOrderEntity.setCreator(outGoingOrder.getString("Creator")); - opOutGoingOrderEntity.setCreateTime(CommonUtil.StringToDateByT(outGoingOrder.getString("CreateTime"))); + try { + if (Objects.isNull(map)) { + log.error("##################opSignDataHandler: 处理欧派收货数据到新系统,map为空"); + return; + } + // 获取消息id + String messageId = message.getMessageProperties().getMessageId(); + // 获取消息id + String messageData = new String(message.getBody()); - if (!Objects.isNull(store)) { - JSONObject shop = store.getJSONObject("Shop"); - if(!Objects.isNull(shop)){ - opOutGoingOrderEntity.setShopCode(shop.getString("Code")); - opOutGoingOrderEntity.setShopName(shop.getString("Name")); + OpOrderStatusLogEntity opOrderStatusLogEntity = (OpOrderStatusLogEntity) map.get("messageData"); + String args = opOrderStatusLogEntity.getArgs(); + JSONObject jsonObject = JSONObject.parseObject(args); + JSONArray jsonArray = jsonObject.getJSONArray("value"); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject valueObject = jsonArray.getJSONObject(i); + JSONObject outGoingOrder = valueObject.getJSONObject("OutGoingOrder"); + String outGoingOrderCode = outGoingOrder.getString("Code"); + JSONObject store = valueObject.getJSONObject("Store"); + JSONArray packages = valueObject.getJSONArray("Packages"); + String status = outGoingOrder.getString("Status"); + //先查询是否已经有数据存在系统中 + OpOutGoingOrderEntity opOutGoingOrderEntity = opOutGoingOrderService.getEntityByCode(outGoingOrderCode); + Long outGoingOrderId = null; + if (Objects.isNull(opOutGoingOrderEntity)) { + //如果是空则新增 + opOutGoingOrderEntity = new OpOutGoingOrderEntity(); + opOutGoingOrderEntity.setCode(outGoingOrderCode); + if ("新建".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(0); + } else if ("已调度".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(1); + } else if ("已发运".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(2); + } else if ("已签收".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(3); + } else if ("部分签收".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(4); + } else if ("待处理".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(5); } - opOutGoingOrderEntity.setStoreCode(store.getString("Code")); - opOutGoingOrderEntity.setStoreName(store.getString("Name")); - } - opOutGoingOrderEntity.setSendTime(CommonUtil.StringToDateByT(outGoingOrder.getString("SendTime"))); - opOutGoingOrderService.save(opOutGoingOrderEntity); - outGoingOrderId = opOutGoingOrderEntity.getId(); - }else{ - if("新建".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(0); - }else if("已调度".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(1); - }else if("已发运".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(2); - }else if("已签收".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(3); - }else if("部分签收".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(4); - }else if("待处理".equals(status)){ - opOutGoingOrderEntity.setOutGoingOrderStatus(5); - } - opOutGoingOrderService.updateById(opOutGoingOrderEntity); - outGoingOrderId = opOutGoingOrderEntity.getId(); - } + JSONObject warehouse = outGoingOrder.getJSONObject("Warehouse"); + if (!Objects.isNull(warehouse)) { + opOutGoingOrderEntity.setWarehouseCode(warehouse.getString("Code")); + opOutGoingOrderEntity.setWarehouseName(warehouse.getString("Name")); + opOutGoingOrderEntity.setWarehouseAddress(warehouse.getString("Address")); + } + JSONObject truck = outGoingOrder.getJSONObject("Truck"); + if (!Objects.isNull(truck)) { + opOutGoingOrderEntity.setTruckPlate(truck.getString("Plate")); + } + opOutGoingOrderEntity.setDeliveryDate(CommonUtil.StringToDateByT(outGoingOrder.getString("DeliveryDate"))); + opOutGoingOrderEntity.setCreator(outGoingOrder.getString("Creator")); + opOutGoingOrderEntity.setCreateTime(CommonUtil.StringToDateByT(outGoingOrder.getString("CreateTime"))); - //处理签收单数据 - Long signBillId = null; - String recevierCode = valueObject.getString("Code"); - String SignBillStatus = valueObject.getString("Status"); - OpSignBillEntity signBillEntity = opSignBillService.findEntityByCode(recevierCode); - if(Objects.isNull(signBillEntity)){ - signBillEntity = new OpSignBillEntity(); - signBillEntity.setOutGoingOrderId(outGoingOrderId); - signBillEntity.setCode(recevierCode); - if("新建".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(0); - }else if("已签收".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(1); - }else if("部分签收".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(2); - } - signBillEntity.setSignPerson(valueObject.getString("SignPerson")); - signBillEntity.setSignPhone(valueObject.getString("SignPhone")); - signBillEntity.setSignAddress(valueObject.getString("SignAddress")); - String da =valueObject.getString("SignTime"); - Date signTime = CommonUtil.StringToDateByT(da); - signBillEntity.setSignTime(signTime); - signBillEntity.setRemark(valueObject.getString("Remark")); - signBillEntity.setOutGoingOrderCode(outGoingOrderCode); - signBillEntity.setAgainsendReason(valueObject.getString("AgainsendReason")); - signBillEntity.setDescription(valueObject.getString("Description")); - Boolean isAgainsend = valueObject.getBoolean("IsAgainsend"); - if(isAgainsend){ - signBillEntity.setIsAgainsend(1); - }else{ - signBillEntity.setIsAgainsend(0); - } - signBillEntity.setCreator(valueObject.getString("Creator")); - signBillEntity.setCreateTime(CommonUtil.StringToDateByT(valueObject.getString("CreateTime"))); - signBillEntity.setCustomerRate(valueObject.getBigDecimal("CustomerRate")); - signBillEntity.setCustomerFeedback(valueObject.getString("CustomerFeedback")); - if (!Objects.isNull(store)) { - JSONObject shop = store.getJSONObject("Shop"); - if(!Objects.isNull(shop)){ - signBillEntity.setShopCode(shop.getString("Code")); - signBillEntity.setShopName(shop.getString("Name")); + if (!Objects.isNull(store)) { + JSONObject shop = store.getJSONObject("Shop"); + if (!Objects.isNull(shop)) { + opOutGoingOrderEntity.setShopCode(shop.getString("Code")); + opOutGoingOrderEntity.setShopName(shop.getString("Name")); + } + opOutGoingOrderEntity.setStoreCode(store.getString("Code")); + opOutGoingOrderEntity.setStoreName(store.getString("Name")); } - signBillEntity.setStoreCode(store.getString("Code")); - signBillEntity.setStoreName(store.getString("Name")); - } - signBillEntity.setDriverPhone(valueObject.getString("DriverPhone")); - signBillEntity.setDriverName(valueObject.getString("DriverName")); - signBillEntity.setDeliveryTime(CommonUtil.StringToDateByT(valueObject.getString("DeliveryTime"))); - opSignBillService.save(signBillEntity); - signBillId = signBillEntity.getId(); - }else{ - if("新建".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(0); - }else if("已签收".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(1); - }else if("部分签收".equals(SignBillStatus)){ - signBillEntity.setSignBillStatus(2); + opOutGoingOrderEntity.setSendTime(CommonUtil.StringToDateByT(outGoingOrder.getString("SendTime"))); + opOutGoingOrderService.save(opOutGoingOrderEntity); + outGoingOrderId = opOutGoingOrderEntity.getId(); + } else { + if ("新建".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(0); + } else if ("已调度".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(1); + } else if ("已发运".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(2); + } else if ("已签收".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(3); + } else if ("部分签收".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(4); + } else if ("待处理".equals(status)) { + opOutGoingOrderEntity.setOutGoingOrderStatus(5); + } + opOutGoingOrderService.updateById(opOutGoingOrderEntity); + outGoingOrderId = opOutGoingOrderEntity.getId(); } - opSignBillService.updateById(signBillEntity); - signBillId = signBillEntity.getId(); - } - //存入包件数据 - for (int j = 0; j 订单-->包件 完成保存 handleData(code); - - if (ObjectUtils.isNotNull(code)) { - asyncDataService.handlerOuPaiDataToHt(code); - } +// todo 暂时关闭对老系统的数据推送 需要确认数据的仓库归属后在进行 +// if (ObjectUtils.isNotNull(code)) { +// asyncDataService.handlerOuPaiDataToHt(code); +// } return code; } @@ -189,7 +189,6 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { map.put("messageData", opOrderStatusLogEntity); map.put("createTime", new Date().getTime()); try { - rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map); } catch (Exception e) { log.error("############handlePackageData: {}", e.getMessage()); @@ -200,7 +199,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { } private OpOrderStatusLogEntity sendRequestData(String url, Integer event) { - log.info("#################sendRequestData: 请求地址 url={}", url); +// log.info("#################sendRequestData: 请求地址 url={}", url); String token = buildToken(); // log.info(">>> Authorization token {}",token); @@ -208,7 +207,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute(); String result = httpResponse.body(); - log.info("#################sendRequestData: 返回数据 result={}", result); +// log.info("#################sendRequestData: 返回数据 result={}", result); OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity(); orderStatusLog.setArgs(result); @@ -567,7 +566,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { "&$expand=SendWarehouse($select=Name,Code)" + ")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)"; - log.info(">>> findOurPaiDataByCarNumber url {}", url); +// log.info(">>> findOurPaiDataByCarNumber url {}", url); String token = buildToken(); // log.info(">>> Authorization token {}",token); @@ -575,7 +574,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute(); String result = httpResponse.body(); - log.info(">>> findOurPaiDataByCarNumber result {}", result); +// log.info(">>> findOurPaiDataByCarNumber result {}", result); OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity(); orderStatusLog.setArgs(result); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java index 78773679a..aca532cb5 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java @@ -17,4 +17,5 @@ public class OuPaiProperties { private String uri; + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 76a5aa501..51f708892 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -121,8 +121,16 @@