From 1479f77b88e355ce2c7c073458d919c8e06baa18 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:10:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java | 106 ++++++++------
springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java | 4
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 1
CanadaMes-ui/src/configuration/Positioning1.json | 23 +++
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 4
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 7
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java | 8
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 32 ++--
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 19 +-
CanadaMes-ui/src/configuration/AutomaticParameterSetting.json | 11 +
CanadaMes-ui/src/configuration/Positioning2.json | 10 +
CanadaMes-ui/src/configuration/parameter1.json | 19 ++
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 2
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 2
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 2
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 125 ++++++++++-------
springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java | 10
17 files changed, 245 insertions(+), 140 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
index c9b9d14..6936061 100644
--- a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -7,6 +7,7 @@
"type": "0",
"address": "DB100.0",
"count": 3,
+ "unit": "掳",
"value": ""
},
{
@@ -14,6 +15,7 @@
"read": 11,
"sending": "",
"address": "DB100.0",
+ "unit": "掳",
"type": "0",
"value": ""
},
@@ -21,6 +23,7 @@
"name": "A01杈撻�佹帴鐗囪搴�",
"read": 22,
"sending": "",
+ "unit": "掳",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -29,6 +32,7 @@
"name": "A01绗煎瓙瑙掑害",
"read": 22,
"sending": "",
+ "unit": "掳",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -40,6 +44,7 @@
"read": 33,
"sending": "",
"type": "0",
+ "unit": "掳",
"address": "DB100.0",
"count": 3,
"value": ""
@@ -48,6 +53,7 @@
"name": "A02琛岃蛋浣庨�熻搴�",
"read": 11,
"sending": "",
+ "unit": "掳",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -56,6 +62,7 @@
"name": "A02杈撻�佹帴鐗囪搴�",
"read": 22,
"sending": "",
+ "unit": "掳",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -64,6 +71,7 @@
"name": "A02绗煎瓙瑙掑害",
"read": 22,
"sending": "",
+ "unit": "掳",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -75,6 +83,7 @@
"read": 100,
"sending": "",
"type": "0",
+ "unit": "m/min",
"address": "DB100.0",
"count": 3,
"value": ""
@@ -85,6 +94,7 @@
"name": "灏忚溅鑷姩閫熷害",
"read": 11,
"sending": "",
+ "unit": "m/min",
"address": "DB100.0",
"type": "0",
"value": ""
@@ -95,6 +105,7 @@
"name": "鑷姩缈昏浆閫熷害",
"read": 33,
"sending": "",
+ "unit": "m/min",
"address": "DB100.0",
"type": "0",
"value": ""
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index 740a03a..b0d9e54 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -4,6 +4,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -12,6 +13,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -20,6 +22,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -38,6 +41,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0",
"address":"DB100.48",
"count":10
@@ -46,6 +50,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -53,6 +58,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -60,6 +66,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -67,6 +74,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -74,6 +82,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -81,6 +90,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -88,6 +98,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -95,6 +106,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -102,6 +114,7 @@
"name": "190#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
}
@@ -123,6 +136,7 @@
"read": 33,
"sending": 0,
"type": "0" ,
+ "unit": "mm",
"value":"0",
"address":"DB100.68",
"count":10
@@ -131,6 +145,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -138,6 +153,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -145,6 +161,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -152,6 +169,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -159,6 +177,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -166,6 +185,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -173,6 +193,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -180,6 +201,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -188,6 +210,7 @@
"read": 22,
"sending": 0,
"type": "0" ,
+ "unit": "mm",
"value":"0"
}
diff --git a/CanadaMes-ui/src/configuration/Positioning2.json b/CanadaMes-ui/src/configuration/Positioning2.json
index 3b03f7a..31c7ad3 100644
--- a/CanadaMes-ui/src/configuration/Positioning2.json
+++ b/CanadaMes-ui/src/configuration/Positioning2.json
@@ -12,6 +12,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"address":"DB100.0",
"count":3,
"value":"0"
@@ -20,6 +21,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0"
,
"value":"0"
@@ -28,6 +30,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -35,6 +38,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -42,6 +46,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
}
@@ -61,6 +66,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -68,6 +74,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -75,6 +82,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -82,6 +90,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
},
@@ -89,6 +98,7 @@
"name": "190#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0",
"value":"0"
}
diff --git a/CanadaMes-ui/src/configuration/parameter1.json b/CanadaMes-ui/src/configuration/parameter1.json
index be66496..f539478 100644
--- a/CanadaMes-ui/src/configuration/parameter1.json
+++ b/CanadaMes-ui/src/configuration/parameter1.json
@@ -12,7 +12,7 @@
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
+ "unit": "m/min",
"count":3,
"value":0
},
@@ -21,6 +21,7 @@
"read": 11,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
},
{
@@ -28,6 +29,7 @@
"read": 11,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
},
{
@@ -35,6 +37,7 @@
"read": 22,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
}
@@ -53,7 +56,7 @@
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
+ "unit": "m/min",
"count":3,
"value":0
},
@@ -61,6 +64,7 @@
"name": "楂橀�熺嚎閫熷害",
"read": 11,
"sending": 0,
+ "unit": "m/min",
"type": "0",
"value":0
},
@@ -68,6 +72,7 @@
"name": "浣庨�熺嚎閫熷害",
"read": 11,
"sending": 0,
+ "unit": "m/min",
"type": "0",
"value":0
},
@@ -75,6 +80,7 @@
"name": "鎵嬪姩閫熷害",
"read": 22,
"sending": 0,
+ "unit": "m/min",
"type": "0",
"value":0
}
@@ -92,7 +98,7 @@
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
+ "unit": "m/min",
"count":3,
"value":0
},
@@ -101,6 +107,7 @@
"read": 11,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
},
{
@@ -108,6 +115,7 @@
"read": 11,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
},
{
@@ -115,6 +123,7 @@
"read": 22,
"sending": 0,
"type": "0",
+ "unit": "m/min",
"value":0
}
@@ -127,7 +136,8 @@
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
+ "unit": "mm/S",
+
"count":3,
"value":0
}
@@ -141,6 +151,7 @@
"name": "灏忚溅鐐瑰姩閫熷害",
"read": 11,
"sending": 0,
+ "unit": "mm/S",
"type": "0",
"value":0
}
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index be85e56..102ca3c 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -53,6 +53,8 @@
<span class="name" v-if="item.type === '0'" style="width:300px;">{{ item.name }}</span>
<el-input style="width:250px;" v-if="item.type === '0'" v-model="item.value" class="input-box"
@keyup.enter.native="submitDataToBackend"></el-input>
+ <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
+
</div>
</div>
</el-card>
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
index b424275..3cad049 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -57,6 +57,8 @@
<span class="name" style="width:250px;">{{ item.name }}</span>
<el-input v-if="item.type === '0'" v-model="item.value" class="input-box"
@keyup.enter.native="submitDataToBackend"></el-input>
+ <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
+
</div>
</div>
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index f04a1a7..7b0840d 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -56,7 +56,7 @@
<div class="item-row">
<span class="name" style="width:250px;">{{ item.name }}</span>
<el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend" ></el-input>
-
+ <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
<!-- <el-button
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 7b3cb6b..c5bcfb8 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -57,6 +57,7 @@
<span class="name" style="width:250px;">{{ item.name }}</span>
<el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend"></el-input>
<!-- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
+ <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
</div>
</div>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index a94bd20..d40420e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -48,7 +48,7 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
-
+ //spianService.selectout2("250");
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
@@ -64,6 +64,7 @@
spianMapper.Updatetask(1, 0);// 鏇存敼杩涚墖浠诲姟鐘舵�佷负1
spianMapper.UpdatetaskOut(B01glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
spianMapper.OverOutSlice(B01glassid.toString(), 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ spianMapper.UpdataGlassCage(B01glassid.toString(),0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
System.out.println("姹囨姤鏃禕01|" + B01glassid);
@@ -76,6 +77,7 @@
spianMapper.UpdateCageOver(B02glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
spianMapper.OverOutSlice(B02glassid.toString(), 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ spianMapper.UpdataGlassCage(B01glassid.toString(),0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
// S7control.getinstance().WriteWord("DB105.50", (short) 1);//姹囨姤B02灏忚溅鏀跺埌
System.out.println("姹囨姤鏃禕02|" + B02glassid);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 49566c2..87a5c68 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -73,26 +73,26 @@
List<String> addresses = new ArrayList<>();
addresses.add("DB100.108");
addresses.add("DB100.20");
- addresses.add("DB103.52");
+ addresses.add("DB103.32");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
-// System.out.println(arraylist);
+ // System.out.println(arraylist);
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB100.110");
addresses2.add("DB100.176");
- addresses2.add("DB103.54");
+ addresses2.add("DB103.34");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
List<String> addresses3 = new ArrayList<>();
addresses3.add("DB100.112");
addresses3.add("DB100.24");
- addresses3.add("DB103.56");
+ addresses3.add("DB103.36");
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
List<String> addresses4 = new ArrayList<>();
addresses4.add("DB100.114");
addresses4.add("DB100.178");
- addresses4.add("DB103.60");
+ addresses4.add("DB103.40");
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
@@ -104,15 +104,46 @@
addresses9.add("DB104.1.3");
addresses9.add("DB104.1.6");
addresses9.add("DB104.1.7");
-// addresses9.add("DB104.28");
-// addresses9.add("DB104.30");
List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+
+ List<String> addresses10 = new ArrayList<>();
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
+ // Short[] values1 = { 1, 2, 3 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] values2 = { 1, 2, 3 };
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Short[] values3 = { 1, 2, 3 };
+ // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ // Short[] values4 = { 1, 2, 3 };
+ // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ // Short[] values5 = { 5 };
+ // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ // Short[] values6 = { 6 };
+ // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ // Short[] values7 = { 7 };
+ // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ // Short[] values8 = { 8 };
+ // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+ // Boolean[] values9 = { false, false, true, true };
+ // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
short[] params2 = new short[arraylist9.size()];
for (int i = 0; i < arraylist9.size(); i++) {
boolean value = arraylist9.get(i);
params2[i] = value ? (short) 1 : (short) 0;
}
-// List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+
+ // Boolean[] values10 = { false, false, true, true };
+ // List<Boolean> arraylist10 = new ArrayList<>(Arrays.asList(values10));
+ short[] params3 = new short[arraylist10.size()];
+ for (int i = 0; i < arraylist10.size(); i++) {
+ boolean value = arraylist10.get(i);
+ params3[i] = value ? (short) 1 : (short) 0;
+ }
+ // List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
arraylist5.addAll(arraylist6);
arraylist5.addAll(arraylist7);
arraylist5.addAll(arraylist8);
@@ -125,6 +156,7 @@
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("shishi1", arraylist5);
jsonObject.append("guzhang", params2);
+ jsonObject.append("weihuiling", params3);
// jsonObject.append("weihuiling", arraylist8);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
@@ -138,27 +170,27 @@
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB100.108");
waddresses1.add("DB100.20");
- waddresses1.add("DB103.52");
+ waddresses1.add("DB103.32");
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB100.110");
waddresses2.add("DB100.176");
- waddresses2.add("DB103.54");
+ waddresses2.add("DB103.34");
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB100.112");
waddresses3.add("DB100.24");
- waddresses3.add("DB103.56");
+ waddresses3.add("DB103.36");
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB100.114");
waddresses4.add("DB100.178");
- waddresses4.add("DB103.60");
+ waddresses4.add("DB103.40");
// 鏁呴殰鍦板潃
List<String> waddresses5 = new ArrayList<>();
- waddresses5.add("DB103.244");
- waddresses5.add("DB103.250");
+ // waddresses5.add("DB103.244");
+ // waddresses5.add("DB103.250");
waddresses5.add("DB103.252");
waddresses5.add("DB103.254");
@@ -171,10 +203,12 @@
// 鍥為浂鍦板潃
List<String> waddresses7 = new ArrayList<>();
+
waddresses7.add("DB101.4.5");
waddresses7.add("DB101.4.7");
- System.out.println(messages.isEmpty());
+
+ // System.out.println(messages.isEmpty());
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
@@ -205,7 +239,8 @@
}
// 鍐欏叆A02
- if (messageArray.getJSONArray(1).size() > 0) {
+
+ if ( messageArray.getJSONArray(1).size() > 0) {
JSONArray jsonArray = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -247,7 +282,7 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses3, sValue2);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
@@ -271,7 +306,7 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses4, sValue2);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
}
}
@@ -302,59 +337,49 @@
// 鍐欏叆澶嶄綅鍦板潃
if (messageArray.getJSONArray(5).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(5);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(5);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- // S7control.getinstance().WriteWord(waddresses6, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses6);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses6, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses6);
}
}
// 鍐欏叆鍥為浂鍦板潃
if (messageArray.getJSONArray(6).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(6);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(6);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses7, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses7);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses7, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses7);
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
index f5da68d..5d8051d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -71,21 +71,21 @@
// Integer Plccount = this.count;
List<String> addresses = new ArrayList<>();
- addresses.add("DB100.16");
addresses.add("DB100.116");
+ addresses.add("DB100.16");
+
addresses.add("DB103.20");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
-// System.out.println(arraylist);
+ // System.out.println(arraylist);
List<String> addresses2 = new ArrayList<>();
- addresses2.add("DB100.192");
addresses2.add("DB100.118");
+ addresses2.add("DB100.192");
+
addresses2.add("DB103.22");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
List<String> addresses9 = new ArrayList<>();
-
-
addresses9.add("DB104.1.2");
addresses9.add("DB104.1.3");
@@ -96,13 +96,37 @@
params2[i] = value ? (short) 1 : (short) 0;
}
+ // Short[] values1 = { 1, 2, 3 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] values2 = { 1, 2, 3 };
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Boolean[] values9 = { false, true };
+ // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
+ // short[] params2 = new short[arraylist9.size()];
+ // for (int i = 0; i < arraylist9.size(); i++) {
+ // boolean value = arraylist9.get(i);
+ // params2[i] = value ? (short) 1 : (short) 0;
+ // }
+
+ // Boolean[] values10 = { false, true };
+ List<String> addresses10 = new ArrayList<>();
+
+ addresses10.add("DB104.9.0");
+ addresses10.add("DB104.9.1");
+ List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
+ short[] params3 = new short[arraylist10.size()];
+ for (int i = 0; i < arraylist10.size(); i++) {
+ boolean value = arraylist10.get(i);
+ params3[i] = value ? (short) 1 : (short) 0;
+ }
+
JSONObject jsonObject = new JSONObject();
- // System.out.println(arraylist);
+
jsonObject.append("zuhe1", arraylist);
jsonObject.append("zuhe2", arraylist2);
jsonObject.append("guzhang", params2);
- // jsonObject.append("weihuiling", arraylist8);
-
+ jsonObject.append("weihuiling", params3);
+ // System.out.println(jsonObject);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
@@ -112,14 +136,14 @@
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
List<String> waddresses1 = new ArrayList<>();
- waddresses1.add("DB100.108");
- waddresses1.add("DB100.20");
- waddresses1.add("DB103.52");
+ waddresses1.add("DB100.116");
+ waddresses1.add("DB100.16");
+
List<String> waddresses2 = new ArrayList<>();
- waddresses2.add("DB100.110");
- waddresses2.add("DB100.176");
- waddresses2.add("DB103.54");
+ waddresses2.add("DB100.118");
+ waddresses2.add("DB100.192");
+
// 鏁呴殰鍦板潃
List<String> waddresses3 = new ArrayList<>();
@@ -216,59 +240,49 @@
// 鍐欏叆澶嶄綅鍦板潃
if (messageArray.getJSONArray(3).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(3);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(3);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses4, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses4);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses4, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses4);
}
}
// 鍐欏叆鍥為浂鍦板潃
if (messageArray.getJSONArray(4).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(4);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(4);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses5, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses5);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses5, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses5);
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
index 1e448ec..ab1ce6f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -2,10 +2,10 @@
public class Glass {
private Integer id;
- private String orderId;
- private double width;
- private double height;
- private String glassId;
+ private String orderId;//璁㈠崟id
+ private double width;//瀹藉害
+ private double height;//楂樺害
+ private String glassId;//鐜荤拑id
public Integer id() {
return id;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
index 044d19b..209de27 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
@@ -4,8 +4,8 @@
public class OrderOut {
private Integer id;
- private String orderid;
- private Integer state;
+ private String orderid;//璁㈠崟id
+ private Integer state;//鐘舵��
private Date modtime;
public Integer id() {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 9cb95ce..c1ff53e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -1,22 +1,22 @@
package com.example.springboot.entity;
public class StorageCage {
- private Integer id;
- private Integer prcId;
- private String glassId;
- private Integer cage;
- private Integer cell;
- private Double width;
- private Double glasswidth;
- private Double glassheight;
- private Double glasswidthmm;
- private Double glassheightmm;
- private String state;
- private Integer tier;
- private String orderId;
- private Integer disabled;
- private String listId;
- private String boxId;
+ private Integer id; //鑷簭id
+ private Integer prcId;//plcid
+ private String glassId;//鐜荤拑id
+ private Integer cage;//绗煎瓙鍙�
+ private Integer cell;//鏍煎瓙鍙�
+ private Double width;//鏍煎瓙瀹�
+ private Double glasswidth;//鐜荤拑瀹�
+ private Double glassheight;//鐜荤拑楂�
+ private Double glasswidthmm;//鑻卞鐜荤拑瀹�
+ private Double glassheightmm;//鑻卞鐜荤拑楂�
+ private String state;//鐘舵��
+ private Integer tier;//鍐呭鐗�
+ private String orderId;//璁㈠崟id
+ private Integer disabled;//鍋滅敤
+ private String listId;//闆嗗悎id
+ private String boxId;//绠卞瓙id
private north_glass_buffer1 north_glass_buffer1s;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
index a1de33a..5fae01d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
@@ -1,12 +1,12 @@
package com.example.springboot.entity;
public class StorageTask{
- private Integer id;
- private String taskType;
- private String glassId;
+ private Integer id;//鑷簭
+ private String taskType;//绫诲瀷
+ private String glassId;//鐜荤拑id
private String cataskStatege;
- private String shelfRack;
- private String loadrack;
+ private String shelfRack;//璧峰浣�
+ private String loadrack;//鐩爣浣�
public Integer id() {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index d64b361..75581e5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -58,8 +58,11 @@
StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
//鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
- @Update("update storage_cage as a set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=0 where cage=#{cage} and cell=#{cell} and tier=#{tier};")
- void UpdataGlassCage(String orderid,String glassid,double width,int cage,int cell,int tier,int state);
+ @Update("update storage_cage as a set state=#{state},glass_id=null,order_id=null,glasswidth=0,a.glassheight=null,a.glasswidthmm=null,a.glassheightmm=null,a.listid=null,a.boxid=null where glassid=#{glassid};")
+ void UpdataGlassCage(String glassid,int state);
+ //鏀瑰彉鐜荤拑鐘舵�佷负鍑虹墖涓�
+ @Update("update storage_cage as a set state=#{state} where glass_id=#{glassid};")
+ void UpdataGlassCageState(String glassid,int state);
//淇敼绗煎瓙淇℃伅(杩涚墖)
@Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index f5d8671..2f1045f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -291,7 +291,7 @@
datas.add((short) 1);
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, orderid);// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
@@ -315,7 +315,7 @@
datas.add((short) 1);
spianMapper.Inserttask(1, 0,prcid, 1000, orderid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
//S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
//outmesid(glassid);// 娲惧彂鍑虹墖ID
if (pd != null) {
@@ -350,7 +350,7 @@
spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
@@ -378,7 +378,7 @@
spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
@@ -430,7 +430,8 @@
datas.add((short) 1);
spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
// int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
if (state == 2) {
@@ -452,12 +453,12 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -485,7 +486,7 @@
spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid);// 鏂板璋冨害浠诲姟
//spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
@@ -515,7 +516,7 @@
spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
--
Gitblit v1.8.0