From 87f8618e3bb8bcc769884225238fb1d4d02afb43 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 一月 2026 07:51:24 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java | 2 ++
zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java | 3 ++-
zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java | 2 +-
zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java | 2 +-
zy-acs-cv/src/main/resources/application.yml | 3 ++-
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 45 ++++++++++++++++++++++++++++-----------------
6 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java
index 004cf98..5bcea1a 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java
@@ -9,7 +9,7 @@
private String staNo;
- private String seqNum;
+ private String taskNo;
private Boolean conveyable;
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
index 98ba803..209a2be 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
@@ -29,7 +29,7 @@
@Scheduled(cron = "0 0 2 * * ?")
public void autoToLog() {
- List<Job> jobs = jobMapper.listJobByJobSts(5);
+ List<Job> jobs = jobMapper.listJobByJobSts(6);
for (Job job : jobs) {
jobService.saveJobLog(job);
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java
index 4f142ba..daae0d7 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java
@@ -36,4 +36,6 @@
void createTake(Integer mark);
+ void fakeWms(Integer mark);
+
}
\ No newline at end of file
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index 20af2ee..e87c503 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -278,11 +278,7 @@
Job job = jobMapper.getJobByJobNo(staProtocol.getWorkNo());
if (job != null && job.getJobSts() == 4) {
job.setJobSts(5);
- job.setRcsTime(new Date());
jobMapper.updateById(job);
- if (!fakeWms(staProtocol)) {
- throw new CoolException("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getSeqNum() + " - " + job.getSeqNum());
- }
}
}
}
@@ -293,21 +289,36 @@
}
}
- public boolean fakeWms(StaProtocol staProtocol) {
- OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
- openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
- List<TaskDto> taskList = new ArrayList<>();
- TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum("SSX-RK" + staProtocol.getWorkNo());
- taskDto.setOriSta("1007");
- taskDto.setPriority(9527);
- taskList.add(taskDto);
- openBusSubmitParam.setTaskList(taskList);
- return sendTask(openBusSubmitParam, staProtocol);
+
+
+ @Transactional
+ public synchronized void fakeWms(Integer mark) {
+ List<Job> jobs = jobMapper.listJobByJobSts(5);
+ for (Job job : jobs) {
+ OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
+ openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
+ List<TaskDto> taskList = new ArrayList<>();
+ TaskDto taskDto = new TaskDto();
+ taskDto.setSeqNum("SSX-RK" + job.getJobNo());
+ taskDto.setOriSta("1007");
+ taskDto.setPriority(9527);
+ taskList.add(taskDto);
+ openBusSubmitParam.setTaskList(taskList);
+ boolean b = sendTask(openBusSubmitParam);
+ if (b){
+ job.setJobSts(6);
+ job.setRcsTime(new Date());
+ jobMapper.updateById(job);
+ log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛," + job.getSeqNum() + " - " + job.getJobNo());
+ }else {
+ log.info("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getSeqNum() + " - " + job.getJobNo());
+ }
+ }
+
}
@Transactional
- public boolean sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
+ public boolean sendTask(OpenBusSubmitParam openBusSubmitParam) {
String response = "";
try {
response = new HttpHandler.Builder()
@@ -356,7 +367,7 @@
for (StationStatus object : stationStatuses) {
if (object.getStaNo().equals(staNo + "")) {
if (object.getConveyable()) {
- return object.getSeqNum() == null ? System.currentTimeMillis() + "" : object.getSeqNum();
+ return object.getTaskNo();
} else {
log.info("绔欑偣锛歿}鐘舵�佷笉瀵�", staNo);
return null;
diff --git a/zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java b/zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java
index 4393840..3b9e1e2 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java
@@ -61,7 +61,8 @@
// 鍒涘缓浠诲姟
ctuMainService.createTake(50);
-
+ // 妯℃嫙WMS鍏ュ簱娴佺▼
+ ctuMainService.fakeWms(60);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/zy-acs-cv/src/main/resources/application.yml b/zy-acs-cv/src/main/resources/application.yml
index 3554a4f..69e9f8c 100644
--- a/zy-acs-cv/src/main/resources/application.yml
+++ b/zy-acs-cv/src/main/resources/application.yml
@@ -31,7 +31,8 @@
# field-strategy: 0
logging:
- path: /stock/out/cv/logs
+ file:
+ path: /stock/logs
super:
pwd: xltys1995
--
Gitblit v1.9.1