|
|
|
|
@ -1,7 +1,5 @@ |
|
|
|
|
package com.shkj.wcs.plc; |
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import com.alibaba.fastjson.TypeReference; |
|
|
|
|
import com.shkj.common.constant.RedisConstant; |
|
|
|
|
import com.shkj.common.core.domain.Result; |
|
|
|
|
import com.shkj.common.enums.BusinessType; |
|
|
|
|
@ -15,10 +13,8 @@ import com.shkj.wcs.service.IWcsPlcConnectService; |
|
|
|
|
import com.shkj.wcs.service.IWcsPlcPropertyService; |
|
|
|
|
import com.shkj.wcs.third.rcs.RCSUtil; |
|
|
|
|
import com.shkj.wcs.third.workbinWcs.WCSUtil; |
|
|
|
|
import com.shkj.wcs.third.workbinWcs.dto.WCSQueryAreaStatusBody; |
|
|
|
|
import com.shkj.wcs.third.workbinWcs.dto.WCSQueryTaskStatusBody; |
|
|
|
|
import com.shkj.wcs.third.workbinWcs.dto.WcsIncomingTaskRequestBody; |
|
|
|
|
import com.shkj.wcs.third.workbinWcs.dto.WcsIncomingTrayCheckBody; |
|
|
|
|
import com.shkj.wcs.vo.TaskStatusBody; |
|
|
|
|
import com.shkj.wcs.vo.WcsPlcConnectVo; |
|
|
|
|
import com.shkj.wcs.vo.WcsResponseVo; |
|
|
|
|
@ -80,26 +76,25 @@ public class PlcEventTask { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (WcsPlcConnectVo conn : plcList) { |
|
|
|
|
if (conn.getPlcIp().contains("99.151")) { |
|
|
|
|
plcTask(plcInit.getPlcOperate_dps(), conn, conn.getPointTables()); |
|
|
|
|
if (conn.getPlcIp().contains("155.180")) { |
|
|
|
|
plcTask(plcInit.getPlcOperate_stk(), conn, conn.getPointTables()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (conn.getPlcIp().contains("99.172")) { |
|
|
|
|
plcTask(plcInit.getPlcOperate_dpj(), conn, conn.getPointTables()); |
|
|
|
|
if (conn.getPlcIp().contains("155.170")) { |
|
|
|
|
plcTask(plcInit.getPlcOperate_dps(), conn, conn.getPointTables()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//输送线心跳
|
|
|
|
|
@Scheduled(fixedDelay = 2000) |
|
|
|
|
@Scheduled(fixedDelay = 4000) |
|
|
|
|
public void writePlcheartbeatDps() { |
|
|
|
|
PlcOperate plcOperate = plcInit.getPlcOperate_dps(); |
|
|
|
|
if (plcOperate != null) { |
|
|
|
|
//根据连接的plcId获取属性
|
|
|
|
|
PlcOperate plcOperate = plcInit.getPlcOperate_dps(); |
|
|
|
|
PLCReadAndWrite plcReadAndWrite = new PLCReadAndWrite(); |
|
|
|
|
Map<String, Object> readPointMap = new HashMap<>(); |
|
|
|
|
String heartbeat = "DB5100.0.0"; |
|
|
|
|
String heartbeat = "DB5100"; |
|
|
|
|
readPointMap.put(heartbeat, "Boolean"); |
|
|
|
|
Map<String, Object> pointMap = plcReadAndWrite.readPlcData(plcOperate, JsonUtil.toJSONString(readPointMap)); |
|
|
|
|
|
|
|
|
|
@ -109,28 +104,26 @@ public class PlcEventTask { |
|
|
|
|
if (pointMap.containsKey(heartbeat)) { |
|
|
|
|
heartbeatV = Boolean.valueOf(pointMap.get(heartbeat).toString()); |
|
|
|
|
} |
|
|
|
|
//heartbeatV = (heartbeatV == true) ? false : true;
|
|
|
|
|
heartbeatV = (heartbeatV == true) ? false : true; |
|
|
|
|
Map<String, Object> writeHbMap = new HashMap<>(1); |
|
|
|
|
writeHbMap.put("Boolean", heartbeatV); |
|
|
|
|
Map<String, Object> allHbMap = new HashMap<>(1); |
|
|
|
|
allHbMap.put("DB5110.0.0", writeHbMap); |
|
|
|
|
allHbMap.put(heartbeat, writeHbMap); |
|
|
|
|
Boolean heartType = plcReadAndWrite.execWrite(plcOperate, JsonUtil.toJSONString(allHbMap)); |
|
|
|
|
if (!heartType) { |
|
|
|
|
log.info("dps心跳写入失败，重连服务器"); |
|
|
|
|
plcInit.connect(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//叠盘机心跳
|
|
|
|
|
@Scheduled(fixedDelay = 2000) |
|
|
|
|
//堆垛机心跳
|
|
|
|
|
//@Scheduled(fixedDelay = 4000)
|
|
|
|
|
public void writePlcheartbeatStk() { |
|
|
|
|
//根据连接的plcId获取属性
|
|
|
|
|
PlcOperate plcOperate = plcInit.getPlcOperate_dpj(); |
|
|
|
|
if (plcOperate != null) { |
|
|
|
|
PlcOperate plcOperate = plcInit.getPlcOperate_stk(); |
|
|
|
|
PLCReadAndWrite plcReadAndWrite = new PLCReadAndWrite(); |
|
|
|
|
Map<String, Object> readPointMap = new HashMap<>(); |
|
|
|
|
String heartbeat = "DB5100.0.0"; |
|
|
|
|
String heartbeat = "DB20.0.4"; |
|
|
|
|
readPointMap.put(heartbeat, "Boolean"); |
|
|
|
|
Map<String, Object> pointMap = plcReadAndWrite.readPlcData(plcOperate, JsonUtil.toJSONString(readPointMap)); |
|
|
|
|
|
|
|
|
|
@ -144,14 +137,13 @@ public class PlcEventTask { |
|
|
|
|
Map<String, Object> writeHbMap = new HashMap<>(1); |
|
|
|
|
writeHbMap.put("Boolean", heartbeatV); |
|
|
|
|
Map<String, Object> allHbMap = new HashMap<>(1); |
|
|
|
|
allHbMap.put("DB5110.0.0", writeHbMap); |
|
|
|
|
allHbMap.put(heartbeat, writeHbMap); |
|
|
|
|
Boolean heartType = plcReadAndWrite.execWrite(plcOperate, JsonUtil.toJSONString(allHbMap)); |
|
|
|
|
if (!heartType) { |
|
|
|
|
log.info("stk心跳写入失败，重连服务器"); |
|
|
|
|
plcInit.connect(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void plcTask(PlcOperate plcOperate, WcsPlcConnectVo conn, String pointTables) { |
|
|
|
|
|
|
|
|
|
@ -159,7 +151,7 @@ public class PlcEventTask { |
|
|
|
|
//根据连接的plcId获取属性
|
|
|
|
|
PLCReadAndWrite plcReadAndWrite = new PLCReadAndWrite(); |
|
|
|
|
Map<String, Object> pointMap = plcReadAndWrite.readPlcData(plcOperate, pointTables); |
|
|
|
|
log.info("连接的IP:"+conn.getPlcIp()+":设备："+conn.getConnectName()+" 读取的点位内容："+pointMap); |
|
|
|
|
// log.info("连接的IP:"+conn.getPlcIp()+":设备："+conn.getConnectName()+" 读取的点位内容："+pointMap);
|
|
|
|
|
|
|
|
|
|
List<WcsPlcProperty> propertyList = (List<WcsPlcProperty>) redisTemplate.opsForValue().get(RedisConstant.redisPlcProperty + plcId); |
|
|
|
|
if (propertyList == null || propertyList.size() == 0) { |
|
|
|
|
@ -169,17 +161,13 @@ public class PlcEventTask { |
|
|
|
|
// 设备类型：2输送线 1 堆垛机
|
|
|
|
|
switch (conn.getDevType()) { |
|
|
|
|
//输送线
|
|
|
|
|
case "1": |
|
|
|
|
dpsRealTimeTask(propertyList, pointMap, plcReadAndWrite, plcOperate); |
|
|
|
|
break; |
|
|
|
|
case "2": |
|
|
|
|
dpjRealTimeTask(propertyList, pointMap, plcReadAndWrite, plcOperate); |
|
|
|
|
dpsRealTimeTask(propertyList, pointMap, plcReadAndWrite, plcOperate); |
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
log.info("无匹配的设备类型"); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void dpsRealTimeTask(List<WcsPlcProperty> propertyList, Map<String, Object> pointMap, PLCReadAndWrite plcReadAndWrite, PlcOperate plcOperate) { |
|
|
|
|
@ -240,27 +228,6 @@ public class PlcEventTask { |
|
|
|
|
String retOut = ""; |
|
|
|
|
String retOutVt= ""; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 出口上报 |
|
|
|
|
*/ |
|
|
|
|
//出口上报请求序列号
|
|
|
|
|
String rptOutSeria1 = ""; |
|
|
|
|
|
|
|
|
|
//出口上报条码
|
|
|
|
|
String rptOutBarcod1 = ""; |
|
|
|
|
|
|
|
|
|
//出口上报确认序列号
|
|
|
|
|
String rptOutCfmSeria1 = ""; |
|
|
|
|
String rptOutCfmSeriaVt1 = ""; |
|
|
|
|
|
|
|
|
|
//出口上报条码确认
|
|
|
|
|
String rptOutCfmBarcod1 = ""; |
|
|
|
|
String rptOutCfmBarcodVt1 = ""; |
|
|
|
|
|
|
|
|
|
//出口上报返回信息
|
|
|
|
|
String retOut1 = ""; |
|
|
|
|
String retOutVt1 = ""; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 出入库切换 |
|
|
|
|
*/ |
|
|
|
|
@ -271,7 +238,15 @@ public class PlcEventTask { |
|
|
|
|
String retInOutSwit = ""; |
|
|
|
|
String retInOutSwitVt = ""; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 叠盘机 |
|
|
|
|
*/ |
|
|
|
|
//叠盘机完成
|
|
|
|
|
String stk = ""; |
|
|
|
|
|
|
|
|
|
//叠盘机返回
|
|
|
|
|
String retStk = ""; |
|
|
|
|
String retStkVt = ""; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (WcsPlcProperty plcProperty : propertyList) { |
|
|
|
|
@ -282,88 +257,76 @@ public class PlcEventTask { |
|
|
|
|
} else if (pointType.equals("reqInBarcod")) { |
|
|
|
|
reqInBarcod = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("reqInLength")) { |
|
|
|
|
//外形检测
|
|
|
|
|
reqInLength = plcProperty.getAddress(); |
|
|
|
|
reqInLength = plcProperty.getValueType(); |
|
|
|
|
reqInLength = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("reqInCfmSeria")) { |
|
|
|
|
reqInCfmSeria = plcProperty.getAddress(); |
|
|
|
|
reqInCfmSeriaVt = plcProperty.getValueType(); |
|
|
|
|
reqInCfmSeriaVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("reqInCfmBarcod")) { |
|
|
|
|
reqInCfmBarcod = plcProperty.getAddress(); |
|
|
|
|
reqInCfmBarcodVt = plcProperty.getValueType(); |
|
|
|
|
reqInCfmBarcodVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("reqInDest")) { |
|
|
|
|
reqInDest = plcProperty.getAddress(); |
|
|
|
|
reqInDestVt = plcProperty.getValueType(); |
|
|
|
|
reqInDestVt = plcProperty.getPointType(); |
|
|
|
|
|
|
|
|
|
} else if (pointType.equals("reqEmpty")) { |
|
|
|
|
reqEmpty = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("reqCfm")) { |
|
|
|
|
reqCfm = plcProperty.getAddress(); |
|
|
|
|
reqCfmVt = plcProperty.getValueType(); |
|
|
|
|
reqCfmVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("rptOutSeria")) { |
|
|
|
|
rptOutSeria = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("rptOutBarcod")) { |
|
|
|
|
rptOutBarcod = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("rptOutCfmSeria")) { |
|
|
|
|
rptOutCfmSeria = plcProperty.getAddress(); |
|
|
|
|
rptOutCfmSeriaVt = plcProperty.getValueType(); |
|
|
|
|
rptOutCfmSeriaVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("rptOutCfmBarcod")) { |
|
|
|
|
rptOutCfmBarcod = plcProperty.getAddress(); |
|
|
|
|
rptOutCfmBarcodVt = plcProperty.getValueType(); |
|
|
|
|
rptOutCfmBarcodVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("retOut")) { |
|
|
|
|
retOut = plcProperty.getAddress(); |
|
|
|
|
retOutVt = plcProperty.getValueType(); |
|
|
|
|
retOutVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("inOutSwit")) { |
|
|
|
|
inOutSwit = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("retInOutSwit")) { |
|
|
|
|
retInOutSwit = plcProperty.getAddress(); |
|
|
|
|
retInOutSwitVt = plcProperty.getValueType(); |
|
|
|
|
} else if (pointType.equals("rptOutSeria1")) { |
|
|
|
|
rptOutSeria1 = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("rptOutBarcod1")) { |
|
|
|
|
rptOutBarcod1 = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("rptOutCfmSeria1")) { |
|
|
|
|
rptOutCfmSeria1 = plcProperty.getAddress(); |
|
|
|
|
rptOutCfmSeriaVt1 = plcProperty.getValueType(); |
|
|
|
|
} else if (pointType.equals("rptOutCfmBarcod1")) { |
|
|
|
|
rptOutCfmBarcod1 = plcProperty.getAddress(); |
|
|
|
|
rptOutCfmBarcodVt1 = plcProperty.getValueType(); |
|
|
|
|
} else if (pointType.equals("retOut1")) { |
|
|
|
|
retOut1 = plcProperty.getAddress(); |
|
|
|
|
retOutVt1 = plcProperty.getValueType(); |
|
|
|
|
retInOutSwitVt = plcProperty.getPointType(); |
|
|
|
|
} else if (pointType.equals("stk")) { |
|
|
|
|
stk = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("retStk")) { |
|
|
|
|
retStk = plcProperty.getAddress(); |
|
|
|
|
retStkVt = plcProperty.getPointType(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
//扫码处入库申请
|
|
|
|
|
//&& Boolean.valueOf(pointMap.get(reqInSeria).toString())
|
|
|
|
|
if (pointMap.containsKey(reqInSeria) && !pointMap.get(reqInSeria).equals("0")) { |
|
|
|
|
if (pointMap.containsKey(reqInSeria) && Boolean.valueOf(pointMap.get(reqInSeria).toString())) { |
|
|
|
|
//读取请求序列号内容
|
|
|
|
|
String bCR01SeriaV1 = Objects.toString(pointMap.get(reqInSeria), ""); |
|
|
|
|
Integer bCR01SeriaV = 0; |
|
|
|
|
if(!bCR01SeriaV1.isEmpty()){ |
|
|
|
|
bCR01SeriaV = Integer.parseInt(bCR01SeriaV1.toString()); |
|
|
|
|
} |
|
|
|
|
Integer bCR01SeriaV = (Integer) pointMap.get(reqInSeria); |
|
|
|
|
//读取托盘条码内容
|
|
|
|
|
String barcodeValueOne = Objects.toString(pointMap.get(reqInBarcod), ""); |
|
|
|
|
String s = barcodeValueOne.replaceAll("[^A-Za-z0-9]", ""); |
|
|
|
|
log.info("扫码处入库申请时，读取的条码内容：" + s); |
|
|
|
|
String barcodeValueOne = pointMap.get(reqInBarcod).toString(); |
|
|
|
|
log.info("扫码处入库申请时，读取的条码内容：" + barcodeValueOne); |
|
|
|
|
//根据托盘条码返回正在执行的任务号
|
|
|
|
|
WcsIncomingTrayCheckBody body = new WcsIncomingTrayCheckBody(); |
|
|
|
|
body.setStation("SC-G1-00-00-1001"); |
|
|
|
|
WcsIncomingTaskRequestBody body = new WcsIncomingTaskRequestBody(); |
|
|
|
|
body.setStation(""); |
|
|
|
|
body.setTaskType(TaskTypeEnum.In.getValue()); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.trayCheck.getValue()); |
|
|
|
|
body.setTrayCode(s); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.stockIn.getValue()); |
|
|
|
|
body.setTrayCode(barcodeValueOne); |
|
|
|
|
body.setCreateDt(new Date().toString()); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTrayCheck(body); |
|
|
|
|
//调用agv接口查询库区状态
|
|
|
|
|
Object[] areaStatus = {}; |
|
|
|
|
body.setAreaStatus(areaStatus); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTaskRequest(body); |
|
|
|
|
log.info("扫码处入库申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
Map<String, Object> allMap = new HashMap<>(1); |
|
|
|
|
Map<String, Integer> seriaMap = new HashMap<>(1); |
|
|
|
|
seriaMap.put(reqInCfmSeriaVt,bCR01SeriaV ); |
|
|
|
|
allMap.put(reqInCfmSeria, seriaMap); |
|
|
|
|
|
|
|
|
|
// Map<String, String> barcodMap = new HashMap<>(1);
|
|
|
|
|
// barcodMap.put(reqInCfmBarcod00000Vt, s1);
|
|
|
|
|
// allMap.put(reqInCfmBarcod, barcodMap);
|
|
|
|
|
Map<String, String> barcodMap = new HashMap<>(1); |
|
|
|
|
barcodMap.put(reqInCfmBarcodVt, barcodeValueOne); |
|
|
|
|
allMap.put(reqInCfmBarcod, barcodMap); |
|
|
|
|
//成功直行 失败回退
|
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
Map<String, Integer> destMap = new HashMap<>(1); |
|
|
|
|
@ -371,7 +334,7 @@ public class PlcEventTask { |
|
|
|
|
allMap.put(reqInDest, destMap); |
|
|
|
|
} else { |
|
|
|
|
Map<String, Integer> destMap = new HashMap<>(1); |
|
|
|
|
destMap.put(reqInDestVt, 1); |
|
|
|
|
destMap.put(reqInDestVt, 2); |
|
|
|
|
allMap.put(reqInDest, destMap); |
|
|
|
|
} |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
@ -380,31 +343,14 @@ public class PlcEventTask { |
|
|
|
|
log.info("扫码处入库申请时，写入的命令返回结果："+reqInBoolean.toString()); |
|
|
|
|
} |
|
|
|
|
//空托盘申请
|
|
|
|
|
if (pointMap.containsKey(reqEmpty) && !pointMap.get(reqEmpty).equals("0")) { |
|
|
|
|
if (pointMap.containsKey(reqEmpty) && Boolean.valueOf(pointMap.get(reqEmpty).toString())) { |
|
|
|
|
WcsIncomingTaskRequestBody body = new WcsIncomingTaskRequestBody(); |
|
|
|
|
body.setStation("SC-G1-00-00-1002"); |
|
|
|
|
body.setStation("空托处"); |
|
|
|
|
body.setTaskType(TaskTypeEnum.Out.getValue()); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.stockOut.getValue()); |
|
|
|
|
body.setCreateDt(new Date().toString()); |
|
|
|
|
//调用agv接口查询库区状态
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-A2"); |
|
|
|
|
map1.put("status", 0); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map2 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-B2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map3 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-C2"); |
|
|
|
|
map1.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map4 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-D2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Object[] areaStatus = new Object[] { map1,map2,map3,map4}; |
|
|
|
|
log.info("每个库区的状态:"+Arrays.toString(areaStatus)); |
|
|
|
|
Object[] areaStatus = {}; |
|
|
|
|
body.setAreaStatus(areaStatus); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTaskRequest(body); |
|
|
|
|
log.info("空托申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
@ -412,11 +358,11 @@ public class PlcEventTask { |
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
|
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
reqMap.put(reqCfmVt, 1); |
|
|
|
|
reqMap.put(retOutVt,1); |
|
|
|
|
} else { |
|
|
|
|
reqMap.put(reqCfmVt, 2); |
|
|
|
|
reqMap.put(retOutVt,0); |
|
|
|
|
} |
|
|
|
|
allMap.put(reqCfm, reqMap); |
|
|
|
|
allMap.put(retOut, reqMap); |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
log.info("空托申请时，给输送线写命令数据：{}",allMapJson); |
|
|
|
|
Boolean bCR01Boolean = plcReadAndWrite.execWrite(plcOperate, allMapJson); |
|
|
|
|
@ -424,43 +370,21 @@ public class PlcEventTask { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//实盘出口上报
|
|
|
|
|
if (pointMap.containsKey(rptOutSeria) && !pointMap.get(rptOutSeria).equals("0")) { |
|
|
|
|
if (pointMap.containsKey(rptOutSeria) && Boolean.valueOf(pointMap.get(rptOutSeria).toString())) { |
|
|
|
|
//读取序列号
|
|
|
|
|
String IntegeroutSeria = Objects.toString(pointMap.get(rptOutSeria), ""); |
|
|
|
|
Integer outSeria = 0; |
|
|
|
|
if(!IntegeroutSeria.isEmpty()){ |
|
|
|
|
outSeria = Integer.parseInt(IntegeroutSeria.toString()); |
|
|
|
|
} |
|
|
|
|
Integer outSeria = (Integer) pointMap.get(rptOutSeria); |
|
|
|
|
//读取托盘条码内容
|
|
|
|
|
String barcodeValueOne = Objects.toString(pointMap.get(rptOutBarcod), ""); |
|
|
|
|
String s = barcodeValueOne.replaceAll("[^A-Za-z0-9]", ""); |
|
|
|
|
log.info("实盘出口上报时，读取的条码内容：" + s); |
|
|
|
|
String barcodeValueOne = pointMap.get(rptOutBarcod).toString(); |
|
|
|
|
log.info("实盘出口上报时，读取的条码内容：" + barcodeValueOne); |
|
|
|
|
//调用wz-wcs接口
|
|
|
|
|
WcsIncomingTaskRequestBody body = new WcsIncomingTaskRequestBody(); |
|
|
|
|
body.setStation("SC-G2-00-00-2002"); |
|
|
|
|
body.setStation("出口上报处"); |
|
|
|
|
body.setTaskType(TaskTypeEnum.In.getValue()); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.stockIn.getValue()); |
|
|
|
|
body.setTrayCode(s); |
|
|
|
|
body.setTrayCode(barcodeValueOne); |
|
|
|
|
body.setCreateDt(new Date().toString()); |
|
|
|
|
//调用agv接口查询库区状态
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-A2"); |
|
|
|
|
map1.put("status", 0); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map2 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-B2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map3 = new HashMap<>(); |
|
|
|
|
map3.put("areaInLocation", "SC-C2"); |
|
|
|
|
map3.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map4 = new HashMap<>(); |
|
|
|
|
map4.put("areaInLocation", "SC-D2"); |
|
|
|
|
map4.put("status", 1); |
|
|
|
|
|
|
|
|
|
Object[] areaStatus = new Object[] { map1,map2,map3,map4}; |
|
|
|
|
log.info("每个库区的状态:"+Arrays.toString(areaStatus)); |
|
|
|
|
Object[] areaStatus = {}; |
|
|
|
|
body.setAreaStatus(areaStatus); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTaskRequest(body); |
|
|
|
|
log.info("agv扫码处申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
@ -469,103 +393,35 @@ public class PlcEventTask { |
|
|
|
|
seriaMap.put(rptOutCfmSeriaVt,outSeria ); |
|
|
|
|
allMap.put(rptOutCfmSeria, seriaMap); |
|
|
|
|
|
|
|
|
|
// Map<String, String> barcodMap = new HashMap<>(1);
|
|
|
|
|
// barcodMap.put(rptOutCfmBarcodVt, barcodeValueOne);
|
|
|
|
|
// allMap.put(rptOutCfmBarcod, barcodMap);
|
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
|
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
reqMap.put(retOutVt, 1); |
|
|
|
|
} else { |
|
|
|
|
reqMap.put(retOutVt, 1); |
|
|
|
|
} |
|
|
|
|
allMap.put(retOut, reqMap); |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
log.info("出口上报时，给输送线写命令数据：{}", allMapJson); |
|
|
|
|
Boolean rptOutBoolean = plcReadAndWrite.execWrite(plcOperate, allMapJson); |
|
|
|
|
log.info("出口上报时，写入的命令返回结果：" + rptOutBoolean.toString()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//实盘出口上报
|
|
|
|
|
if (pointMap.containsKey(rptOutSeria1) && !pointMap.get(rptOutSeria1).equals("0")) { |
|
|
|
|
//读取序列号
|
|
|
|
|
String IntegeroutSeria = Objects.toString(pointMap.get(rptOutSeria1), ""); |
|
|
|
|
Integer outSeria = 0; |
|
|
|
|
if(!IntegeroutSeria.isEmpty()){ |
|
|
|
|
outSeria = Integer.parseInt(IntegeroutSeria); |
|
|
|
|
} |
|
|
|
|
//读取托盘条码内容
|
|
|
|
|
String barcodeValueOne = Objects.toString(pointMap.get(rptOutBarcod1), ""); |
|
|
|
|
String s = barcodeValueOne.replaceAll("[^A-Za-z0-9]", ""); |
|
|
|
|
|
|
|
|
|
log.info("实盘出口上报时，读取的条码内容：" + s); |
|
|
|
|
//调用wz-wcs接口
|
|
|
|
|
WcsIncomingTaskRequestBody body = new WcsIncomingTaskRequestBody(); |
|
|
|
|
body.setStation("SC-G2-00-00-2001"); |
|
|
|
|
body.setTaskType(TaskTypeEnum.In.getValue()); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.stockIn.getValue()); |
|
|
|
|
body.setTrayCode(s); |
|
|
|
|
body.setCreateDt(new Date().toString()); |
|
|
|
|
//调用agv接口查询库区状态
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-A2"); |
|
|
|
|
map1.put("status", 0); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map2 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-B2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map3 = new HashMap<>(); |
|
|
|
|
map3.put("areaInLocation", "SC-C2"); |
|
|
|
|
map3.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map4 = new HashMap<>(); |
|
|
|
|
map4.put("areaInLocation", "SC-D2"); |
|
|
|
|
map4.put("status", 1); |
|
|
|
|
|
|
|
|
|
Object[] areaStatus = new Object[] { map1,map2,map3,map4}; |
|
|
|
|
log.info("每个库区的状态:"+Arrays.toString(areaStatus)); |
|
|
|
|
body.setAreaStatus(areaStatus); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTaskRequest(body); |
|
|
|
|
log.info("agv扫码处申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
Map<String, Object> allMap = new HashMap<>(1); |
|
|
|
|
Map<String, Integer> seriaMap = new HashMap<>(1); |
|
|
|
|
seriaMap.put(rptOutCfmSeriaVt1, outSeria); |
|
|
|
|
allMap.put(rptOutCfmSeria1, seriaMap); |
|
|
|
|
|
|
|
|
|
// Map<String, String> barcodMap = new HashMap<>(1);
|
|
|
|
|
// barcodMap.put(rptOutCfmBarcodVt1, s);
|
|
|
|
|
// allMap.put(rptOutCfmBarcod1, barcodMap);
|
|
|
|
|
Map<String, String> barcodMap = new HashMap<>(1); |
|
|
|
|
barcodMap.put(rptOutCfmBarcodVt, barcodeValueOne); |
|
|
|
|
allMap.put(rptOutCfmBarcod, barcodMap); |
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
|
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
reqMap.put(retOutVt1, 1); |
|
|
|
|
reqMap.put(reqCfmVt,1); |
|
|
|
|
} else { |
|
|
|
|
reqMap.put(retOutVt1, 1); |
|
|
|
|
reqMap.put(reqCfmVt,0); |
|
|
|
|
} |
|
|
|
|
allMap.put(retOut1, reqMap); |
|
|
|
|
allMap.put(reqCfm, reqMap); |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
log.info("出口上报时，给输送线写命令数据：{}",allMapJson); |
|
|
|
|
Boolean rptOutBoolean = plcReadAndWrite.execWrite(plcOperate, allMapJson); |
|
|
|
|
log.info("出口上报时，写入的命令返回结果："+rptOutBoolean.toString()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//出入库切换
|
|
|
|
|
if (pointMap.containsKey(inOutSwit) && !pointMap.get(inOutSwit).equals("0")) { |
|
|
|
|
if (pointMap.containsKey(inOutSwit) && Boolean.valueOf(pointMap.get(inOutSwit).toString())) { |
|
|
|
|
WCSQueryTaskStatusBody body = new WCSQueryTaskStatusBody(); |
|
|
|
|
body.setDestination("SC-G1-00-00-1002"); |
|
|
|
|
body.setDestination("出入库切换点位"); |
|
|
|
|
body.setTaskType("1"); |
|
|
|
|
body.setTrayType("2"); |
|
|
|
|
WcsResponseVo<TaskStatusBody> vo = JSON.parseObject( |
|
|
|
|
JSON.toJSONString(wcsUtil.queryTaskStatus(body)), |
|
|
|
|
new TypeReference<WcsResponseVo<TaskStatusBody>>() {} |
|
|
|
|
); |
|
|
|
|
Integer taskCount = vo.getBody().get(0).getTaskCount(); |
|
|
|
|
|
|
|
|
|
WcsResponseVo<TaskStatusBody> vo = wcsUtil.queryTaskStatus(body); |
|
|
|
|
log.info("出入库切换时申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
Map<String, Object> allMap = new HashMap<>(1); |
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
int taskCount = vo.getBody().get(0).getTaskCount(); |
|
|
|
|
if (taskCount == 0){ |
|
|
|
|
reqMap.put(retInOutSwitVt,2); |
|
|
|
|
}else { |
|
|
|
|
@ -581,78 +437,27 @@ public class PlcEventTask { |
|
|
|
|
log.info("出入库切换时，写入的命令返回结果："+inOutSwitBoolean.toString()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("dpsRealTimeTask:" + e.getMessage()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void dpjRealTimeTask(List<WcsPlcProperty> propertyList, Map<String, Object> pointMap, PLCReadAndWrite plcReadAndWrite, PlcOperate plcOperate) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 叠盘机 |
|
|
|
|
*/ |
|
|
|
|
//叠盘机完成
|
|
|
|
|
String dpj = ""; |
|
|
|
|
|
|
|
|
|
//叠盘机返回
|
|
|
|
|
String retDpj = ""; |
|
|
|
|
String retDpjVt = ""; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (WcsPlcProperty plcProperty : propertyList) { |
|
|
|
|
String pointType = plcProperty.getPointType(); |
|
|
|
|
|
|
|
|
|
if (pointType.equals("dpj")) { |
|
|
|
|
dpj = plcProperty.getAddress(); |
|
|
|
|
} else if (pointType.equals("retDpj")) { |
|
|
|
|
retDpj = plcProperty.getAddress(); |
|
|
|
|
retDpjVt = plcProperty.getValueType(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//叠盘机
|
|
|
|
|
if (pointMap.containsKey(dpj) && !pointMap.get(dpj).equals("0")) { |
|
|
|
|
if (pointMap.containsKey(stk) && Boolean.valueOf(pointMap.get(stk).toString())) { |
|
|
|
|
WcsIncomingTaskRequestBody body = new WcsIncomingTaskRequestBody(); |
|
|
|
|
body.setStation("SC-G2-00-00-2003"); |
|
|
|
|
body.setStation("叠盘机点位"); |
|
|
|
|
body.setTaskType(TaskTypeEnum.In.getValue()); |
|
|
|
|
body.setTrayCode("TP4077566601"); |
|
|
|
|
body.setBussinessType(BusinTaskTypeEnum.stockIn.getValue()); |
|
|
|
|
body.setCreateDt(new Date().toString()); |
|
|
|
|
//调用agv接口查询库区状态
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-A2"); |
|
|
|
|
map1.put("status", 0); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map2 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-B2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map3 = new HashMap<>(); |
|
|
|
|
map1.put("areaInLocation", "SC-C2"); |
|
|
|
|
map1.put("status", 1); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map4 = new HashMap<>(); |
|
|
|
|
map2.put("areaInLocation", "SC-D2"); |
|
|
|
|
map2.put("status", 1); |
|
|
|
|
|
|
|
|
|
Object[] areaStatus = new Object[] { map1,map2,map3,map4}; |
|
|
|
|
log.info("每个库区的状态:"+Arrays.toString(areaStatus)); |
|
|
|
|
Object[] areaStatus = {}; |
|
|
|
|
body.setAreaStatus(areaStatus); |
|
|
|
|
WcsResponseVo vo = wcsUtil.wcsIncomingTaskRequest(body); |
|
|
|
|
log.info("叠盘机满入库任务申请WZ-WCS返回：" + vo.getHeader()); |
|
|
|
|
log.info("空托申请wz-wcs返回：" + vo.getHeader()); |
|
|
|
|
Map<String, Object> allMap = new HashMap<>(1); |
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
|
|
|
|
|
if (Result.isOk(vo.getHeader().getMsgCode())) { |
|
|
|
|
reqMap.put(retDpjVt, 1); |
|
|
|
|
reqMap.put(retStkVt,1); |
|
|
|
|
} else { |
|
|
|
|
reqMap.put(retDpjVt, 2); |
|
|
|
|
reqMap.put(retStkVt,0); |
|
|
|
|
} |
|
|
|
|
allMap.put(retDpj, reqMap); |
|
|
|
|
allMap.put(retStk, reqMap); |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
log.info("叠盘机叠满上报时，给输送线写命令数据：{}",allMapJson); |
|
|
|
|
Boolean bCR01Boolean = plcReadAndWrite.execWrite(plcOperate, allMapJson); |
|
|
|
|
@ -666,31 +471,4 @@ public class PlcEventTask { |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 单个的plc写入 |
|
|
|
|
*/ |
|
|
|
|
public Boolean plcExecWrite(Integer stk) { |
|
|
|
|
PLCReadAndWrite plcReadAndWrite = new PLCReadAndWrite(); |
|
|
|
|
List<WcsPlcProperty> propertyList = new ArrayList<>(); |
|
|
|
|
propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(51L); |
|
|
|
|
if (!propertyList.isEmpty()) { |
|
|
|
|
for (WcsPlcProperty wcsPlcProperty : propertyList) { |
|
|
|
|
if (wcsPlcProperty.getPointType().equals("retStk")) { |
|
|
|
|
String valueType = wcsPlcProperty.getValueType(); |
|
|
|
|
String address = wcsPlcProperty.getAddress(); |
|
|
|
|
Map<String, Object> allMap = new HashMap<>(1); |
|
|
|
|
Map<String, Integer> reqMap = new HashMap<>(1); |
|
|
|
|
reqMap.put(valueType, stk); |
|
|
|
|
allMap.put(address, reqMap); |
|
|
|
|
String allMapJson = JsonUtil.toJSONString(allMap); |
|
|
|
|
log.info("叠盘机叠满上报时，给输送线写命令数据：{}", allMapJson); |
|
|
|
|
Boolean bCR01Boolean = plcReadAndWrite.execWrite(plcInit.getPlcOperate_dps(), allMapJson); |
|
|
|
|
log.info("叠盘机叠满上报时，写入的命令返回结果：" + bCR01Boolean.toString()); |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
