diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
index dc5b006..20c8ce0 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -74,7 +74,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
@SneakyThrows
public BaseResponse receiveTaskStatusAcs(JSONObject whereJson) {
- log.info("acs向lms反馈任务状态,请求参数:--------------------------------------" + whereJson.toString());
+ log.info("ACS向WMS反馈任务状态,请求参数:--------------------------------------" + whereJson.toString());
// 任务标识
String task_id = whereJson.getString("task_id");
// acs反馈的任务类型
@@ -112,7 +112,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
}
- log.info("acs向lms反馈任务状态,返回参数:--------------------------------------" + BaseResponse.responseOk().toString());
+ log.info("ACS向WMS反馈任务状态,返回参数:--------------------------------------" + BaseResponse.responseOk().toString());
return BaseResponse.responseOk();
}
@@ -120,7 +120,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
@SneakyThrows
public BaseResponse resultCar(JSONObject whereJson) {
- log.info("acs向lms反馈任务车号,请求参数:--------------------------------------" + whereJson.toString());
+ log.info("ACS向WMS反馈任务车号,请求参数:--------------------------------------" + whereJson.toString());
// 任务标识
String task_id = whereJson.getString("task_id");
// 车号
@@ -144,12 +144,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
lock.unlock();
}
}
+ log.info("ACS向WMS反馈任务车号,返回参数:--------------------------------------" + BaseResponse.responseOk().toString());
return BaseResponse.responseOk();
}
@Override
@Transactional(rollbackFor = Exception.class)
public BaseResponse resultWeigh(JSONObject whereJson) {
+ log.info("ACS向WMS反馈重量,请求参数:--------------------------------------" + whereJson.toString());
+
double weigh_qty = whereJson.getDoubleValue("weigh_qty");
if (ObjectUtil.isEmpty(weigh_qty) || weigh_qty == 0) {
throw new BadRequestException("称重称量不能为空或者0!");
@@ -174,12 +177,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 调用任务类重量反馈方法
AbstractTask task = taskFactory.getTask(taskDao.getConfig_code());
JSONObject resultWeigh = task.resultWeigh(taskDao);
+
+ log.info("ACS向WMS反馈重量,返回参数:--------------------------------------" + BaseResponse.responseOk(resultWeigh).toString());
return BaseResponse.responseOk(resultWeigh);
}
@Override
@Transactional(rollbackFor = Exception.class)
public BaseResponse isPutVehicle(JSONObject whereJson) {
+ log.info("ACS向WMS请求是否可以取放货,请求参数:--------------------------------------" + whereJson.toString());
+
// 查询当前任务
SchBaseTask taskDao = iSchBaseTaskService.getByCode(whereJson.getString("task_code"));
// 查询当前点位
@@ -201,6 +208,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
data.put("is_confirm", IOSConstant.ONE);
+
+ log.info("ACS向WMS请求是否可以取放货,返回参数:--------------------------------------" + BaseResponse.responseOk(data).toString());
return BaseResponse.responseOk(data);
}
}
diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/wms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index 5309e88..0872705 100644
--- a/wms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/wms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -192,7 +192,7 @@ file:
avatarMaxSize: 5
logging:
file:
- path: D:\log\beian\lms
+ path: D:\log\XuGong\wms
config: classpath:logback-spring.xml
# sa-token白名单配置
security:
diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml b/wms/nladmin-system/nlsso-server/src/main/resources/log/AcsToWms.xml
similarity index 84%
rename from wms/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml
rename to wms/nladmin-system/nlsso-server/src/main/resources/log/AcsToWms.xml
index 3d60c0e..bcccbda 100644
--- a/wms/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/resources/log/AcsToWms.xml
@@ -3,10 +3,10 @@
-
+
- ${LOG_HOME}/ErpToWms/%d{yyyy-MM-dd}.%i.log
+ ${LOG_HOME}/AcsToWms/%d{yyyy-MM-dd}.%i.log
15
@@ -22,7 +22,7 @@
-
-
+
+
diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml b/wms/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml
deleted file mode 100644
index 6684b21..0000000
--- a/wms/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
- ${LOG_HOME}/WmsToErp/%d{yyyy-MM-dd}.%i.log
-
- 15
-
- 200MB
-
- 2GB
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
- ${log.charset}
-
-
-
-
-
-
-
-
diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index f51170f..2e590a2 100644
--- a/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -15,9 +15,8 @@ https://juejin.cn/post/6844903775631572999
value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>
-
-
+