From 6c3ae37501d9267277d054941bee00819189985a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 七月 2024 18:09:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 3c0262a..b7f0f13 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -72,8 +72,11 @@
@Value("${mes.slotWidth}")
private Integer slotWidth;
- @Value("${mes.carMaxSize}")
- private Integer carMaxSize;
+ @Value("${mes.inCarMaxSize}")
+ private Integer inCarMaxSize;
+
+ @Value("${mes.outCarMaxSize}")
+ private Integer outCarMaxSize;
@Value("${mes.galssGap}")
private Integer galssGap;
@@ -82,15 +85,15 @@
public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
String d03State = plcParameterObject.getPlcParameter("D03State").getValue();
String d05State = plcParameterObject.getPlcParameter("D05State").getValue();
String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
- log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d02Id鎵弿ID涓猴細{};", d01Id, d02Id);
- if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d02Id)) {
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
@@ -104,8 +107,8 @@
if (StringUtils.isNotBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
}
- if (StringUtils.isNotBlank(d02Id) && !REQUEST_WORD.equals(d05State)) {
- judgeGlassTypeStatus(d02Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
+ if (StringUtils.isNotBlank(d04Id) && !REQUEST_WORD.equals(d05State)) {
+ judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
}
log.info("缁撴潫鎵爜浠诲姟");
// if (flag01 && flag04) {
@@ -146,10 +149,10 @@
}
}
String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID").getValue();
- log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d02Id鎵弿ID涓猴細{};", d01Id, d02Id);
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
//涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
-// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d02Id)) {
+// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
// log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
// return;
// }
@@ -160,7 +163,7 @@
return;
}
Integer lineFirst = lineList.get(0);
- String lineGlassId = lineFirst.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d02Id;
+ String lineGlassId = lineFirst.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d04Id;
//浠呮湁涓�鏉″厛绗﹀悎鍚姩鍚姩鏉′欢
if (lineList.size() == 1) {
//濡傛灉杩涚墖璇锋眰浣嗙幓鐠冧负绌猴紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
@@ -176,22 +179,22 @@
return;
}
//涓ゆ潯鍏堝潎鍙墽琛岃繘鐗囦换鍔★紝鍒ゆ柇涓ゆ潯绾挎槸鍚﹁繘鐗囪姹傛槸鍚﹂兘涓虹┖
- if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d02Id)) {
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
return;
- } else if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d02Id)) {
+ } else if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
// todo:涓や釜閮芥湁杩涚墖鐜荤拑
- if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id) && computeIsRun(Const.A10_OUT_TARGET_POSITION, d02Id)) {
+ if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id) && computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
} else if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id)) {
computeTargetByLine(Const.A09_OUT_TARGET_POSITION);
- } else if (computeIsRun(Const.A10_OUT_TARGET_POSITION, d02Id)) {
+ } else if (computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
computeTargetByLine(Const.A10_OUT_TARGET_POSITION);
} else {
return;
@@ -309,7 +312,7 @@
Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
if (remainWidth >= widthFirst) {
if (remainWidth - widthFirst - galssGap >= widthSecond) {
- if (glassCount <= carMaxSize - 1) {
+ if (glassCount <= inCarMaxSize - 1) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
@@ -421,8 +424,8 @@
String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
for (int i = 1; i <= taskList.size(); i++) {
- s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i).getLine());
- s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport1" + i).getAddress(), (short) taskList.get(i).getTargetSlot());
+ s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getLine());
+ s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getTargetSlot());
}
s7control.writeWord(outLine, (short) 1);
}
@@ -433,7 +436,7 @@
//鎵撹溅鍓╀綑灏哄
Integer remainWidth = carWidth;
for (T e : list) {
- if (bigStorageCageOutTaskList.size() > carMaxSize || e.getWidth() > remainWidth) {
+ if (bigStorageCageOutTaskList.size() > outCarMaxSize || e.getWidth() > remainWidth) {
break;
}
remainWidth = remainWidth - (int) e.getWidth() - galssGap;
--
Gitblit v1.8.0