From f511b31ab0db0c9fa3d242e99a24e784bb6b602e Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 18 三月 2025 16:38:26 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/TaskReportScheduler.java                 |    2 
 src/main/java/com/zy/asrs/controller/TaskWrkController.java             |    2 
 src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java            |    2 
 src/main/java/com/zy/asrs/service/impl/TaskWrkLogReportServiceImpl.java |   12 ++++++
 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java          |    2 
 src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java    |   47 +++++++++++++++++++++++
 src/main/resources/application.yml                                      |    2 
 7 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index e1740ef..53162ec 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -42,7 +42,7 @@
     @Autowired
     private LocMastService locMastService;
 
-    @Value("${wms.TaskExecCallback}")
+    @Value("${wms.taskExecCallback}")
     private String TaskExecCallback;
 
     @Autowired
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index a12b7b1..1fd96aa 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -29,7 +29,7 @@
 
     @Value("${wms.url}")
     private String wmsUrl;
-    @Value("${wms.TaskExecCallback}")
+    @Value("${wms.taskExecCallback}")
     private String TaskExecCallback;
     @Autowired
     private ApiLogService apiLogService;
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogReportServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogReportServiceImpl.java
new file mode 100644
index 0000000..763a744
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogReportServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.TaskWrkReportLog;
+import com.zy.asrs.mapper.TaskWrkReportLogMapper;
+import com.zy.asrs.service.TaskWrkReportLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskWrkLogReportServiceImpl extends ServiceImpl<TaskWrkReportLogMapper, TaskWrkReportLog> implements TaskWrkReportLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java
new file mode 100644
index 0000000..140b30c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.TaskWrkReportMapper;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.utils.CommandUtils;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.protocol.StaProtocol;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Service
+public class TaskWrkReportServiceImpl extends ServiceImpl<TaskWrkReportMapper, TaskWrkReport> implements TaskWrkReportService {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index b2f81cc..94eb972 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -23,7 +23,7 @@
 import java.util.Date;
 
 @Slf4j
-@Service
+@Service("toWmsService")
 public class ToWmsServiceImpl implements ToWmsService {
 
     @Autowired
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 1e31a15..50461f8 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -43,7 +43,7 @@
     @Value("${wms.url}")
     private String wmsUrl;
 
-    @Value("${wms.TaskExecCallback}")
+    @Value("${wms.taskExecCallback}")
     private String TaskExecCallback;
 
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 54814ad..182605f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=czscgkwcs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=glccwcs
     username: sa
     password: sa@123
   mvc:

--
Gitblit v1.9.1