From 50257ab1d2e0bcc14408ecf017c549bacf514ecb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 04 七月 2024 16:56:13 +0800
Subject: [PATCH] 大理片对接临时调整钢化出片线路
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 8
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 18
JsonFile/PlcCacheVerticalGlass.json | 430 +++++++++++++++++++++++---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 3
hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json | 464 +++++++++++++++++++++++-----
6 files changed, 767 insertions(+), 158 deletions(-)
diff --git a/JsonFile/PlcCacheVerticalGlass.json b/JsonFile/PlcCacheVerticalGlass.json
index 5838dac..10e8e33 100644
--- a/JsonFile/PlcCacheVerticalGlass.json
+++ b/JsonFile/PlcCacheVerticalGlass.json
@@ -1,57 +1,377 @@
{
- "plcAddressBegin":"DB.0",
- "plcAddressLenght":"72",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "D01Request",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "D01ID1",
- "addressIndex":"2",
- "addressLenght":"6",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D04Request",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D04ID1",
- "addressIndex":"10",
- "addressLenght":"6",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D02Go",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D05Go",
- "addressIndex":"22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- }
- ,
- {
- "codeId": "DeviceStatus",
- "addressIndex":"70",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- }
- ]
+ "plcAddressBegin": "DB14.0",
+ "plcAddressLenght": "938",
+ "dataType": "word",
+ "parameteInfor": [{
+ "codeId": "D01ID",
+ "addressIndex": "0",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D02ID",
+ "addressIndex": "32",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID1",
+ "addressIndex": "64",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID2",
+ "addressIndex": "96",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID3",
+ "addressIndex": "128",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID4",
+ "addressIndex": "160",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID5",
+ "addressIndex": "192",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID6",
+ "addressIndex": "224",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D04ID",
+ "addressIndex": "256",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID1",
+ "addressIndex": "288",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID2",
+ "addressIndex": "328",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID3",
+ "addressIndex": "352",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID4",
+ "addressIndex": "384",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID5",
+ "addressIndex": "416",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID6",
+ "addressIndex": "448",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID1",
+ "addressIndex": "480",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID2",
+ "addressIndex": "512",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID3",
+ "addressIndex": "544",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID4",
+ "addressIndex": "576",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID5",
+ "addressIndex": "608",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID6",
+ "addressIndex": "640",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID1",
+ "addressIndex": "672",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID2",
+ "addressIndex": "704",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID3",
+ "addressIndex": "736",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID4",
+ "addressIndex": "768",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID5",
+ "addressIndex": "800",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID6",
+ "addressIndex": "832",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ToMES",
+ "addressIndex": "874",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ToMES",
+ "addressIndex": "876",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D01ToMES",
+ "addressIndex": "878",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D04ToMES",
+ "addressIndex": "880",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD03",
+ "addressIndex": "888",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD05",
+ "addressIndex": "890",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToPLC",
+ "addressIndex": "892",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport1",
+ "addressIndex": "914",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport2",
+ "addressIndex": "916",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport3",
+ "addressIndex": "918",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport4",
+ "addressIndex": "920",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport5",
+ "addressIndex": "922",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport6",
+ "addressIndex": "924",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport1",
+ "addressIndex": "926",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport2",
+ "addressIndex": "928",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport3",
+ "addressIndex": "930",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport4",
+ "addressIndex": "932",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport5",
+ "addressIndex": "934",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport6",
+ "addressIndex": "936",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "deviceState",
+ "addressIndex": "864",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01State",
+ "addressIndex": "866",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02State",
+ "addressIndex": "868",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03State",
+ "addressIndex": "870",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05State",
+ "addressIndex": "872",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD01",
+ "addressIndex": "894",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD04",
+ "addressIndex": "896",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ }
+ ]
}
\ No newline at end of file
diff --git a/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
index 1b538cf..10e8e33 100644
--- a/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
+++ b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
@@ -1,91 +1,377 @@
{
- "plcAddressBegin":"DB14.0",
- "plcAddressLenght":"84",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "D01Request",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "D01ID1",
- "addressIndex":"2",
- "addressLenght":"6",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D04Request",
- "addressIndex":"34",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D04ID1",
- "addressIndex":"10",
- "addressLenght":"36",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "E01Status",
- "addressIndex":"2",
- "addressLenght":"68",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "E02Status",
- "addressIndex":"2",
- "addressLenght":"70",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "MaxTaskNo",
- "addressIndex":"2",
- "addressLenght":"72",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D02MaxWidth",
- "addressIndex":"2",
- "addressLenght":"74",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D05MaxWidth",
- "addressIndex":"2",
- "addressLenght":"76",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "GlassGap",
- "addressIndex":"2",
- "addressLenght":"78",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D02SitState",
- "addressIndex":"80",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- },
- {
- "codeId": "D05SitState",
- "addressIndex":"82",
- "addressLenght":"2",
- "ratio":"1",
- "unit":""
- }
- ]
+ "plcAddressBegin": "DB14.0",
+ "plcAddressLenght": "938",
+ "dataType": "word",
+ "parameteInfor": [{
+ "codeId": "D01ID",
+ "addressIndex": "0",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D02ID",
+ "addressIndex": "32",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID1",
+ "addressIndex": "64",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID2",
+ "addressIndex": "96",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID3",
+ "addressIndex": "128",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID4",
+ "addressIndex": "160",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID5",
+ "addressIndex": "192",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ID6",
+ "addressIndex": "224",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D04ID",
+ "addressIndex": "256",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID1",
+ "addressIndex": "288",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID2",
+ "addressIndex": "328",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID3",
+ "addressIndex": "352",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID4",
+ "addressIndex": "384",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID5",
+ "addressIndex": "416",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ID6",
+ "addressIndex": "448",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID1",
+ "addressIndex": "480",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID2",
+ "addressIndex": "512",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID3",
+ "addressIndex": "544",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID4",
+ "addressIndex": "576",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID5",
+ "addressIndex": "608",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01ID6",
+ "addressIndex": "640",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID1",
+ "addressIndex": "672",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID2",
+ "addressIndex": "704",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID3",
+ "addressIndex": "736",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID4",
+ "addressIndex": "768",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID5",
+ "addressIndex": "800",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02ID6",
+ "addressIndex": "832",
+ "addressLenght": "32",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03ToMES",
+ "addressIndex": "874",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05ToMES",
+ "addressIndex": "876",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D01ToMES",
+ "addressIndex": "878",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D04ToMES",
+ "addressIndex": "880",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD03",
+ "addressIndex": "888",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD05",
+ "addressIndex": "890",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToPLC",
+ "addressIndex": "892",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport1",
+ "addressIndex": "914",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport2",
+ "addressIndex": "916",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport3",
+ "addressIndex": "918",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport4",
+ "addressIndex": "920",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport5",
+ "addressIndex": "922",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "StartAddToImport6",
+ "addressIndex": "924",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport1",
+ "addressIndex": "926",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport2",
+ "addressIndex": "928",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport3",
+ "addressIndex": "930",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport4",
+ "addressIndex": "932",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport5",
+ "addressIndex": "934",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "TargetAddToImport6",
+ "addressIndex": "936",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "deviceState",
+ "addressIndex": "864",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E01State",
+ "addressIndex": "866",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "E02State",
+ "addressIndex": "868",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D03State",
+ "addressIndex": "870",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "D05State",
+ "addressIndex": "872",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD01",
+ "addressIndex": "894",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ },
+ {
+ "codeId": "MESToD04",
+ "addressIndex": "896",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ }
+ ]
}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 89dbb29..19ef19c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -29,7 +29,8 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+ //todo:涓存椂灏嗛挗鍖栧嚭鐗囩嚎璺敼涓轰汉宸ュ嚭鐗�
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002;
public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
/**
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
index 65122ab..ef514ec 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
@@ -15,7 +15,7 @@
* @author zhoush
* @since 2024-04-07
*/
-@DS("salve_hangzhoumes")
+@DS("salve_hangzhoumes_1")
public interface TemperingGlassInfoMapper extends MPJBaseMapper<TemperingGlassInfo> {
boolean saveBatch(@Param(value = "list") List<TemperingGlassInfo> list);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index da50b29..45eab78 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -102,12 +102,12 @@
// return;
// }
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 0);
// return;
// }
// if (!"0".equals(confirmationWrodValue)) {
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 0);
// return;
// }
@@ -192,7 +192,7 @@
}
log.info("9銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
- //S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 1);
+ //S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 1);
}
/**
@@ -255,7 +255,7 @@
updateDetail.setState(Const.GLASS_STATE_OUT);
downStorageCageDetailsService.update(updateDetail, wrapper);
log.info("鏇存柊鍑虹墖鐜荤拑鐨勭姸鎬佷负{}", Const.GLASS_STATE_OUT);
- // S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 2);
+ // S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 2);
return true;
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 9eaf129..e9503b4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -96,7 +96,7 @@
return;
}
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
- S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 0);
return;
}
if (!"0".equals(confirmationWrodValue)) {
@@ -474,6 +474,8 @@
log.info("鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬佸け璐�");
return Boolean.FALSE;
}
+ //鏇存柊钀芥灦鐜荤拑鏁伴噺
+
//鐢熸垚浠诲姟淇℃伅
DownGlassInfo downGlassInfo = new DownGlassInfo();
BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
@@ -506,13 +508,13 @@
private Boolean sendMessageToPlc(int width, int height, int thickness, int startCell, int endCell, int taskType) {
S7control s7control = S7object.getinstance().plccontrol;
PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), (short) width);
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height);
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness);
- s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), (short) startCell);
- s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), (short) endCell);
- s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), (short) taskType);
- s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), (short) 1);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), width);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), height);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), thickness);
+ s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), startCell);
+ s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), endCell);
+ s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), taskType);
+ s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), 1);
return Boolean.TRUE;
}
}
--
Gitblit v1.8.0