From 95cc083ea58c4db51d0b89184c58ad67bc4f3b12 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 20 三月 2025 15:38:00 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 64 +++++-
src/main/java/com/zy/asrs/entity/TaskWrk.java | 2
src/main/java/com/zy/asrs/entity/BasDevp.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 247 ++++++++++-----------------
src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java | 9
src/main/resources/application-prod.yml | 164 +----------------
src/main/java/com/zy/asrs/task/TaskMastScheduler.java | 2
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 2
src/main/java/com/zy/asrs/entity/param/Result.java | 14
src/main/java/com/zy/core/MainProcess.java | 2
src/main/resources/mapper/BasDevpMapper.xml | 1
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 13 -
src/main/resources/application.yml | 12
13 files changed, 193 insertions(+), 343 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 7003eef..8d8dee4 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -234,6 +234,10 @@
@TableField("sta_err")
private Integer staErr;
+ @ApiModelProperty(value= "寮傚父鐮�")
+ @TableField("sta_err_msg")
+ private String staErrMsg;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 398b222..6ea89df 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -186,7 +186,7 @@
@TableField("origin_start_point")
private String originStartPoint;
- @ApiModelProperty(value = "鍘熷璧风偣")
+ @ApiModelProperty(value = "鍘熷缁堢偣")
@TableField("origin_target_point")
private String originTargetPoint;
diff --git a/src/main/java/com/zy/asrs/entity/param/Result.java b/src/main/java/com/zy/asrs/entity/param/Result.java
index d80d41f..0779f37 100644
--- a/src/main/java/com/zy/asrs/entity/param/Result.java
+++ b/src/main/java/com/zy/asrs/entity/param/Result.java
@@ -4,13 +4,11 @@
@Data
public class Result {
- private Long ShelfUnitId; //鍒嗛厤鐨勮揣浣岻D
- private String Alley; //鍒嗛厤鐨勮揣浣嶆墍灞炲贩閬�
- private Long TaskId; //鍒嗛厤鐨勮揣浣嶆墍灞炰换鍔D
- private String TaskNo; //鍒嗛厤鐨勮揣浣嶆墍灞炰换鍔＄紪鍙�
- private int Row; //鍒嗛厤鐨勮揣浣嶆墍灞炴帓
- private int Floor; //鍒嗛厤鐨勮揣浣嶆墍灞炲眰
- private int Column; //鍒嗛厤鐨勮揣浣嶆墍灞炲垪
+ private Integer taskNo; //鍒嗛厤鐨勮揣浣嶆墍灞炰换鍔＄紪鍙�
+
//绔欎綅缂栧彿 鐢ㄦ埛鏄粠鍝釜鍙ｅ叆鐨�
- private Integer TerminalNo;
+ private String shelfUnitId;
+
+ //鎵樼洏鐮�
+ private String barcode;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
index a0505a5..ca34bf2 100644
--- a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
@@ -1,13 +1,20 @@
package com.zy.asrs.entity.param;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class StorageEscalationParam {
//鎵樼洏鐮�
- private String BoxNo;
+ private String boxNo;
//鎵ц鐘舵�� 0锛氭垚鍔� 1锛氬け璐�
private Integer WCSStatus=0;
//閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛�
private String WCSErrorMessage="";
+
+ //婧愮珯鐐�
+ private Integer wcsSourceStaNo;
+
+ //绌烘澘婊℃澘 1.婊℃澘 2.绌烘澘
+ private Integer wcsIoType;
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 1a70e31..d42c7c2 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
- TaskWrk selectByTaskNo(String taskNo);
+ TaskWrk selectByTaskNo(String taskNo);
TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);
TaskWrk selectByWrkNo(Integer wrkNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index e6eb109..288ec0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -131,38 +131,6 @@
}
Short workNo = staProtocol.getWorkNo();
Short stano = staProtocol.getStaNo();
-
- // 灏哄妫�娴嬪紓甯�
- boolean back = false;
- String errMsg = "";
- if (staProtocol.isFrontErr()) {
- errMsg = "鍓嶈秴闄�";
- back = true;
- }
- if (!back && staProtocol.isBackErr()) {
- errMsg = "鍚庤秴闄�";
- back = true;
- }
- if (!back && staProtocol.isHighErr()) {
- errMsg = "楂樿秴闄�";
- back = true;
- }
- if (!back && staProtocol.isLeftErr()) {
- errMsg = "宸﹁秴闄�";
- back = true;
- }
- if (!back && staProtocol.isRightErr()) {
- errMsg = "鍙宠秴闄�";
- back = true;
- }
- if (!back && staProtocol.isWeightErr()) {
- errMsg = "瓒呴噸";
- back = true;
- }
- if (!back && staProtocol.isBarcodeErr()) {
- errMsg = "鎵爜澶辫触";
- back = true;
- }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -174,25 +142,38 @@
continue;
}
String BoxNo = barcodeThread.getBarcode();
- TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
- if (!Cools.isEmpty(taskWrk1)) {
- log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
- if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- if (Cools.isEmpty(staDesc)) {
- return;
- } else {
- continue;
+ if (BoxNo.equals("00000000")) {
+ storageEscalationParam.setWCSStatus(1);
+ storageEscalationParam.setWCSErrorMessage("娌℃湁鎵埌鐮�");
+ BasDevp basDevp= basDevpService.selectOne(new EntityWrapper<BasDevp>()
+ .eq("dev_no",staProtocol.getSiteId()));
+ if(Cools.isEmpty(basDevp)){
+ log.error("鎵爜澶辫触骞朵笖娌℃湁鎵惧埌璇ョ珯鐐�---"+staProtocol.getSiteId());
+ }else{
+ basDevp.setStaErr(1);//娌℃湁鎵埌鐮�
+ basDevp.setStaErrMsg("娌℃湁鎵埌鐮侊紒");
+ basDevpService.updateById(basDevp);
+ }
+ continue;
+ }else{
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ return;
+ } else {
+ continue;
+ }
}
}
}
- if (back) {
- storageEscalationParam.setWCSStatus(1);
- storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
- }
log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
storageEscalationParam.setBoxNo(BoxNo);
+ storageEscalationParam.setWcsIoType(1);//婊℃澘
+ storageEscalationParam.setWcsSourceStaNo(staProtocol.getSiteId());
String response = "";
Boolean success = false;
try {
@@ -203,84 +184,52 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (back) {
- if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
- staProtocol.setStaNo((short) 105);
- } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
- staProtocol.setStaNo((short) 107);
- } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
- staProtocol.setStaNo((short) 109);
- } else {
- staProtocol.setStaNo((short) 110);
- }
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- } else {
- if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
- Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
- // 鍒涙柊涓�涓叆搴撳伐浣滄。
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
+
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo()+"");
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId());
if (Cools.isEmpty(taskWrk)) {
- taskWrk = createTask1(result, BoxNo);
- if (Cools.isEmpty(taskWrk)) {
- log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
- } else {
- taskWrkService.insert(taskWrk);
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
- staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo", taskWrk.getTaskNo());
- Boolean bool = false;
- try {
- //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(hashMap))
- .build()
- .doPost();
- JSONObject jsonObject1 = JSON.parseObject(response);
-
- if (jsonObject1.get("ReturnStatus").equals(0)) {
- bool = true;
- }
-
- } catch (Exception e) {
-
- }finally {
- apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(hashMap)
- , response
- , bool
- );
- }
- }
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
} else {
-// staProtocol.setWorkNo((short) 9991);
- if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
- staProtocol.setStaNo((short) 105);
- } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
- staProtocol.setStaNo((short) 107);
- } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
- staProtocol.setStaNo((short) 109);
- } else {
- staProtocol.setStaNo((short) 110);
- }
- devpThread.setPakMk(staProtocol.getSiteId(), false);
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ Boolean bool = false;
+ try {
+ //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response);
- } else {
-// staProtocol.setWorkNo((short) 9991);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
+ bool = true;
+ }
+
+ } catch (Exception e) {
+
+ } finally {
+ apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ }
+ }
}
}
} catch (Exception e) {
@@ -423,13 +372,13 @@
continue;
}
- String mbz=taskWrk.getTargetPoint().substring(5);
+ String mbz = taskWrk.getTargetPoint().substring(5);
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("taskNo",taskWrk.getTaskNo());//wms浠诲姟鍙�
- hashMap.put("sourceStaNo",staDetl.getDevNo());//婧愮珯鐐�
- hashMap.put("staNo",Integer.parseInt(mbz)+"");//鐩爣绔�
- hashMap.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+ hashMap.put("taskNo", taskWrk.getTaskNo());//wms浠诲姟鍙�
+ hashMap.put("sourceStaNo", staDetl.getDevNo());//婧愮珯鐐�
+ hashMap.put("staNo", Integer.parseInt(mbz) + "");//鐩爣绔�
+ hashMap.put("locNo", taskWrk.getTargetPoint());//鐩爣搴撲綅
String response = "";
Boolean bool = false;
try {
@@ -442,7 +391,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("code").equals(200)){
+ if (jsonObject.get("code").equals(200)) {
bool = true;
// taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
@@ -452,7 +401,7 @@
taskWrk.setModiUser(9988L);
}
} catch (Exception e) {
- }finally {
+ } finally {
apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟缁橰CS"
, wcsUrl + wcsInboundTaskApplyPath
, null
@@ -521,13 +470,13 @@
break;
}
- String mbz=taskWrk.getTargetPoint().substring(5);
+ String mbz = taskWrk.getTargetPoint().substring(5);
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("taskNo",taskWrk.getTaskNo());//wms浠诲姟鍙�
- hashMap.put("sourceStaNo",staDetl.getDevNo());//婧愮珯鐐�
- hashMap.put("staNo",Integer.parseInt(mbz)+"");//鐩爣绔�
- hashMap.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+ hashMap.put("taskNo", taskWrk.getTaskNo());//wms浠诲姟鍙�
+ hashMap.put("sourceStaNo", staDetl.getDevNo());//婧愮珯鐐�
+ hashMap.put("staNo", Integer.parseInt(mbz) + "");//鐩爣绔�
+ hashMap.put("locNo", taskWrk.getTargetPoint());//鐩爣搴撲綅
String response = "";
Boolean bool = false;
try {
@@ -540,7 +489,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("code").equals(200)){
+ if (jsonObject.get("code").equals(200)) {
bool = true;
// taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
@@ -550,7 +499,7 @@
taskWrk.setModiUser(9988L);
}
} catch (Exception e) {
- }finally {
+ } finally {
apiLogService.save("wcs娲惧彂鍑哄簱浠诲姟缁橰CS"
, wcsUrl + wcsInboundTaskApplyPath
, null
@@ -1140,35 +1089,21 @@
return response;
}
- private TaskWrk createTask1(Result result, String barcode) {
- String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
-
-
+ private TaskWrk createTask1(Result result, String barcode,Integer devNo) {
Date now = new Date();
TaskWrk taskWrk = new TaskWrk();
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
- taskWrk.setTaskNo(result.getTaskNo());//浠诲姟鍙�
- taskWrk.setWrkNo(workNo1);
+// int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(result.getTaskNo()+"");//浠诲姟鍙�
+ taskWrk.setWrkNo(result.getTaskNo());
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
taskWrk.setCreateTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(13);//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
- LocMast locMast = locMastService.selectByLocNo(locNo);
- taskWrk.setCrnNo(locMast.getCrnNo());
- taskWrk.setTargetPoint(locNo);
- taskWrk.setStartPoint("116");
- if (result.getAlley().equals("1")) {
- taskWrk.setCrnNo(1);
- } else {
- taskWrk.setCrnNo(2);
- }
- if (taskWrk.getIoType() == 1) {
- taskWrk.setWrkSts(2);
- if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
- taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
- }
- }
+ taskWrk.setTargetPoint(devNo+"");//绔欑偣缁堢偣
+ taskWrk.setStartPoint(devNo+"");//绔欑偣璧风偣
+ taskWrk.setOriginStartPoint("");//婧愬簱浣�
+ taskWrk.setOriginTargetPoint(result.getShelfUnitId());//鐩爣搴撲綅
return taskWrk;
}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index c3c5024..01eb951 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -53,8 +53,8 @@
private String movePath;
@Value("${wms.inboundTaskApplyPath}")
private String inboundTaskApplyPath;
- @Value("${wms.TaskExecCallback}")
- private String TaskExecCallback;
+ @Value("${wms.taskLeave}")
+ private String taskLeave;
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
@@ -68,18 +68,58 @@
List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().in("wrk_sts", 7,18));
for (TaskWrk taskWrk : taskWrkList) {
TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if(taskWrkLog.getIoType().equals(2)){
- taskWrkLog.setWrkSts(19);
- }else{
+ if(taskWrkLog.getIoType().equals(1)){
taskWrkLog.setWrkSts(8);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }else if(taskWrkLog.getIoType().equals(2)){
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("wrk_no",taskWrk.getWrkNo()));
+ if(basDevp==null){
+ HashMap<Object, Object> headParam = new HashMap<>();
+ String response = "";
+ Boolean bool = false;
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("wcs"+"鍑哄簱鎼浠诲姟涓婃姤wms={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskLeave)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("ReturnStatus").equals(0)){
+ }
+ } catch (Exception e){
+ log.error("wcs鎼鍑哄簱缁檞ms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ }finally {
+ apiLogService.save("wcs鎼鍑哄簱缁檞ms"
+ , wmsUrl + taskLeave
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ taskWrkLog.setWrkSts(19);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+
}
- taskWrkLog.setModiTime(new Date());
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
- }
+
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/TaskMastScheduler.java b/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
index 6dae896..eb5210a 100644
--- a/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
@@ -65,7 +65,7 @@
if (taskWrk.getWrkSts() == 6) {//鍏ュ簱瀹屾垚
headParam.put("Result", 1);
s="鍏ュ簱瀹屾垚";
- taskWrk.setWrkSts(7);//鍏ュ簱浠诲姟杞巻鍙叉。7--銆�8
+ taskWrk.setStatus(7);//鍏ュ簱浠诲姟杞巻鍙叉。6--銆�7
} else if (taskWrk.getWrkSts() == 16) {//鍑哄簱瀹屾垚-寰呮惉绂�
headParam.put("Result", 1);
s="鍑哄簱瀹屾垚-寰呮惉绂�";
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 105d7c9..b4df374 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -50,7 +50,7 @@
// 鍏ュ嚭搴� ===>> 璋冪敤RCS杩涜鍏ュ嚭搴�
mainService.crnIoExecute();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
+// mainService.crnStnToOutStn();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
// mainService.storeFinished();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b50d818..a380bef 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -48,12 +48,7 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);
- add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);add(112);add(113);add(114);
- add(115);add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);add(124);
- add(125);add(1001);add(1002);add(1003);add(1004);
+ add(100);add(200);
}};
/*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
@@ -209,7 +204,7 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.0", (short) (staNoSize*8));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -241,9 +236,9 @@
if (slave.getId() == 1) {
//鏉＄爜
//Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.848.0", (short) 8);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.100.0", (short) 16);
if (result2.IsSuccess) {
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 2; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 828fcb4..226b951 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,165 +1,33 @@
wcs-slave:
devp[0]: #杈撻�佺嚎
id: 1
- ip: 10.10.10.130
+ ip: 10.10.12.100
rack: 0
port: 102
slot: 0
emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
- staNo: 116
+ staNo: 100
+ emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
+ staNo: 200
inSta[0]: #鍏ュ簱鍙�1
- staNo: 116
- backSta: 110
+ staNo: 100
+ backSta: 100
barcode: ${wcs-slave.barcode[0].id}
+ inSta[1]: #鍏ュ簱鍙�2
+ staNo: 200
+ backSta: 200
+ barcode: ${wcs-slave.barcode[1].id}
outSta[0]: #鍑哄簱鍙�1
- staNo: 105
+ staNo: 100
outSta[1]: #鍑哄簱鍙�2
- staNo: 107
- outSta[2]: #鍑哄簱鍙�2
- staNo: 109
- outSta[3]: #鍑哄簱鍙�1
- staNo: 110
+ staNo: 200
barcode[0]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
id: 1
-# crn[0]: #鍫嗗灈鏈�1
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 101
-# row: 2
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# ip: 192.168.1.100
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 100
-# row: 1
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# id: 1
-# slot: 0
-# demo: false
-# crn[1]: #鍫嗗灈鏈�2
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 103
-# row: 5
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# ip: 192.168.1.110
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 102
-# row: 4
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# id: 2
-# slot: 0
-# demo: false
-# barcode[3]: #鏉＄爜鎵弿浠�4
-# port: 51236
-# ip: 10.10.10.52
-# id: 4
-# barcode[2]: #鏉＄爜鎵弿浠�3
-# port: 51236
-# ip: 10.10.10.52
-# id: 3
-#
-# barcode[1]: #鏉＄爜鎵弿浠�2
-# port: 51236
-# ip: 10.10.10.52
-# id: 2
-#
-# devp[0]: #杈撻�佺嚎
-# emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3
-# staNo: 104
-# emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
-# staNo: 102
-# rack: 0
-# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-# staNo: 100
-# ip: 192.168.1.140
-# outSta[4]: #鍑哄簱鍙�5
-# staNo: 104
-# outSta[3]: #鍑哄簱鍙�4
-# staNo: 103
-# outSta[6]: #鍑哄簱鍙�7
-# staNo: 106
-# slot: 0
-# outSta[5]: #鍑哄簱鍙�6
-# staNo: 105
-# outSta[0]: #鍑哄簱鍙�1
-# staNo: 100
-# outSta[2]: #鍑哄簱鍙�3
-# staNo: 102
-# emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4
-# staNo: 106
-# outSta[1]: #鍑哄簱鍙�2
-# staNo: 101
-# inSta[2]:
-# staNo: 104
-# barcode: ${wcs-slave.barcode[2].id}
-# inSta[3]:
-# staNo: 106
-# barcode: ${wcs-slave.barcode[3].id}
-# port: 102
-# outSta[7]: #鍑哄簱鍙�8
-# staNo: 107
-# inSta[0]: #鍏ュ簱鍙�1
-# staNo: 100
-# barcode: ${wcs-slave.barcode[0].id}
-# inSta[1]: #鍏ュ簱鍙�2
-# staNo: 102
-# barcode: ${wcs-slave.barcode[1].id}
-# id: 1
-#
-#
-# crn[2]: #鍫嗗灈鏈�3
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 105
-# row: 9
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# ip: 192.168.1.120
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 104
-# row: 8
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# id: 3
-# slot: 0
-# demo: false
-# crn[3]: #鍫嗗灈鏈�4
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 107
-# row: 12
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# ip: 192.168.1.130
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 106
-# row: 11
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# id: 4
-# slot: 0
-# demo: false
+ barcode[1]: #鏉＄爜鎵弿浠�
+ port: 51236
+ ip: 172.17.91.34
+ id: 2
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d7e1f58..2922d22 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -50,15 +50,17 @@
#url: 10.32.53.195:8080
# WMS绯荤粺ip
# url: 10.210.157.109:8090
- url: 127.0.0.1:2410
+ url: 127.0.0.1:8081
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
#inboundTaskApplyPath: api/InterFace/inboundTaskApply
- inboundTaskApplyPath: api/StereoscopicCallBack/AcceptTaskStatus
+ inboundTaskApplyPath: rpc/pakin/loc/v1
# inboundTaskApplyPath: open/asrs/inboundTaskApply
# 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
- taskStatusFeedbackPath: api/StereoscopicCallBack/TaskExecCallback
- # 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
- TaskExecCallback: api/StereoscopicCallBack/TaskExecFinishedCallback
+ taskStatusFeedbackPath: open/asrs/start/task
+ # 浠诲姟鎼埌鐩殑鍦帮紝WCS鍥炶皟WMS
+ TaskExecCallback: open/asrs/destination/task
+ # 浠诲姟璐х墿绂诲紑鍑哄簱鍙�
+ taskLeave : open/asrs/leave/task
# 绉诲簱鐢宠鎺ュ彛
movePath: api/InterFace/get_InterFace_TestStorage
wcs:
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b9898f2..00a002c 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -46,6 +46,7 @@
<result column="agv_start_place" property="agvStartPlace" />
<result column="agv_target_place" property="agvTargetPlace" />
<result column="sta_err" property="staErr" />
+ <result column="sta_err_msg" property="staErrMsg" />
</resultMap>
--
Gitblit v1.9.1