From b7e27e0760d7a912de932dc24cb49a5302530355 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 二月 2026 09:30:55 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/asrs/service/JobService.java | 4
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java | 9 +
zy-acs-cv/src/main/java/com/zy/asrs/mapper/JobMapper.java | 4
zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java | 4
zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java | 61 ++++++++++++
zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java | 12 +-
zy-acs-cv/src/main/resources/mapper/JobMapper.xml | 13 ++
zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInRepsonseDto.java | 2
zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StaParam.java | 19 +++
zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StationRequestParam.java | 5 +
zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java | 11 +
zy-acs-cv/src/main/java/com/zy/asrs/service/WmsMainService.java | 4
zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java | 40 +++----
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java | 28 +---
zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInDto.java | 2
zy-acs-cv/src/main/resources/application.yml | 4
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 10 -
zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java | 28 ++---
18 files changed, 172 insertions(+), 88 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java
new file mode 100644
index 0000000..27dd6f1
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java
@@ -0,0 +1,61 @@
+package com.zy.asrs.controller;
+
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.controller.requestParam.StaParam;
+import com.zy.asrs.controller.requestParam.StationRequestParam;
+import com.zy.asrs.controller.responseParam.StationResponseParam;
+import com.zy.asrs.entity.Job;
+import com.zy.asrs.service.JobService;
+import com.zy.common.web.BaseController;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 瀵筩tu绯荤粺鐨勬帴鍙�
+ */
+@Slf4j
+@RestController
+public class WmsController extends BaseController {
+
+
+ @Autowired
+ private JobService jobService;
+
+ /**
+ * 绔欑偣鏌ヨ
+ */
+ @ResponseBody
+ @PostMapping("/station/getTaskNo")
+ public R query(@RequestBody StaParam param) {
+ log.info("鏍规嵁绔欑偣鏌ヨtaskNo锛歿}", param);
+ String staNo = param.getStaNo();
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, param.getDevpId());
+ List<StationResponseParam> list = new ArrayList<>();
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+ StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
+ Integer workNo = staProtocol.getWorkNo();
+ if (workNo != null) {
+ Job jobByJobNo = jobService.getJobByJobNo(workNo);
+ if (jobByJobNo != null) {
+ return R.ok(jobByJobNo.getJobNo());
+ }
+ }
+ return R.ok(list);
+ }
+
+
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StaParam.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StaParam.java
new file mode 100644
index 0000000..7344f06
--- /dev/null
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StaParam.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.controller.requestParam;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class StaParam implements Serializable {
+ /**
+ * 绔欑偣鍒楄〃
+ */
+ private String staNo;
+ /**
+ * 杈撻�佺嚎缂栧彿
+ */
+ private Integer devpId = 1;
+
+}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StationRequestParam.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StationRequestParam.java
index a7fc16f..afff13d 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StationRequestParam.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/requestParam/StationRequestParam.java
@@ -11,6 +11,11 @@
* 绔欑偣鍒楄〃
*/
private List<String> staNos;
+
+ /**
+ * 绔欑偣鍒楄〃
+ */
+ private String staNo;
/**
* 杈撻�佺嚎缂栧彿
*/
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInDto.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInDto.java
index 9861f92..1e8d94a 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInDto.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInDto.java
@@ -13,6 +13,4 @@
private String barcode;
-
-
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInRepsonseDto.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInRepsonseDto.java
index 12b5f9d..85b5e2e 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInRepsonseDto.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/ApplyInRepsonseDto.java
@@ -8,7 +8,7 @@
@Data
public class ApplyInRepsonseDto {
- private String loc;
+ private String locNo;
private String taskNo;
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java b/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
index 8ed03df..8125aef 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
@@ -27,8 +27,14 @@
/**
* 浠诲姟鍙�
*/
- @TableField("task_no")
- private String taskNo;
+ @TableField("out_task_no")
+ private String outTaskNo;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @TableField("in_task_no")
+ private String inTaskNo;
/**
@@ -52,7 +58,6 @@
*/
@TableField("job_no")
private Integer jobNo;
-
/**
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/mapper/JobMapper.java b/zy-acs-cv/src/main/java/com/zy/asrs/mapper/JobMapper.java
index 96e01a3..6ebaa14 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/mapper/JobMapper.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/mapper/JobMapper.java
@@ -13,7 +13,9 @@
public interface JobMapper extends BaseMapper<Job> {
- Job getJobByTaskNo(@Param("seqNum") String seqNum);
+ Job getJobByInTaskNo(@Param("seqNum") String seqNum);
+
+ Job getJobByOutTaskNo(@Param("seqNum") String seqNum);
Job getJobByJobNo(@Param("workNo") Integer workNo);
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/JobService.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/JobService.java
index ebe98d4..2799adb 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/JobService.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/JobService.java
@@ -7,7 +7,9 @@
public interface JobService extends IService<Job> {
- Job getJobBySeqNum(String seqNum);
+ Job getJobByInTaskNo(String seqNum);
+
+ Job getJobByOutTaskNo(String seqNum);
Job getJobByJobNo(Integer jobNo);
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/WmsMainService.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/WmsMainService.java
index ad1f2a9..a360e59 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/WmsMainService.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/WmsMainService.java
@@ -2,7 +2,6 @@
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
-import com.zy.asrs.controller.vo.OpenBusSubmitParam;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔℃帴鍙�
@@ -11,13 +10,12 @@
public interface WmsMainService {
-
/**
* 妫�鏌ョ珯鐐圭姸鎬�
*
* @param applyInDto 绔欑偣缂栧彿
* @return 搴撲綅淇℃伅
*/
- ApplyInRepsonseDto getLocOfWms(ApplyInDto applyInDto);
+ ApplyInRepsonseDto getLocOfWms(ApplyInDto applyInDto);
}
\ 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 8cc721e..977311a 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
@@ -3,11 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.controller.requestParam.StationRequestParam;
-import com.zy.asrs.controller.vo.ApplyInDto;
-import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
import com.zy.asrs.controller.vo.OpenBusSubmitParam;
import com.zy.asrs.controller.vo.StationStatus;
import com.zy.asrs.service.CtuMainService;
@@ -42,11 +39,11 @@
@Value("${ctu.sendTask}")
private String sendTask;
- private String code ="code";
+ private String code = "code";
- private String dataCode ="data";
+ private String dataCode = "data";
- private Integer codeValue =200;
+ private Integer codeValue = 200;
private Integer timeout = 1200;
@@ -121,7 +118,6 @@
}
return null;
}
-
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
index 662ac51..44a8fc2 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
@@ -21,8 +21,13 @@
@Override
- public Job getJobBySeqNum(String seqNum) {
- return baseMapper.getJobByTaskNo(seqNum);
+ public Job getJobByInTaskNo(String seqNum) {
+ return baseMapper.getJobByInTaskNo(seqNum);
+ }
+
+ @Override
+ public Job getJobByOutTaskNo(String seqNum) {
+ return baseMapper.getJobByOutTaskNo(seqNum);
}
@Override
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
index 3622d04..6e325b8 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
@@ -1,15 +1,10 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.exception.CoolException;
-import com.zy.asrs.controller.requestParam.StationRequestParam;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
-import com.zy.asrs.controller.vo.OpenBusSubmitParam;
-import com.zy.asrs.controller.vo.StationStatus;
-import com.zy.asrs.service.CtuMainService;
import com.zy.asrs.service.WmsMainService;
import com.zy.common.utils.HttpHandler;
import lombok.Data;
@@ -18,8 +13,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -33,22 +26,20 @@
public class WmsMainServiceImpl implements WmsMainService {
- @Value("${ctu.url}")
+ @Value("${wms.url}")
private String wmsUrl;
-
- @Value("${ctu.sendTask}")
+ @Value("${wms.apply}")
private String apply;
- private String code ="code";
+ private String code = "code";
- private String dataCode ="data";
+ private String dataCode = "data";
- private Integer codeValue =200;
+ private Integer codeValue = 200;
private Integer timeout = 1200;
-
/**
@@ -70,17 +61,16 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger(code).equals(codeValue)) {
log.info("WMS杩斿洖鏁版嵁锛歿}", response);
- JSONArray data = jsonObject.getJSONArray(dataCode);
- return JSONObject.parseObject(data.toString(), ApplyInRepsonseDto.class);
+ return JSONObject.parseObject(jsonObject.getString(dataCode), ApplyInRepsonseDto.class);
} else {
log.error("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛歿}锛屽搷搴斿唴瀹癸細{}", jsonObject.getInteger(code), response);
- throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
+ //throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
}
} catch (CoolException e) {
log.error("璋冪敤绔欑偣鐘舵�佹帴鍙ｅ紓甯�", e);
- throw e;
+ //throw e;
} catch (Exception e) {
- log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝鏉＄爜缂栧彿锛歿},绔欑偣锛歿}", applyInDto.getBarcode(),applyInDto.getStaNo(), e);
+ log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝鏉＄爜缂栧彿锛歿},绔欑偣锛歿}", applyInDto.getBarcode(), applyInDto.getStaNo(), e);
}
return null;
}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
index 9bcf311..9149f8d 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
@@ -1,19 +1,15 @@
package com.zy.core.operation.handler;
-import com.core.exception.CoolException;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
import com.zy.asrs.entity.Job;
-import com.zy.asrs.service.CtuMainService;
import com.zy.asrs.service.JobService;
import com.zy.asrs.service.WmsMainService;
import com.zy.asrs.service.WrkLastnoService;
-import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ConveyorStateType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
-import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.operation.OperationHandler;
import com.zy.core.properties.CtuOperationConfig;
@@ -23,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Date;
@@ -54,6 +51,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public synchronized void execute(CtuOperationConfig config) {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
@@ -77,24 +75,24 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
if (job != null) {
- ApplyInDto applyInDto=new ApplyInDto();
- applyInDto.setStaNo(inSta.getStaNo()+"");
+ ApplyInDto applyInDto = new ApplyInDto();
+ applyInDto.setStaNo(inSta.getStaNo() + "");
applyInDto.setBarcode(barcodeThread.getBarcode());
//TODO
- ApplyInRepsonseDto locOfWms =new ApplyInRepsonseDto();
- locOfWms.setTaskNo(System.currentTimeMillis()+"");
- locOfWms.setBatchNo(System.currentTimeMillis()+"");
- //ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyInDto);
+// ApplyInRepsonseDto locOfWms =new ApplyInRepsonseDto();
+// locOfWms.setTaskNo(System.currentTimeMillis()+"");
+// locOfWms.setBatchNo(System.currentTimeMillis()+"");
+ ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyInDto);
if (locOfWms != null) {
- job.setLoc(locOfWms.getLoc());
- job.setTaskNo(locOfWms.getTaskNo());
+ job.setLoc(locOfWms.getLocNo());
+ job.setInTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
- job.setStaNo(inSta.getTargetSta()+"");
+ job.setStaNo(inSta.getTargetSta() + "");
job.setJobSts(4);
job.setWmsTime(new Date());
jobService.updateById(job);
- }else {
- log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝{}",applyInDto);
+ } else {
+ log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝{}", applyInDto);
}
}
}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
index 08ccfd6..d8d8395 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
@@ -21,8 +21,6 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.Date;
-
/**
* 鍏ュ簱
*/
@@ -71,27 +69,27 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
//StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
//if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
- Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 4);
- if (job != null) {
- Integer workNo = staProtocol.getWorkNo();
- Integer targetSta = inSta.getTargetSta();
- staProtocol.setWorkNo(0);
- staProtocol.setStaNo(0);
- MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- Thread.sleep(1500L);
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(targetSta);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- if (result) {
- job.setJobSts(5);
- if (!jobService.updateById(job)) {
- throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
- }
- log.info("" + config.getMark() + "鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
+ Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 4);
+ if (job != null) {
+ Integer workNo = staProtocol.getWorkNo();
+ Integer targetSta = inSta.getTargetSta();
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo(0);
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ Thread.sleep(1500L);
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(targetSta);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ if (result) {
+ job.setJobSts(5);
+ if (!jobService.updateById(job)) {
+ throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
- } else {
- // 妯℃嫙鎿嶄綔閫昏緫
+ log.info("" + config.getMark() + "鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
+ } else {
+ // 妯℃嫙鎿嶄綔閫昏緫
+ }
//}
}
}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
index 2da19d4..a9e737e 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
@@ -71,14 +71,14 @@
if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
if (seqNum != null) {
- Job jobBySeqNum = jobService.getJobBySeqNum(seqNum);
+ Job jobBySeqNum = jobService.getJobByOutTaskNo(seqNum);
if (jobBySeqNum == null) {
int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
// 涓嬪彂绉诲姩 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(releaseSta.getTargetSta());
Job job = new Job();
- job.setTaskNo(seqNum);
+ job.setOutTaskNo(seqNum);
job.setJobNo(workNo);
job.setJobSts(2);
if (!jobService.insert(job)) {
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
index 3a54bd2..684b1a4 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
@@ -1,6 +1,5 @@
package com.zy.core.operation.handler;
-import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.controller.vo.OpenBusSubmitParam;
import com.zy.asrs.controller.vo.TaskDto;
@@ -71,24 +70,23 @@
Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
if (job != null && job.getJobSts() == 5) {
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
- openBusSubmitParam.setBatchNo(DateUtils.convert(new Date()));
+ openBusSubmitParam.setBatchNo(job.getBatchNo());
List<TaskDto> taskList = new ArrayList<>();
TaskDto taskDto = new TaskDto();
- taskDto.setTaskNo(job.getTaskNo());
+ taskDto.setTaskNo(job.getInTaskNo());
taskDto.setBatchNo(job.getBatchNo());
taskDto.setOriSta(job.getStaNo());
taskDto.setDestLoc(job.getLoc());
- //TODO
- taskDto.setPriority(9527);
+ taskDto.setPriority(1);
taskList.add(taskDto);
openBusSubmitParam.setTasks(taskList);
if (ctuMainService.sendTask(openBusSubmitParam)) {
job.setJobSts(7);
job.setRcsTime(new Date());
jobService.updateById(job);
- log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛," + job.getTaskNo() + " - " + job.getJobNo());
+ log.info("浠诲姟鍙戦�佺粰RCS鎴愬姛," + job.getInTaskNo() + " - " + job.getJobNo());
} else {
- log.info("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getTaskNo() + " - " + job.getJobNo());
+ log.info("浠诲姟鍙戦�佺粰RCS澶辫触," + job.getInTaskNo() + " - " + job.getJobNo());
}
}
}
diff --git a/zy-acs-cv/src/main/resources/application.yml b/zy-acs-cv/src/main/resources/application.yml
index 013266b..b3daaaf 100644
--- a/zy-acs-cv/src/main/resources/application.yml
+++ b/zy-acs-cv/src/main/resources/application.yml
@@ -16,7 +16,9 @@
mvc:
static-path-pattern: /**
-
+wms:
+ url: 10.10.10.251:8082
+ apply: /rsf-open-api/rcs/api/open/location/allocate
ctu:
url: 10.10.10.200:8088
station: /api/open/station/convey
diff --git a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
index 38f06e4..f0579f0 100644
--- a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
+++ b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
@@ -5,7 +5,8 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.Job">
<id column="id" property="id"/>
- <result column="task_no" property="taskNo"/>
+ <result column="in_task_no" property="inTaskNo"/>
+ <result column="out_task_no" property="outTaskNo"/>
<result column="batch_no" property="batchNo"/>
<result column="loc" property="loc"/>
<result column="sta_no" property="staNo"/>
@@ -23,10 +24,16 @@
<result column="memo" property="memo"/>
</resultMap>
- <select id="getJobByTaskNo" resultMap="BaseResultMap">
+ <select id="getJobByInTaskNo" resultMap="BaseResultMap">
select *
from cv_job
- where task_no = #{seqNum}
+ where in_task_no = #{seqNum}
+ </select>
+
+ <select id="getJobByOutTaskNo" resultMap="BaseResultMap">
+ select *
+ from cv_job
+ where out_task_no = #{seqNum}
</select>
--
Gitblit v1.9.1