From 564f7dd6b7a750e518a159a795df6148376e08e0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 四月 2024 16:47:02 +0800
Subject: [PATCH] 将逻辑移动到实现类
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java | 8
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 186 ++++++++++++++++++++
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 20 +-
/dev/null | 122 -------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 90 +++++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 74 ++++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 13 +
13 files changed, 383 insertions(+), 149 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 91793a6..ed2d9fb 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -202,7 +202,7 @@
initWebSocket();
onMounted(fetchTableData);
-setInterval(fetchTableData, 2000)
+// setInterval(fetchTableData, 2000)
const open = () => {
ElMessageBox.confirm(
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
new file mode 100644
index 0000000..e94af33
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -0,0 +1,74 @@
+package com.mes.common;
+
+import cn.hutool.json.JSONObject;
+
+import com.mes.device.PlcParameterObject;
+import com.mes.downglassinfo.entity.DownGlassTask;
+import com.mes.downglassinfo.service.DownGlassTaskService;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downstorage.service.DownStorageCageService;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.tools.WebSocketServer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Slf4j
+public class Plcdownglass extends Thread {
+
+ public static final String RESULT_IN = "1";
+ public static final String RESULT_OUT = "2";
+ public static final String RESULT_IN_OUT = "3";
+
+ @Autowired
+ private DownStorageCageService downStorageCageService;
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+
+
+
+
+
+ @Override
+ public void run() {
+ while (this != null) {
+ JSONObject jsonObject = new JSONObject();
+ try {
+ Thread.sleep(100);
+
+ String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+ String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+
+ // 杩涚墖璇锋眰
+ if (RESULT_IN.equals(result)) {
+ downStorageCageService.processInto(number);
+ }
+ // 鍑虹墖璇锋眰
+ else if (RESULT_OUT.equals(result)) {
+ downStorageCageService.processOut();
+ }
+ // 杩涘嚭鐗囪姹�
+ else if (RESULT_IN_OUT.equals(result)) {
+ // 鍏堝嚭鍚庤繘
+ if (!downStorageCageService.processOut()) {
+ downStorageCageService.processInto(number);
+ }
+ }
+
+
+ downWorkstationService.insertdownglassinfo();
+
+
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
index e9885db..c262760 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
@@ -28,15 +28,7 @@
try {
i++;
Thread.sleep(100);
- DownGlassLogic plcService = plcServiceSupplier.get();
-
- //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
- plcService.insertdownglassinfo();
-
-
- //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑閭ｆ潯璁板綍鍒犳帀 宸ヤ綅琛ㄦ祦绋嬪崱缁戝畾浜嗘灦瀛�
- plcService.downWorkstation();
} catch (InterruptedException e) {
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
index 1e8ed89..9ecb854 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
@@ -23,5 +23,5 @@
DownGlassTask selectLastOutCacheInfo(String endCell);
- Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId);
+ Integer insertCacheTask(DownGlassTask downGlassTask);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
index e493c74..f66cf65 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -3,9 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
+import com.mes.downworkstation.entity.DownWorkstation;
+import com.mes.downworkstation.mapper.DownWorkstationMapper;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.downworkstation.service.DownWorkstationTaskService;
+import com.mes.tools.WebSocketServer;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {
@@ -30,4 +39,8 @@
}
+
+
+
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index 4e9cdf8..78ebd5c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -58,17 +58,17 @@
}
@Override
- public Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
+ public Integer insertCacheTask(DownGlassTask downGlassTask) {
DownGlassTask glassInfo = new DownGlassTask();
- glassInfo.setId(id);
- glassInfo.setStartCell(start);
- glassInfo.setEndCell(end);
- glassInfo.setTaskType(type);
- glassInfo.setWidth(width);
- glassInfo.setHeight(height);
- glassInfo.setFilmsid(filmsId);
- glassInfo.setThickness(thickness);
- glassInfo.setFlowCardId(flowCardId);
+ glassInfo.setId(downGlassTask.getId());
+ glassInfo.setStartCell(downGlassTask.getStartCell());
+ glassInfo.setEndCell(downGlassTask.getEndCell());
+ glassInfo.setTaskType(downGlassTask.getTaskType());
+ glassInfo.setWidth(downGlassTask.getWidth());
+ glassInfo.setHeight(downGlassTask.getHeight());
+ glassInfo.setFilmsid(downGlassTask.getFilmsid());
+ glassInfo.setThickness(downGlassTask.getThickness());
+ glassInfo.setFlowCardId(downGlassTask.getFlowCardId());
glassInfo.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
int rows = baseMapper.insert(glassInfo);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
deleted file mode 100644
index 1aa2bdf..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.mes.downstorage.service;
-
-import com.mes.common.PLCAutoMes;
-import com.mes.common.S7control;
-import com.mes.device.PlcParameterObject;
-
-import com.mes.downglassinfo.entity.DownGlassTask;
-import com.mes.downglassinfo.service.DownGlassTaskService;
-import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
-import com.mes.downworkstation.mapper.DownWorkstationMapper;
-import com.mes.tools.WebSocketServer;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.service.GlassInfoService;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
-
-@Data
-@Service
-public class DownGlassCacheLogic {
- //涓嬬墖鍓嶇悊鐗�
- public static final String RESULT_IN = "1";
- public static final String RESULT_OUT = "2";
- public static final String RESULT_IN_OUT = "3";
- @Autowired
- private DownStorageCageDetailsMapper selectInfo;
- @Autowired
- private GlassInfoService glassInfoService;
- @Autowired
- private DownStorageCageService downStorageCageService;
- @Autowired
- private DownGlassTaskService downGlassTaskService;
-
-
-
-
-
- public void process() {
- String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
- String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
-
- // 杩涚墖璇锋眰
- if (RESULT_IN.equals(result)) {
- processInto(number);
- }
- // 鍑虹墖璇锋眰
- else if (RESULT_OUT.equals(result)) {
- processOut();
- }
- // 杩涘嚭鐗囪姹�
- else if (RESULT_IN_OUT.equals(result)) {
- // 鍏堝嚭鍚庤繘
- if (!processOut()) {
- processInto(number);
- }
- }
- }
-
-
- /**
- * @param Number
- * @return //涓嬬墖鍓嶇悊鐗� 杩�
- */
-
- public boolean processInto(String Number) {
- glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
- downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
-
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- //瀛樺湪姝ょ幓鐠冪紪鍙�
- if (GlassInfo != null) {
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
- List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByLayoutAndSequence(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
- //绌烘爡鏍煎彿
- if (list.size() == 0) {
- //鏌ヨ绗煎瓙鍐呯┖闂�
- list = downStorageCageService.getCacheLeisure();
- }
- //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
- if (list.size() == 0) {
- list = downStorageCageService.getIsExistIntoCacheByLayout(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
- }
- if (list.size() > 0) {
- //瀛樺湪绌烘牸
- //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
- //2.鍥炲 1杩涚墖
- DownStorageCageDetails item = list.get(0);
- selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
-
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
-
- //瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
- return true;
- }
-
- } else {
- // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
- }
- //杩斿洖缁撴灉
- return false;
- }
-
- //鐞嗙墖 鍑�
- public boolean processOut() {
- // 鏌ヨ浠诲姟
- String G06 = S7control.getinstance().ReadWord("DB14.56", 1).get(0) + "";
- String G11 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
- String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
-
-
- List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
- List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
- List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
- GlassInfo Maxglass=glassInfoService.selectGlassId("2");;
-
- // 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
- if (!list3.isEmpty()) {
- DownStorageCageDetails item3 = list3.get(0);
- if (item3.getHeight() >= 1 && item3.getWidth() >= 1) {
-
- String endcell = "13";
- String SendEndcell = "1";
-
- selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
- }
-
- //鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
- else if (!list3.isEmpty()&&Maxglass.equals(list3.get(0))) {
- DownStorageCageDetails item3 = list3.get(0);
- if (G06.equals("0") && G11.equals("0")) {
- String endcell = "11";
- String SendEndcell = "1";
- selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
- }
- // 鎸夌収澶у皬绗﹀悎鍓嶇鍑虹墖
- else if (!list.isEmpty()) {
- DownStorageCageDetails item = list.get(0);
- if (G06.equals("0") && G11.equals("1")) {
- // 鍑哄埌 G06
- selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
- // 鎸夌収椤哄簭绗﹀悎鍚庣鍑虹墖
- } else if (!list2.isEmpty()) {
- DownStorageCageDetails item2 = list2.get(0);
- if (G06.equals("1") && G11.equals("0")) {
- // 鍑哄埌 G11
- selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
-
- }
-
-
- // 杩斿洖缁撴灉
- return false;
- }
-
-
- /**
- * @param Number
- * //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
- */
-
-
- /**
- * @param Number
- * @return 鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- */
- public boolean selectMessageId(String Number) {
- //鏌ヨ鏄惁瀛樺湪
-
- GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- if (GlassInfo == null) {
- //杩斿洖 涓嶅瓨鍦�
- return false;
-
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
- /**
- * @param Number
- * @return 鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- */
-
- public boolean deleteMessageId(String Number) {
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- if (GlassInfo == null) {
- //杩斿洖 涓嶅瓨鍦�
- return false;
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
-
- /**
- * @param Number
- * @return //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
- */
- public boolean isExist(String Number) {
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- if (GlassInfo == null) {
- //杩斿洖 涓嶅瓨鍦�
- return false;
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
-}
-
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index b71fc94..f282a63 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -1,6 +1,7 @@
package com.mes.downstorage.service;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
import java.util.Map;
@@ -11,4 +12,6 @@
//淇敼鐞嗙墖绗煎唴淇℃伅
boolean updatedownStorageCageDetails(DownStorageCageDetails details);
+
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index 343af18..6a0dfdc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -26,4 +26,8 @@
List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width);
List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width);
+
+ boolean processInto(String Number);
+ boolean processOut();
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index fb0e5b0..f20f903 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -11,6 +11,7 @@
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.glassinfo.entity.GlassInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,17 +30,12 @@
}
-
-
-
-
@Override
//淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updatedownStorageCageDetails(DownStorageCageDetails details){
baseMapper.updateById(details);
return true;
}
-
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index c2e631f..0f46118 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,11 +1,20 @@
package com.mes.downstorage.service.impl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.common.PLCAutoMes;
+import com.mes.common.S7control;
+import com.mes.device.PlcParameterObject;
+import com.mes.downglassinfo.entity.DownGlassTask;
+import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +35,13 @@
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
@Autowired
private DownStorageCageMapper downStorageCageMapper;
+
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private DownStorageCageService downStorageCageService;
+ @Autowired
+ private DownGlassTaskService downGlassTaskService;
@Override
public List<Map> gettask(){
downStorageCageMapper.selectList(null);
@@ -206,6 +222,176 @@
+ @Override
+ public boolean processInto(String Number) {
+ glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+
+ //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ //瀛樺湪姝ょ幓鐠冪紪鍙�
+ if (GlassInfo != null) {
+ //鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
+ List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
+ if (list.size() > 0) {
+ //瀛樺湪绌烘牸
+ //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
+ //2.鍥炲 1杩涚墖
+ DownStorageCageDetails item = list.get(0);
+
+ //selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
+
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(GlassInfo.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setTaskType("1");
+ downGlassTask.setEndCell(item.getSlot()+"");
+ downGlassTask.setWidth(GlassInfo.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(GlassInfo.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(GlassInfo.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(GlassInfo.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(GlassInfo.getFlowcardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
+
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+
+
+ //瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
+ return true;
+ }
+
+ } else {
+ // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
+ }
+ //杩斿洖缁撴灉
+ return false;
+ }
+
+
+ /**
+ * 鐞嗙墖 鍑�
+ * @return
+ */
+ //
+ @Override
+ public boolean processOut() {
+ // 鏌ヨ浠诲姟
+
+
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+
+ List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
+ //鑷姩缁戝畾鏋跺瓙
+
+
+
+ // 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
+
+ if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
+ if (item3.getHeight() >= 1 && item3.getWidth() >= 1) {
+
+ String endcell = "13";
+ String SendEndcell = "1";
+
+// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+ }
+ }
+
+
+ //鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
+ else if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
+ String endcell = "11";
+ String SendEndcell = "1";
+ // selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
+
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+
+ }
+ // 鎸夌収澶у皬绗﹀悎鍓嶇鍑虹墖
+ else if (!list.isEmpty()) {
+ DownStorageCageDetails item = list.get(0);
+
+ // 鍑哄埌 G06
+ //selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("06");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+
+ // 鎸夌収椤哄簭绗﹀悎鍚庣鍑虹墖
+ } else if (!list2.isEmpty()) {
+ DownStorageCageDetails item2 = list2.get(0);
+
+ // 鍑哄埌 G11
+ // selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item2.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("11");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item2.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item2.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item2.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item2.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item2.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
+
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+
+
+ }
+
+
+
+ // 杩斿洖缁撴灉
+ return false;
+ }
+
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
deleted file mode 100644
index e142356..0000000
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.mes.downworkstation.service;
-
-import com.mes.common.PLCAutoMes;
-import com.mes.device.PlcParameterObject;
-import com.mes.downglassinfo.entity.DownGlassInfo;
-import com.mes.downglassinfo.entity.DownGlassTask;
-import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
-import com.mes.downglassinfo.service.DownGlassInfoService;
-import com.mes.downglassinfo.service.DownGlassTaskService;
-import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downworkstation.entity.DownWorkstation;
-import com.mes.downworkstation.mapper.DownWorkstationMapper;
-import com.mes.tools.WebSocketServer;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Data
-@Service
-public class DownGlassLogic {
- @Autowired
-
-
- private DownGlassInfoService downGlassInfoService;
- private DownGlassTaskService downGlassTaskService;
- private DownWorkstationMapper downWorkstationMapper;
- private DownWorkstationService downWorkstationService;
- private DownWorkstationTaskService downWorkstationTaskService;
- PlcParameterObject plcread = PLCAutoMes.PlcReadObject;
-
-
-
- /**
- * //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
- */
-
- public void insertdownglassinfo() {
-
-
- downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
- downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
- downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);
- downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
- List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
-//
-
-
- if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
-
-//
-
- for (DownGlassTask downGlassInfo : taskdownGlassInf) {
- // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
- DownGlassInfo newdownGlassInfo = new DownGlassInfo();
-
- newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
- Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
- // 鍒濆鍖栭『搴忓瓧娈靛��
- int sequence = maxSequence != null ? maxSequence + 1 : 1;
-
- newdownGlassInfo.setWidth(downGlassInfo.getWidth());
- newdownGlassInfo.setHeight(downGlassInfo.getHeight());
- newdownGlassInfo.setThickness(downGlassInfo.getThickness());
- newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid());
- // 璁剧疆椤哄簭瀛楁鍊�
- newdownGlassInfo.setSequence(sequence);
-
- // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
- downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
- //鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛�
-
- downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
- //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
- downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
-
- sequence++; // 閫掑椤哄簭瀛楁鍊�
-
-
- }
- }
- }
-
-
- /**
- * //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
- */
-
- public void downWorkstation() {
-
-
- try {
- //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
- if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
- //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- for (DownWorkstation downWorkstation : taskdownWorkstation) {
- //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
- //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
- downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
-
- //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- downGlassTaskService.deleteTask(downWorkstation.getId());
-
- }
- }
- } catch (Exception e) {
- // 鎵撳嵃寮傚父淇℃伅
- e.printStackTrace();
- // 鎴栬�呭彲浠ヨ繘琛屽叾浠栧紓甯稿鐞嗭紝姣斿璁板綍鏃ュ織鎴栬�呰繑鍥炵壒瀹氱殑閿欒淇℃伅
- }
-
-
- }
-
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
index 76d3fb3..900f7c8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
@@ -27,6 +27,6 @@
int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
-
+ void insertdownglassinfo();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 0c44dac..d43d1e2 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.entity.DownGlassTask;
+import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationMapper;
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.downworkstation.service.DownWorkstationTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,9 +25,17 @@
@Autowired
private DownWorkstationMapper downWorkstationMapper;
+ @Autowired
private DownWorkstationTaskMapper downWorkstationTaskMapper;
+ @Autowired
+ private DownGlassInfoService downGlassInfoService;
+ @Autowired
+ private DownGlassTaskService downGlassTaskService;
-
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+ @Autowired
+ private DownWorkstationTaskService downWorkstationTaskService;
// @Override
// public List<DownWorkstation> gettwoDownWorkstations() {
@@ -126,4 +138,80 @@
+
+ @Override
+ public void insertdownglassinfo() {
+
+
+
+ List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
+//
+
+
+ if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
+
+//
+
+ for (DownGlassTask downGlassInfo : taskdownGlassInf) {
+ // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
+ DownGlassInfo newdownGlassInfo = new DownGlassInfo();
+
+ newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
+ Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
+ // 鍒濆鍖栭『搴忓瓧娈靛��
+ int sequence = maxSequence != null ? maxSequence + 1 : 1;
+
+ newdownGlassInfo.setWidth(downGlassInfo.getWidth());
+ newdownGlassInfo.setHeight(downGlassInfo.getHeight());
+ newdownGlassInfo.setThickness(downGlassInfo.getThickness());
+ newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid());
+ // 璁剧疆椤哄簭瀛楁鍊�
+ newdownGlassInfo.setSequence(sequence);
+
+ // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
+ downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
+ //鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛�
+
+ downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
+ //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
+ downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
+
+ sequence++; // 閫掑椤哄簭瀛楁鍊�
+
+
+ }
+ }
+
+
+
+
+ try {
+ //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
+ List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
+ if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
+ //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
+ for (DownWorkstation downWorkstation : taskdownWorkstation) {
+ //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
+ downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
+ //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
+ downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
+
+ //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
+ downGlassTaskService.deleteTask(downWorkstation.getId());
+
+ }
+ }
+ } catch (Exception e) {
+ // 鎵撳嵃寮傚父淇℃伅
+ e.printStackTrace();
+ // 鎴栬�呭彲浠ヨ繘琛屽叾浠栧紓甯稿鐞嗭紝姣斿璁板綍鏃ュ織鎴栬�呰繑鍥炵壒瀹氱殑閿欒淇℃伅
+ }
+ }
+
+
+
+
+
+
+
}
--
Gitblit v1.8.0