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 3a9e553de..2cc2ec573 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 @@ -317,7 +317,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { String status = orderStatusDTO.getStatus(); String unitNo = orderStatusDTO.getUnitNo(); String operationTime = orderStatusDTO.getOperationTime(); - if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) { + // || "7".equals(status) 增加签收状态推送 + if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status); return Resp.fail(400, "当前数据的状态不推送"); } @@ -377,7 +378,14 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { detailObject.put("WarehouseBelong", "oppein"); detailObject.put("Creator", orderStatusDTO.getUsername()); detailObject.put("PackageCode", unitNo); - detailObject.put("Operate", "收货"); + if("4".equals(status)){ + detailObject.put("Operate", "收货"); + }else if("7".equals(status)){ + detailObject.put("Operate", "发货"); + }else{ + log.info(" 该包件的状态不正确 status={} ", status); + return Resp.fail(400, "该包件的状态不正确"); + } // 查询系统的包件对象 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java index 48cef8aa1..d6626b8c7 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java @@ -219,10 +219,8 @@ public class OrderServiceImpl implements IOrderService { declared.setAccessible(true); //抑制java语言访问检查,反射访问private访问权限的属性值 Object valueTemp = declared.get(responseStationOrderInfoVo); // 获取实体类中属性的值 Class t = f.getType(); - logger.info(">>>>>>>>>>>>>>>>> {}",t.getName()); // 基本数据类型 包含String if (t.getName().equals("java.lang.Integer") || t.getName().equals("java.lang.String") ) { - logger.info(">>> fieldName {} valueTemp {}",fieldName,valueTemp); if (!ObjectUtils.isEmpty(valueTemp)) { // 包含下划线 if (fieldName.indexOf("_") != -1) { @@ -239,7 +237,6 @@ public class OrderServiceImpl implements IOrderService { Field field = c.getDeclaredField(fieldName); field.setAccessible(true); //抑制java语言访问检查,反射访问private访问权限的属性值 field.set(stationOrderEntity, value); - logger.info(">>> fieldName {} valueTemp {}",fieldName,value); } } diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 37f463927..274758e79 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -47,6 +47,11 @@ blade-biz-common ${bladex.project.version} + + + org.springblade + blade-starter-metrics + org.springblade blade-starter-tenant