From f2e5ff3c97b2ea9b56a1c77f6c5863abb1be1725 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 七月 2024 12:37:48 +0800
Subject: [PATCH] 添加多数据源配置
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 55 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 7042a34..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,25 +72,28 @@
@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;
- @Scheduled(fixedDelay = 5000)
+ // @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID1").getValue();
+ String d01Id = plcParameterObject.getPlcParameter("D01ID").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;
}
@@ -98,27 +101,28 @@
log.info("涓ゆ潯绾垮崸杞珛鍧囧湪鎵ц浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
- Boolean flag01 = Boolean.FALSE;
- Boolean flag04 = Boolean.FALSE;
+// Boolean flag01 = Boolean.FALSE;
+// Boolean flag04 = Boolean.FALSE;
//鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�
- if (StringUtils.isBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
- flag01 = judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
+ if (StringUtils.isNotBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
+ judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
}
- if (StringUtils.isBlank(d02Id) && !REQUEST_WORD.equals(d05State)) {
- flag04 = judgeGlassTypeStatus(d02Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
+ if (StringUtils.isNotBlank(d04Id) && !REQUEST_WORD.equals(d05State)) {
+ judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
}
- if (flag01 && flag04) {
- //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
- Integer startLine = getStartLine();
- //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine);
- } else if (flag01 || flag04) {
- Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine);
- } else {
- log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
- }
+ log.info("缁撴潫鎵爜浠诲姟");
+// if (flag01 && flag04) {
+// //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+// Integer startLine = getStartLine();
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+// computeTargetByLine(startLine);
+// } else if (flag01 || flag04) {
+// Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+// computeTargetByLine(startLine);
+// } else {
+// log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
+// }
}
@Scheduled(fixedDelay = 5000)
@@ -129,15 +133,29 @@
log.info("杩涚墖澶ц溅闈炵┖闂�");
return;
}
- String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID1").getValue();
- log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d02Id鎵弿ID涓猴細{};", d01Id, d02Id);
- ;
- //涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
- if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d02Id)) {
- log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
- return;
+ List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskType, Const.BIG_STORAGE_IN_RUN)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP));
+ if (CollectionUtils.isNotEmpty(feedTaskList)) {
+ if (feedTaskList.size() == 1) {
+ computeTargetByLine(feedTaskList.get(0).getLine());
+ return;
+ } else {
+ //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+ Integer startLine = getStartLine();
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+ computeTargetByLine(startLine);
+ return;
+ }
}
+ String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
+ //涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
+// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
+// log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
+// return;
+// }
//鑾峰彇涓ゆ潯绾垮崸杞珛鏄惁鏈夌幓鐠冿紝涓斾换鍔＄姸鎬侀兘涓�2
List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
if (CollectionUtils.isEmpty(lineList)) {
@@ -145,30 +163,53 @@
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) {
//濡傛灉杩涚墖璇锋眰浣嗙幓鐠冧负绌猴紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
if (StringUtils.isEmpty(lineGlassId)) {
computeTargetByLine(lineFirst);
+ } else {
+ //todo:璁＄畻鎵弿鍒扮殑鐜荤拑鏄惁鍙互瀛樿繘鍗ц浆绔�
+ //鑾峰彇鍗ц浆绔嬪墿浣欏搴�
+ if (computeIsRun(lineFirst, lineGlassId)) {
+ computeTargetByLine(lineFirst);
+ }
}
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(d04Id)) {
+// todo:涓や釜閮芥湁杩涚墖鐜荤拑
+ 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, d04Id)) {
+ computeTargetByLine(Const.A10_OUT_TARGET_POSITION);
+ } else {
+ return;
+ }
+ } else {
+ //锛屾垨鑰呬粎鏈変竴鏉℃湁鐜荤拑
+ //涓�鏉＄嚎涓虹┖锛屼竴鏉＄嚎鏈夎繘鐗囪姹傛湁鐜荤拑
+ int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ //鑾峰彇杩涚墖璇锋眰鐜荤拑涓虹┖鐨勶紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(outLine);
}
- //涓�鏉＄嚎涓虹┖锛屼竴鏉＄嚎鏈夎繘鐗囪姹傛湁鐜荤拑
- int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- //鑾峰彇杩涚墖璇锋眰鐜荤拑涓虹┖鐨勶紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
- computeTargetByLine(outLine);
+
}
- @Scheduled(fixedDelay = 5000)
+ // @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgOutTask() {
List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));
@@ -253,38 +294,42 @@
remainWidth = sitToUpRemainWidth.getWidth();
glassCount = sitToUpRemainWidth.getGlassCount();
}
+
+ Boolean flag = Boolean.TRUE;
//2銆佽幏鍙栧崸杞珛
Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth();
if (edgGlassTaskInfoList.size() == 1) {
if (remainWidth >= widthFirst) {
if (glassCount <= 5) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
- return Boolean.FALSE;
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
- return Boolean.TRUE;
}
+ } else {
+ flag = Boolean.FALSE;
}
} else {
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);
- return Boolean.FALSE;
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
- return Boolean.TRUE;
}
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
}
+ } else {
+ flag = Boolean.FALSE;
}
}
//鍚憄lc鍙戦�佽繘鐗囩‘璁�
- S7object.getinstance().plccontrol.writeWord(mesAddress, (short) 1);
+ if (flag) {
+ S7object.getinstance().plccontrol.writeWord(mesAddress, (short) 1);
+ }
//璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
- return Boolean.TRUE;
+ return flag;
}
/**
@@ -332,7 +377,7 @@
//2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
- return computeIsTemperingTargetByLine(glassInfos, taskList, line) && computeIsTemperingTargetByLine(glassInfos, taskList, line);
+ return computeIsTemperingTargetByLine(glassInfos, taskList, line);
}
/**
@@ -360,7 +405,7 @@
.eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
//4銆佹洿鏂拌繘鐗囦换鍔¤〃锛岀洰鏍囨牸瀛愬強鐘舵�侊紙鐘舵�佹敼涓�2 鐢垫皵鎵埌鑷澶勭悊锛� 閬囧埌闂锛氭棤娉曟壒閲忔洿鏂帮紝鎵归噺鏇存柊鏃犳硶璧版寚瀹氫粠搴�
e.setTargetSlot(bigStorageDTO.getSlot());
- e.setTaskType(Const.BIG_STORAGE_IN_RUN);
+// e.setTaskType(Const.BIG_STORAGE_IN_RUN);
bigStorageCageFeedTaskService.updateById(e);
//5銆佸皢杩涚墖淇℃伅瀛樺叆澶х悊鐗囩璇︽儏琛�
@@ -368,7 +413,6 @@
cageDetails.setState(Const.GLASS_STATE_IN);
bigStorageCageDetailsService.save(cageDetails);
}
- //todo:鎸夌収杩涚墖淇℃伅鍚戞墦杞﹀彂閫佽繘杞︽暟鎹�
sendTaskListToPLC(taskList, line);
return Boolean.TRUE;
}
@@ -380,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);
}
@@ -392,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;
@@ -438,7 +482,14 @@
bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth)
.in(BigStorageCage::getSlot, slotList));
}
-
-
}
+
+ public Boolean computeIsRun(int line, String glassId) {
+ //鑾峰彇鍗ц浆绔嬪墿浣欏搴�
+ BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
+ //鑾峰彇鐜荤拑淇℃伅
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+ return sitToUpRemainWidth.getWidth() < glassInfo.getWidth();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0