From 3d44c0a168268f5c02311286ad758ca000227d1a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Mon, 6 Nov 2023 19:36:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=8E=A7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=20=20--=202.=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=AC=A7=E6=B4=BE=E7=9A=84=E8=8A=82=E7=82=B9=20=E5=B0=86?=
 =?UTF-8?q?=E6=88=91=E4=BB=AC=E7=AD=BE=E6=94=B6=E4=BD=9C=E4=B8=9A=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E7=BB=99=E6=AC=A7=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oupai/service/impl/OuPaiFactoryServiceImpl.java  | 12 ++++++++++--
 .../factory/snm/service/impl/OrderServiceImpl.java   |  3 ---
 blade-service/pom.xml                                |  5 +++++
 3 files changed, 15 insertions(+), 5 deletions(-)

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<FactoryPackageEntity> 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 @@
             <artifactId>blade-biz-common</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>