From 79d3258dd565313603cb7ad36db746d1c9cc5c6e Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 24 六月 2025 17:36:36 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/TableSetting.json | 7
HH.WCS.QingXiNongfu/settings.xml | 244 ++++++++++----
HH.WCS.QingXiNongfu/Program.cs | 6
HH.WCS.QingXiNongfu/bin/Debug/settings.xml | 244 ++++++++++----
HH.WCS.QingXiNongfu/settings1.xml | 174 ++++++++++
HH.WCS.QingXiNongfu/device/TcpServer.cs | 14
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 3
HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json | 7
HH.WCS.QingXiNongfu/core/Monitor.cs | 281 ++++++++++-----
HH.WCS.QingXiNongfu/wms/WCSModel.cs | 1
10 files changed, 725 insertions(+), 256 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index 9b7ec73..8d55a5a 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -7,12 +7,10 @@
using Microsoft.Owin.Hosting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using SqlSugar;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
-using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Net.WebSockets;
@@ -79,7 +77,7 @@
//Console.WriteLine(set1.SetEquals(set3));
#endregion
- var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010+ "").PadLeft(8, '0'));
+ var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010 + "").PadLeft(8, '0'));
Console.WriteLine(uuu16);
}
else
@@ -763,6 +761,8 @@
GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
GetTask(Monitor.AutoRunABD),
GetTask(Monitor.AutoRun13TSJ),
+ GetTask(Monitor.ZdzyABArea),
+
//GetTask(Monitor.AutoTK_PE),//鎻愭墸 - PE鑶滃嚭鍏ュ簱
//GetTask(Monitor.chargeCCD),//YWL 鍏ュ簱宸ュ崟銆傛湭浣跨敤銆�diff --git a/HH.WCS.QingXiNongfu/TableSetting.json b/HH.WCS.QingXiNongfu/TableSetting.json
index e844933..64c36a8 100644
--- a/HH.WCS.QingXiNongfu/TableSetting.json
+++ b/HH.WCS.QingXiNongfu/TableSetting.json
@@ -12,12 +12,13 @@
"鑷敱绾挎琛�: "TN_0021",
"绉诲簱宸ュ崟琛�: "TN_0026",
"鐗╂枡琛�: "TN_0005",
+ "搴撳琛�: "TN_0071",
"鍏ュ簱鎺掗攣琛�: "TN_0041",
"瀵屽嫆鎵樼洏涓嬪彂": "TN_0037",
"浠诲姟绫诲瀷杞崲琛�: "TN_0043",
"澶囪揣鍗曡〃": "TN_0057",
+ "搴撳簱杞繍": "TN_0068",
"棰嗘枡鍗曞瓙琛�: "TN_0053",
- "AGV璁惧淇℃伅": "TN_0042",
- "鍘熺墿鏂欏伐鍗曡〃": "TN_0071",
- "搴撳簱杞繍": "TN_0076"
+ "鍘熺墿鏂欏伐鍗曡〃": "TN_0066",
+ "AGV璁惧淇℃伅": "TN_0042"
}
\ No newline at end of file
diff --git a/HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json b/HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json
index e844933..64c36a8 100644
--- a/HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json
+++ b/HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json
@@ -12,12 +12,13 @@
"鑷敱绾挎琛�: "TN_0021",
"绉诲簱宸ュ崟琛�: "TN_0026",
"鐗╂枡琛�: "TN_0005",
+ "搴撳琛�: "TN_0071",
"鍏ュ簱鎺掗攣琛�: "TN_0041",
"瀵屽嫆鎵樼洏涓嬪彂": "TN_0037",
"浠诲姟绫诲瀷杞崲琛�: "TN_0043",
"澶囪揣鍗曡〃": "TN_0057",
+ "搴撳簱杞繍": "TN_0068",
"棰嗘枡鍗曞瓙琛�: "TN_0053",
- "AGV璁惧淇℃伅": "TN_0042",
- "鍘熺墿鏂欏伐鍗曡〃": "TN_0071",
- "搴撳簱杞繍": "TN_0076"
+ "鍘熺墿鏂欏伐鍗曡〃": "TN_0066",
+ "AGV璁惧淇℃伅": "TN_0042"
}
\ No newline at end of file
diff --git a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
index fe40669..429ad92 100644
--- a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
+++ b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
@@ -1,26 +1,26 @@
锘�?xml version="1.0" encoding="utf-8" ?>
<Custom>
- <HostToAgvServerUrl>http://192.168.1.146:9988/HostToAGV.cgi</HostToAgvServerUrl>
+ <HostToAgvServerUrl>http://10.140.3.100:9988/HostToAGV.cgi</HostToAgvServerUrl>
<OITcpServerUrl>http://127.0.0.1:5102</OITcpServerUrl>
- <SqlServer>Data Source=192.168.1.137;Initial Catalog=OIMobox;User ID=sa;Password=Am123123</SqlServer>
- <AgvSqlServer></AgvSqlServer>
- <FuleServerUrl>http://127.0.0.1:5102</FuleServerUrl>
- <repoNo>浠撳簱缂栫爜</repoNo>
- <!--鑳氱洊涓婃姤-->
- <MesServerUrl>http://127.0.0.1:5102</MesServerUrl>
- <factoryCode>宸ュ巶缂栧彿</factoryCode>
- <fromSystem>鏉ユ簮绯荤粺锛歁OBOX</fromSystem>
-
- <securityKey></securityKey>
- <tokenfrom></tokenfrom>
-
- <FactoryCode>宸ュ巶缂栫爜</FactoryCode>
- <TaskReportUrl>http://127.0.0.1:6666</TaskReportUrl>
- <TaskReportKey></TaskReportKey>
- <FactoryName>宸ュ巶鍚嶇О</FactoryName>
- <OneSign>鍞竴鏍囪瘑</OneSign>
+ <SqlServer>Data Source=10.140.3.100;Initial Catalog=OIMobox;User ID=sa;Password=qaz-123456</SqlServer>
+ <AgvSqlServer>Data Source=10.140.3.100;Initial Catalog=QX_AGV;User ID=sa;Password=qaz-123456</AgvSqlServer>
+ <FuleServerUrl>http://yst-open-zuul.idc.yst.com.cn/api/yst-open-proxy/</FuleServerUrl>
+ <repoNo>QX00102</repoNo>
+ <securityKey>ebf0bfbbe98542b4804de03bc4ef0a70</securityKey>
+ <tokenfrom>MOBOX</tokenfrom>
+
+ <FactoryCode>20B1</FactoryCode>
+ <TaskReportUrl>http://yst-open-zuul.idc.yst.com.cn/api/yst-open-proxy</TaskReportUrl>
+ <TaskReportKey>ebf0bfbbe98542b4804de03bc4ef0a70</TaskReportKey>
+ <FactoryName>闈掓邯</FactoryName>
+ <OneSign>0050</OneSign>
<!--plc淇℃伅锛宒eviceType=1 鑷姩闂� deviceType=2 鐡剁洊鏈�鏃犺弻鐩� deviceType=3 鐡剁洊鏈�姘寸洊 deviceType=4 缈绘枟鏈猴紙姘寸洊锛� deviceType=5 缈绘枟鏈猴紙鏃犺弻鐩�v1/v2锛� deviceType=6 缈绘枟鏈猴紙鏃犺弻鐩�v6锛� deviceType=7 缈绘枟鏈猴紙鏃犺弻鐩�v8锛�+ <FactoryCode>20B1</FactoryCode>
+ <TaskReportUrl>http://yst-open-zuul-qa.idc.yst.com.cn/api/yst-open-proxy</TaskReportUrl>
+ <TaskReportKey>9b42bdc3f0a94b3f9c31e72d1ab42ea7</TaskReportKey>
+ <FactoryName>闈掓邯</FactoryName>
+ <OneSign>0050</OneSign>
{"address":"10.122.160.35","deviceName":"1鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1005","YLWJG1006"],"deviceType":2,"enable":0},
{"address":"10.122.160.36","deviceName":"2鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1003","YLWJG1004"],"deviceType":2,"enable":0},
{"address":"10.122.160.37","deviceName":"3鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1001","YLWJG1002"],"deviceType":2,"enable":0},
@@ -42,48 +42,102 @@
{"address":"10.122.160.33","deviceName":"闂╬lc4","deviceNo":["9","10"],"location":[],"deviceType":1,"enable":1},
{"address":"10.122.160.34","deviceName":"闂╬lc5","deviceNo":["11","12"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.162","deviceName":"550","deviceNo":["1"],"location":["CX-2","CX-1"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.162","deviceName":"550","deviceNo":["1"],"location":["CX-2","CX-1"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.100","deviceName":"CX2","FuLeLineNo":"QX3","deviceNo":[],"location":["CX2-2","CX2-1","5LCX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16",],"deviceType":9,"enable":1},
鐡跺澂鍏ュ簱鍖� taskPri 榛樿鍊�0 -->
<!--
1 闂紙鐙珛闂級
2 鏃犺弻鐩� 3 姘寸洊
- 4 姘寸洊缈绘枟鏈�鍏ュ簱鍫嗗彔锛屼汉宸ヨВ銆�鍑哄簱浠庡嚭搴撲綅鍑哄埌绾胯竟 绌烘杩涗汉宸ュ尯锛�- 5 鐡跺澂缈绘枟鏈�- 6 鏃犺弻缈绘枟鏈�姝ｅ父鍑哄叆搴撴祦绋� 鍫嗗彔锛屽叆搴擄紝鍑虹嚎杈� 绌烘杩涗汉宸ュ尯锛�+ 4 姘寸洊缈绘枟鏈�+ 5 鏃犺弻缈绘枟鏈�+ 6 鐢垫
8 鐡跺澂
- 9 姘寸嚎 鎴愬搧
- 10 姘寸嚎缈绘枟鏈�浜哄伐鏀剧嚎杈� 绌烘杩涗汉宸ュ尯锛�- 11 鎻愬崌鏈�鐢垫鏈�+ 9 姘寸嚎
-->
<deviceInfo>
<![CDATA[
[
- {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"550","deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
- {"address":"10.140.3.163","deviceName":"娉ㄥ鏈�,"FuLeLineNo":"娉ㄥ鏈�,"deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
- {"address":"10.140.3.161","deviceName":"缈绘枟鏈�,"FuLeLineNo":"缈绘枟鏈�,"deviceNo":["","999"],"location":["FDJ-1P-1L-1C"],"deviceType":5,"enable":1},
+ {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"闈掓邯鎴愬搧浠換X1杈撻�绾�,"deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+ {"address":"10.140.3.163","deviceName":"娉ㄥ鏈�,"deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.175","deviceName":"娉ㄥ鏈�","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.176","deviceName":"娉ㄥ鏈�","deviceNo":["","666"],"location":["ZSJ4-1","ZSJ4-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.150","deviceName":"娉ㄥ鏈�","deviceNo":["","659"],"location":["ZSJ5-1","ZSJ5-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.161","deviceName":"缈绘枟鏈�,"deviceNo":["","999"],"location":["FDJ-1P-1L-1C"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.181","deviceName":"3绾跨炕鏂楁満","deviceNo":["","979"],"location":["SXFDJ1"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.182","deviceName":"4绾跨炕鏂楁満","deviceNo":["","969"],"location":["SHIFDJ1"],"deviceType":5,"enable":1},
+
{"address":"10.140.3.162","deviceName":"闂╬lc1","deviceNo":["1"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.169","deviceName":"5L550","FuLeLineNo":"5L550","deviceNo":[],"location":["5LCX-3","5LCX-2","5LCX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
- {"address":"10.140.3.165","deviceName":"5L娉ㄥ鏈�,"FuLeLineNo":"5L娉ㄥ鏈�,"deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
- {"address":"10.140.3.167","deviceName":"5L缈绘枟鏈�,"FuLeLineNo":"5L缈绘枟鏈�,"deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
+ {"address":"10.140.3.169","deviceName":"5L550","FuLeLineNo":"闈掓邯鎴愬搧浠換X2杈撻�绾�,"deviceNo":[],"location":["5LCX-3","5LCX-2","5LCX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.177","deviceName":"CX3","FuLeLineNo":"闈掓邯鎴愬搧浠換X3杈撻�绾�,"deviceNo":[],"location":["CX3-2","CX3-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.178","deviceName":"CX4","FuLeLineNo":"闈掓邯鎴愬搧浠換X4杈撻�绾�,"deviceNo":[],"location":["CX4-2","CX4-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.165","deviceName":"5L娉ㄥ鏈�,"deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
+ {"address":"10.140.3.167","deviceName":"5L缈绘枟鏈�,"deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
{"address":"10.140.3.155","deviceName":"闂╬lc2","deviceNo":["2"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.155","deviceName":"涓�ゼ鎼�妤�,"deviceNo":[],"location":["韪㈣涪韪�],"deviceType":11,"enable":1},
+ {"address":"10.140.3.179","deviceName":"闂╬lc3","deviceNo":["3"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.180","deviceName":"闂╬lc4","deviceNo":["4"],"location":[],"deviceType":1,"enable":1},
+
+
+ {"address":"10.140.3.190","deviceName":"QX3鏃犺弻鐩栫炕鏂楁満","deviceNo":["","8"],"location":["QX3FDJ-1"],"deviceType":6,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.191","deviceName":"QX4鏃犺弻鐩栫炕鏂楁満","deviceNo":["","9"],"location":["QX4FDJ-1"],"deviceType":6,"areaPriy":["QX3QX4MKRK"],"enable":1},
+ {"address":"10.140.3.193","deviceName":"涓�彿鏃犺弻鐩栨満","deviceNo":[],"location":["WJG1-1","WJG1-2"],"deviceType":2,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.189","deviceName":"姘寸洊鏈�,"deviceNo":[],"location":["SGJ-1","SGJ-2"],"deviceType":3,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.195","deviceName":"浜屽彿鏃犺弻鐩栨満","deviceNo":[],"location":["RHWJGJ-1","RHWJGJ-2"],"deviceType":2,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+
+ {"address":"10.140.3.192","deviceName":"闂╬lc6","deviceNo":["5"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.183","deviceName":"闂╬lc7","deviceNo":["13"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.194","deviceName":"闂╬lc8","deviceNo":["12"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.188","deviceName":"闂╬lc9","deviceNo":["7"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.185","deviceName":"闂╬lc10","deviceNo":["15","185"],"location":[""],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.186","deviceName":"闂╬lc11","deviceNo":["186"],"location":[""],"deviceType":1,"enable":1},
+
{"address":"10.140.3.196","deviceName":"闂╬lc12","deviceNo":["6"],"location":[""],"deviceType":1,"enable":1},
- {"address":"192.168.1.142","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
- {"address":"192.168.10.86","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"location":["YWLSXBQTSJ"],"areaPriy":[],"deviceType":13,"enable":1},
+
+ {"address":"10.140.3.197","deviceName":"闂╬lc16","deviceNo":["16"],"location":[""],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.184","deviceName":"鐡剁洊550缈绘枟鏈�,"deviceNo":["","184"],"location":["SGFDJ-1"],"deviceType":4,"areaPriy":["PGMKCK"],"enable":1},
+
+ {"address":"10.140.3.187","deviceName":"鐡剁洊5L缈绘枟鏈�,"deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
+
+ {"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.8.65","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
+
+
</deviceInfo>
-
-
+
<!--
- DoorNo 涓婃姤鐨勯棬鍙枫� 184,185閮藉畾鐨勯棬鍙�0
+ {"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1}
+ DoorNo 涓婃姤鐨勯棬鍙枫� 184,185 鑷畾鐨勯棬鍙�0
deviceNo 锛岀粰184锛�85 鑷繁瀹�涓棬鍙枫�鍐欒繖閲屻�
SignOpen 寮�棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
SignClose 鍏抽棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
@@ -92,30 +146,23 @@
-->
<DoorOneToMany>
<![CDATA[[
- {"DoorNo":"10","deviceNo":["184","15"],"SignOpen":["21","21"],"SignClose":["20","20"]},
+ {"DoorNo":"10","deviceNo":["184","185"],"SignOpen":["21","21"],"SignClose":["20","20"]},
{"DoorNo":"11","deviceNo":["187","186"],"SignOpen":["21","21"],"SignClose":["20","20"]},
]]]>
</DoorOneToMany>
-
- <!--
- NotUsingBolArea 闈炲嵆浜ф弧妗嗕綅銆� 鐡剁洊鐨勫叆搴撳爢鍙犱綅锛岀炕鏂楁満鍑哄簱绾胯竟浣�- UsingBolArea 鍗充骇婊℃浣� 杩欎釜缈绘枟鏈洪厤缃氨琛屼簡
- NotUsingEmpty 闈炲嵆浜х┖妗嗕綅锛岀┖妗嗗爢鍙犱綅 缈绘枟鏈哄叆搴撳爢鍙犱綅锛岀摱鐩栫殑鍑哄簱绾胯竟浣�- UsingEmpty 鍗充骇绌烘浣嶃� 杩欎釜鐡剁洊閰嶇疆灏辫浜�- -->
- <BOLArea>
- <![CDATA[[
- {"DeviceName":"鏃犺弻鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":2},
- {"DeviceName":"姘寸洊鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":3},
- {"DeviceName":"姘寸洊缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":4},
- {"DeviceName":"鏃犺弻缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":6},
- {"DeviceName":"姘寸嚎缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":10},
- ]]]>
- </BOLArea>
+
+
<!--
-->
- <!-- 涓嬬嚎浣嶇疆閰嶇疆銆� 浠庝笂鍒颁笅鍒嗘帓锛屼粠宸﹀埌鍙�鍒嗗垪 -->
+ <!-- 涓嬬嚎浣嶇疆閰嶇疆銆�+
+{"address":"10.140.3.185","deviceName":"550缈绘枟鏈�,"deviceNo":["","10"],"location":["SGFDJ-1"],"deviceType":6,"enable":1},
+
+{"address":"10.140.3.186","deviceName":"5L缈绘枟鏈�,"deviceNo":["","11"],"location":["SXFDJ-1"],"deviceType":6,"enable":1},
+
+
+ {"address":"10.140.3.190","deviceName":"闂╬lc5","deviceNo":["12"],"location":[],"deviceType":1,"enable":1},浠庝笂鍒颁笅鍒嗘帓锛屼粠宸﹀埌鍙�鍒嗗垪 -->
<!--
1-1鍙锋棤鑿�鍙锋棤鑿�鍙锋棤鑿� 2 - 1鍙锋按鐩�@@ -140,35 +187,84 @@
]]]>
</inStockCacheBit>-->
<!--
- agv灏忚溅鐨勫彇鏀剧偣浣�-
Location:璐т綅缂栫爜
StartBit锛氫綔涓鸿捣鐐规椂鐨勭珯鐐� EndBit锛氫綔涓虹粓鐐规椂鐨勭珯鐐� -->
-
<MoreSites>
<![CDATA[[
- {"Location":"JCJYKK-1P-1L-1C","StartBit":178,"EndBit":1335},
- {"Location":"JCJYKK-1P-2L-1C","StartBit":175,"EndBit":1336},
- {"Location":"JCJYMK-1P-1L-1C","StartBit":184,"EndBit":1333},
- {"Location":"JCJYMK-1P-2L-1C","StartBit":181,"EndBit":1334},
- {"Location":"JCJYMK-1P-3L-1C","StartBit":1372,"EndBit":1418},
- {"Location":"JCJYMK-1P-4L-1C","StartBit":1374,"EndBit":1419},
- {"Location":"鎺ラ┏鍖�BACK","StartBit":1374,"EndBit":1419},
+ {"Location":"JCJYKK1-1","StartBit":3372,"EndBit":3372},
+ {"Location":"JCJYKK2-1","StartBit":3370,"EndBit":3370},
+ {"Location":"JCJYKK3-1","StartBit":3367,"EndBit":3367},
+ {"Location":"JCJYKK1-4","StartBit":3368,"EndBit":3368},
+ {"Location":"550JCJYMK1-1","StartBit":1425,"EndBit":1424},
+ {"Location":"550JCJYMK2-1","StartBit":1426,"EndBit":1423},
+ {"Location":"550JCJYMK3-1","StartBit":1478,"EndBit":1477},
+ {"Location":"550JCJYMK4-1","StartBit":3506,"EndBit":3505},
+ {"Location":"5LJCJYMK1-1","StartBit":1488,"EndBit":1487},
+ {"Location":"5LJCJYMK2-1","StartBit":1489,"EndBit":1486},
+ {"Location":"5LJCJYMK3-1","StartBit":1335,"EndBit":178},
+ {"Location":"5LJCJYMK4-1","StartBit":1336,"EndBit":1528},
+ {"Location":"SXJCJY1-1","StartBit":3485,"EndBit":3484},
+ {"Location":"SXJCJY2-1","StartBit":3482,"EndBit":3481},
+ {"Location":"SXJCJY3-1","StartBit":3483,"EndBit":3480},
+ {"Location":"SXJCJY4-1","StartBit":3487,"EndBit":3486},
+ {"Location":"SIXJCJY1-1","StartBit":3471,"EndBit":3470},
+ {"Location":"SIXJCJY2-1","StartBit":3469,"EndBit":3468},
+ {"Location":"SIXJCJY3-1","StartBit":3466,"EndBit":3465},
+ {"Location":"QXZXZZQ1-1","StartBit":5450,"EndBit":5523},
+ {"Location":"QXZXZZQ1-2","StartBit":5455,"EndBit":5524},
+ {"Location":"QXZXZZQ1-3","StartBit":5454,"EndBit":5525},
+ {"Location":"QXZXZZQ1-4","StartBit":5453,"EndBit":5526},
+ {"Location":"QXZXZZQ1-5","StartBit":5452,"EndBit":5527},
+ {"Location":"QXZXZZQ1-6","StartBit":5451,"EndBit":5528},
+ {"Location":"QXZXZZQ1-7","StartBit":5463,"EndBit":5529},
+ {"Location":"QXZXZZQ1-8","StartBit":5464,"EndBit":5530},
+ {"Location":"QXZXZZQ2-1","StartBit":5497,"EndBit":5562},
+ {"Location":"QXZXZZQ2-2","StartBit":5502,"EndBit":5561},
+ {"Location":"QXZXZZQ2-3","StartBit":5501,"EndBit":5560},
+ {"Location":"QXZXZZQ2-4","StartBit":5500,"EndBit":5559},
+ {"Location":"QXZXZZQ2-5","StartBit":5499,"EndBit":5558},
+ {"Location":"QXZXZZQ2-6","StartBit":5498,"EndBit":5557},
+ {"Location":"QXZXZZQ2-7","StartBit":5503,"EndBit":5556},
+ {"Location":"QXZXZZQ2-8","StartBit":5504,"EndBit":5555},
+ {"Location":"QXZXZZQ3-1","StartBit":5506,"EndBit":5570},
+ {"Location":"QXZXZZQ3-2","StartBit":5511,"EndBit":5569},
+ {"Location":"QXZXZZQ3-3","StartBit":5510,"EndBit":5568},
+ {"Location":"QXZXZZQ3-4","StartBit":5509,"EndBit":5567},
+ {"Location":"QXZXZZQ3-5","StartBit":5508,"EndBit":5566},
+ {"Location":"QXZXZZQ3-6","StartBit":5507,"EndBit":5565},
+ {"Location":"QXZXZZQ3-7","StartBit":5512,"EndBit":5564},
+ {"Location":"QXZXZZQ3-8","StartBit":5513,"EndBit":5563},
+ {"Location":"QXZXZZQ4-1","StartBit":5515,"EndBit":5578},
+ {"Location":"QXZXZZQ4-2","StartBit":5520,"EndBit":5577},
+ {"Location":"QXZXZZQ4-3","StartBit":5519,"EndBit":5576},
+ {"Location":"QXZXZZQ4-4","StartBit":5518,"EndBit":5575},
+ {"Location":"QXZXZZQ4-5","StartBit":5517,"EndBit":5574},
+ {"Location":"QXZXZZQ4-6","StartBit":5516,"EndBit":5573},
+ {"Location":"QXZXZZQ4-7","StartBit":5521,"EndBit":5572},
+ {"Location":"QXZXZZQ4-8","StartBit":5522,"EndBit":5571},
+ {"Location":"WJBQJBQ1-1&BACK","StartBit":7445,"EndBit":7443},
+ {"Location":"WJBQJBQ2-1&BACK","StartBit":7446,"EndBit":7444},
]]]>
</MoreSites>
- <!--閰嶇疆 鍗充骇 绌�婊�搴撳尯锛岄潪鍗充骇搴�绌�婊�鍖�
- 1.鍗充骇婊�- 2.鍗充骇绌�- 3 闈炲嵆浜ф弧
- 4.闈炲嵆浜х┖
+ <!--
+
+ {"DeviceName":"4L5L绾跨炕鏂楁満","NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":10},
-->
- <AreaSet>
+ <BOLArea>
<![CDATA[[
- {"Area":"JCJYKK","AreaType":2},
+ {"DeviceName":"涓�彿鏃犺弻鐩栨満","NotUsingBolArea":"","UsingBolArea":"XQX3JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX3WJGJCJYKK","deviceType":2},
+
+ {"DeviceName":"浜屽彿鏃犺弻鐩栨満","NotUsingBolArea":"","UsingBolArea":"XQX4JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX3WJGJCJYKK","deviceType":2},
+ {"DeviceName":"QX3鏃犺弻鐩栫炕鏂楁満","NotUsingBolArea":"QX3QX4MKRK","UsingBolArea":"XQX3JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX34WJGJCJYKK","deviceType":6},
+ {"DeviceName":"QX4鏃犺弻鐩栫炕鏂楁満","NotUsingBolArea":"QX3QX4MKRK","UsingBolArea":"XQX4JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX34WJGJCJYKK","deviceType":6},
+ {"DeviceName":"姘寸洊鏈�,"NotUsingBolArea":"SGHRCW","UsingBolArea":"SGJCJYMK","NotUsingEmpty":"PGKKCK","UsingEmpty":"SGJCJYKK","deviceType":3},
+ {"DeviceName":"鐡剁洊550缈绘枟鏈�,"NotUsingBolArea":"SGHCW","UsingBolArea":"SGJCJYMK","NotUsingEmpty":"SGKKHRCW","UsingEmpty":"SGJCJYKK","deviceType":4},
+ {"DeviceName":"鐡剁洊5L缈绘枟鏈�,"NotUsingBolArea":"SGRGHCW","UsingBolArea":"","NotUsingEmpty":"SGKKHRCW","UsingEmpty":"","deviceType":10},
+
]]]>
- </AreaSet>
-
+ </BOLArea>
+
</Custom>
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 0327980..84b0878 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1074,6 +1074,7 @@
}
}
if (dsll.Any())
+ {
foreach (var r in dsll)
{
foreach (var rows in r.Value.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
@@ -1148,9 +1149,9 @@
if (arloclist.Any())
{
if (EdnRarea == "YWLWJJB")//绾哥鏃犺弻鎺ラ┏鍖�- // InworkLock = true;
- //else InworkLock = false;
- //if (od.S_ZZ_AREA == "YWLWJJB")
+ // InworkLock = true;
+ //else InworkLock = false;
+ //if (od.S_ZZ_AREA == "YWLWJJB")
{
if (InworkLock)
continue;
@@ -1182,7 +1183,7 @@
LogHelper.Info($"鏌ヨ捣鐐规湁澶氬皯鍚屽搧绉嶇殑鐗╂枡 寮�");
var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == "YWLRGDD" && p.S_TYPE == _clrel0.S_TYPE);
- var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).Includes(e => e.LocCntrRel, p => p.CntrItemRel).ToList();
+ var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
LogHelper.Info($"璧风偣瑕佸叆CD鐨勬湁澶氬皯鎵樼洏鏁伴噺涓簕lstCanOutL.Count()}");
//鍒ゆ柇缁堢偣鎺掕兘鍏ュ灏� 灏戜簬鍏ュ簱鎵樼洏鏁板垯澶氬紑涓�帓 EndMum
var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "鏃� && inlockLis.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
@@ -1281,7 +1282,11 @@
}
}
}
- else if (InworkLock) InworkLock = false;
+ }
+ else if (InworkLock)
+ {
+ InworkLock = false;
+ }
}
catch (Exception ex)
{
@@ -3640,65 +3645,171 @@
public int Row { get; set; }
}
+
/// <summary>
- /// 鍘熺墿鏂欑焊绠卞嚭搴�+ /// AB鍖虹墿鏂欎笉瓒宠嚜鍔ㄨ浆杩� /// </summary>
- public static void AutoRun13TSJ()
+ public static void ZdzyABArea()
{
- Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
+ try
{
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
- // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
- var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
- //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�- var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
- if (itemTRUN)
- { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�-
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
- return;
- }
- //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�-
- //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
- Dictitems TrunStart = null;
- foreach (var area in CDlist)
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
+ foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
- if (dsi.TryGetValue(area, out var dictitems1))
+ string pline = PLC.deviceName;
+ if (PLC.deviceName.Contains("T2"))
+ pline = "T2鎻愬崌鏈�绾哥";
+
+ var orkOrd = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�);
+ if (orkOrd.Any())
{
- var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
- foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
+ foreach (var od in orkOrd)
{
- if (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW);
+ //鏌ヨ鍙敤璐т綅鏈夊灏�+ List<string> Ky = new List<string>() { "鏃�, "鍑哄簱閿�, "鍏ュ簱閿� };
+ var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
+ var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
+ LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 鎬诲叡鑳界敤鐨勮揣浣嶆暟{loclistK} -7");
+ if (count <= loclistK - 7)
{
- TrunStart = d;
- break;
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
+ // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
+ var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
+
+ //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ if (itemTRUN)
+ { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+
+ LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ return;
+ }
+ //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+
+ //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
+ Dictitems TrunStart = new Dictitems();
+ foreach (var area in CDlist)
+ {
+ //var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+
+ //ca.And((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME);
+ var lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME).ToList();
+ List<string> CRk = new List<string>() { "鍑哄簱閿�, "鍏ュ簱閿� };
+ var EndMum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == area && CRk.Contains(l.S_LOCK_STATE)).ToList();
+ var RowLock = EndMum.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
+ foreach (var item in RowLock)
+ {
+ lstCanOutL.RemoveAll(e => e.N_ROW == item.N_ROW);
+ }
+ if (lstCanOutL.Count() > 0)
+ {
+ var LstCan = newDb.Queryable<LocCntrRel>().Where(a => lstCanOutL.Select(e => e.S_LOC_CODE).ToList().Contains(a.S_LOC_CODE)).ToList();
+ var loc = lstCanOutL.Find(e => e.S_LOC_CODE == LstCan.OrderBy(c => c.T_CREATE).FirstOrDefault().S_LOC_CODE);
+ TrunStart.area = area;
+ TrunStart.Row = loc.N_ROW;
+ }
+ //if (dsi.TryGetValue(area, out var dictitems1))
+ //{
+
+ // var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
+ // foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
+ // {
+ // if (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ // {
+ // TrunStart = d;
+ // break;
+ // }
+ // }
+ //}
+ }
+ LogHelper.Info($"ZdzyABArea{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
+ if (TrunStart?.area != null)
+ WCSHelper.Do(db =>
+ {
+ db.Insertable(new YWLZXtake
+ {
+ S_START_AREA = TrunStart.area,
+ N_START_ROW = TrunStart.Row,
+ S_END_AREA = od.S_ROW,
+ S_ZX_STATE = "鎵ц",
+ S_ITEM_CODE = od.SQL_ItemCode,
+ S_ITEM_NAME = od.SQL_ItemName,
+ S_CJ_NAME = od.S_CJ_NAME,
+ S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ }).ExecuteCommand();
+ });
+
}
}
}
}
- LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
- if (TrunStart != null)
- WCSHelper.Do(db =>
- {
- db.Insertable(new YWLZXtake
- {
- S_START_AREA = TrunStart.area,
- N_START_ROW = TrunStart.Row,
- S_END_AREA = od.S_ROW,
- S_ZX_STATE = "鎵ц",
- S_ITEM_CODE = od.SQL_ItemCode,
- S_ITEM_NAME = od.SQL_ItemName,
- S_CJ_NAME = od.S_CJ_NAME,
- S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
- }).ExecuteCommand();
- });
- };
- //var TaskSiggg = Settings.GetTimeStamp();
- //var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
- //var WorkOrder = new List<YWLWorkOrder>();
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"ZdzyABArea 瑙﹀彂杞繍 鎶ラ敊:{ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鍘熺墿鏂欑焊绠卞嚭搴�+ /// </summary>
+ public static void AutoRun13TSJ()
+ {
+ //Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
+ //{
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
+ // // 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
+ // var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
+ // //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ // var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ // if (itemTRUN)
+ // { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ // return;
+ // }
+ // //浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�+
+ // //鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
+ // Dictitems TrunStart = null;
+ // foreach (var area in CDlist)
+ // {
+ // if (dsi.TryGetValue(area, out var dictitems1))
+ // {
+ // var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
+ // foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
+ // {
+ // if (arearowsloc.Exists(x => x.N_ROW == d.Row))
+ // {
+ // TrunStart = d;
+ // break;
+ // }
+ // }
+ // }
+ // }
+
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
+ // if (TrunStart != null)
+ // WCSHelper.Do(db =>
+ // {
+ // db.Insertable(new YWLZXtake
+ // {
+ // S_START_AREA = TrunStart.area,
+ // N_START_ROW = TrunStart.Row,
+ // S_END_AREA = od.S_ROW,
+ // S_ZX_STATE = "鎵ц",
+ // S_ITEM_CODE = od.SQL_ItemCode,
+ // S_ITEM_NAME = od.SQL_ItemName,
+ // S_CJ_NAME = od.S_CJ_NAME,
+ // S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ // }).ExecuteCommand();
+ // });
+ //};
foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
{
string pline = PLC.deviceName;
@@ -3716,34 +3827,6 @@
if (locs.Find(x => x.N_CURRENT_NUM > 0) != null) //鎷嗗灈鏈夎揣 涓嶅垽鏂� continue;
can = true;
-
- //var source1 = orkOrd.FirstOrDefault();
- //foreach (var item in list)
- //{
- // YWLWorkOrder source = new YWLWorkOrder();
- // source.SQL_PLineNo = source1.SQL_PLineNo;
- // source.FuLe_PLine_No = source1.FuLe_PLine_No;
- // source.SQL_LinkLineNO = source1.SQL_LinkLineNO;
- // source.SQL_Area = item;
- // source.SQL_UsingNow = source1.SQL_UsingNow;
- // source.SQL_State = source1.SQL_State;
- // source.SQL_WorkNo = source1.SQL_WorkNo;
- // source.SQL_ItemCode = source1.SQL_ItemCode;
- // source.SQL_ItemName = source1.SQL_ItemName;
- // source.SQL_charge = source1.SQL_charge;
- // source.SQL_Total = source1.SQL_Total;
- // source.SQL_PLAN_END = source1.SQL_PLAN_END;
- // source.SQL_Modify_TIme = source1.SQL_Modify_TIme;
- // source.OutNum = source1.OutNum;
- // source.WorkType = source1.WorkType;
- // source.MidArea = source1.MidArea;
- // source.TagOver = source1.TagOver;
- // source.TagOverTime = source1.TagOverTime;
- // source.S_BQ_TRAY_TYPE = source1.S_BQ_TRAY_TYPE;
- // source.S_CJ_NAME = source1.S_CJ_NAME;
- // source.S_ROW = item;
- // WorkOrder.Add(source);
- //}
}
orkOrd = orkOrd.FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10);
@@ -3829,15 +3912,18 @@
//妫�祴鎸囧畾搴撳尯鐨勭墿鏂欐帓鎬绘暟閲� if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
{
- var rows = dictitems1.Select(x => x.Row).Distinct();
- var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
- var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
- LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 5");
- if (count < 5)
- {
- autoTurn = true;
- _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
- }
+ //var rows = dictitems1.Select(x => x.Row).Distinct();
+ //var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
+ ////鏌ヨ鍙敤璐т綅鏈夊灏�+ //List<string> Ky = new List<string>() { "鏃�, "鍑哄簱閿�, "鍏ュ簱閿� };
+ //var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
+ //var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�).Sum(x => x.N_CURRENT_NUM);
+ //LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 鍑哄簱浣欓噺鍒ゆ柇鏄惁闇�杞繍銆�{count}< 鎬诲叡鑳界敤鐨勮揣浣嶆暟{loclistK} -7");
+ //if (count < loclistK - 7)
+ //{
+ // autoTurn = true;
+ // _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ //}
}
}
Location Endbit = null;
@@ -3881,10 +3967,17 @@
b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, jbbit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
else
b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
+
if (b)
{
- var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
var db = new SqlHelper<object>().GetInstance();
+ od.TagOverTime = DateTime.Now;
+ od.TagOver = StartBit.S_AREA_CODE;
+ var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
+ LogHelper.Info($"涓婃彁鍗囨満浠诲姟 鏇存柊宸ュ崟鐨勬椂闂村奖鍝嶈鏁� {ggf}");
+
+ var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+
//缁欑粓鐐归攣瀹氫綇
if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
{
@@ -3905,9 +3998,7 @@
// }
//}
//else db.Insertable(r).ExecuteCommand();
- od.TagOverTime = DateTime.Now;
- od.TagOver = StartBit.S_AREA_CODE;
- db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
+
//break;
}
}
@@ -3918,10 +4009,10 @@
}
}
}
- else
- {
- _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
- }
+ //else
+ //{
+ // _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ(od);
+ //}
}
}
}
diff --git a/HH.WCS.QingXiNongfu/device/TcpServer.cs b/HH.WCS.QingXiNongfu/device/TcpServer.cs
index 975ee0b..c89c3c4 100644
--- a/HH.WCS.QingXiNongfu/device/TcpServer.cs
+++ b/HH.WCS.QingXiNongfu/device/TcpServer.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Net;
using System.Net.Sockets;
+using System.Text.RegularExpressions;
namespace HH.WCS.QingXigongchang.device
{
@@ -105,9 +106,18 @@
Console.WriteLine(remote_ip + "" + message);
if (message.Substring(0, 4) == "3f00" && message.Substring(message.Length - 4) == "0d0a")
{
+ var list = Regex.Split(message, "0d0a", RegexOptions.IgnoreCase).Distinct().ToList();
+ foreach (var item in list)
+ {
+ if (!string.IsNullOrEmpty(item))
+ {
+ string msg = message.Replace(@"0d", "").Replace(@"0a", "").Replace(@"0d0a", "").Trim();
+ PlcHelper.Receive(remote_ip, msg);
+ }
+ }
//鏄剧ず娑堟伅
- string msg = message.Replace(@"0d", "").Replace(@"0a", "").Replace(@"0d0a", "").Trim();
- PlcHelper.Receive(remote_ip, msg);
+ //string msg = message.Replace(@"0d", "").Replace(@"0a", "").Replace(@"0d0a", "").Trim();
+ //PlcHelper.Receive(remote_ip, msg);
Array.Clear(buffers[remote_ip], 0, buffers[remote_ip].Length);//娓呯┖褰撳墠IP Buffer
}
else
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index d2e5f84..27022f3 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -144,7 +144,6 @@
}
}
-
private static void Analysis13(string data, deviceInfo plc)
{
//鐢ㄤ簬 鍑哄簱鏃�鏄惁鍙互鐩磋揪 鎻愬崌鏈恒� 00 鍚庨潰杩橀渶澧炲姞閫�枡宸ュ崟澶勭悊銆�
@@ -368,7 +367,7 @@
if (sBit != null)
{
var sign = Settings.GetTimeStamp();
- var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 50);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
+ var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 60);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
LogHelper.Info($"鍘熺墿鏂欐惉杩�涓婃彁鍗囨満銆�{sign} 浠诲姟 锛屽垱寤簕res} ");
//var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 50);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
//LogHelper.Info($"鍘熺墿鏂欐惉杩�涓婃彁鍗囨満銆�{sign} 浠诲姟 锛屽垱寤簕res} ");
diff --git a/HH.WCS.QingXiNongfu/settings.xml b/HH.WCS.QingXiNongfu/settings.xml
index fe40669..429ad92 100644
--- a/HH.WCS.QingXiNongfu/settings.xml
+++ b/HH.WCS.QingXiNongfu/settings.xml
@@ -1,26 +1,26 @@
锘�?xml version="1.0" encoding="utf-8" ?>
<Custom>
- <HostToAgvServerUrl>http://192.168.1.146:9988/HostToAGV.cgi</HostToAgvServerUrl>
+ <HostToAgvServerUrl>http://10.140.3.100:9988/HostToAGV.cgi</HostToAgvServerUrl>
<OITcpServerUrl>http://127.0.0.1:5102</OITcpServerUrl>
- <SqlServer>Data Source=192.168.1.137;Initial Catalog=OIMobox;User ID=sa;Password=Am123123</SqlServer>
- <AgvSqlServer></AgvSqlServer>
- <FuleServerUrl>http://127.0.0.1:5102</FuleServerUrl>
- <repoNo>浠撳簱缂栫爜</repoNo>
- <!--鑳氱洊涓婃姤-->
- <MesServerUrl>http://127.0.0.1:5102</MesServerUrl>
- <factoryCode>宸ュ巶缂栧彿</factoryCode>
- <fromSystem>鏉ユ簮绯荤粺锛歁OBOX</fromSystem>
-
- <securityKey></securityKey>
- <tokenfrom></tokenfrom>
-
- <FactoryCode>宸ュ巶缂栫爜</FactoryCode>
- <TaskReportUrl>http://127.0.0.1:6666</TaskReportUrl>
- <TaskReportKey></TaskReportKey>
- <FactoryName>宸ュ巶鍚嶇О</FactoryName>
- <OneSign>鍞竴鏍囪瘑</OneSign>
+ <SqlServer>Data Source=10.140.3.100;Initial Catalog=OIMobox;User ID=sa;Password=qaz-123456</SqlServer>
+ <AgvSqlServer>Data Source=10.140.3.100;Initial Catalog=QX_AGV;User ID=sa;Password=qaz-123456</AgvSqlServer>
+ <FuleServerUrl>http://yst-open-zuul.idc.yst.com.cn/api/yst-open-proxy/</FuleServerUrl>
+ <repoNo>QX00102</repoNo>
+ <securityKey>ebf0bfbbe98542b4804de03bc4ef0a70</securityKey>
+ <tokenfrom>MOBOX</tokenfrom>
+
+ <FactoryCode>20B1</FactoryCode>
+ <TaskReportUrl>http://yst-open-zuul.idc.yst.com.cn/api/yst-open-proxy</TaskReportUrl>
+ <TaskReportKey>ebf0bfbbe98542b4804de03bc4ef0a70</TaskReportKey>
+ <FactoryName>闈掓邯</FactoryName>
+ <OneSign>0050</OneSign>
<!--plc淇℃伅锛宒eviceType=1 鑷姩闂� deviceType=2 鐡剁洊鏈�鏃犺弻鐩� deviceType=3 鐡剁洊鏈�姘寸洊 deviceType=4 缈绘枟鏈猴紙姘寸洊锛� deviceType=5 缈绘枟鏈猴紙鏃犺弻鐩�v1/v2锛� deviceType=6 缈绘枟鏈猴紙鏃犺弻鐩�v6锛� deviceType=7 缈绘枟鏈猴紙鏃犺弻鐩�v8锛�+ <FactoryCode>20B1</FactoryCode>
+ <TaskReportUrl>http://yst-open-zuul-qa.idc.yst.com.cn/api/yst-open-proxy</TaskReportUrl>
+ <TaskReportKey>9b42bdc3f0a94b3f9c31e72d1ab42ea7</TaskReportKey>
+ <FactoryName>闈掓邯</FactoryName>
+ <OneSign>0050</OneSign>
{"address":"10.122.160.35","deviceName":"1鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1005","YLWJG1006"],"deviceType":2,"enable":0},
{"address":"10.122.160.36","deviceName":"2鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1003","YLWJG1004"],"deviceType":2,"enable":0},
{"address":"10.122.160.37","deviceName":"3鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1001","YLWJG1002"],"deviceType":2,"enable":0},
@@ -42,48 +42,102 @@
{"address":"10.122.160.33","deviceName":"闂╬lc4","deviceNo":["9","10"],"location":[],"deviceType":1,"enable":1},
{"address":"10.122.160.34","deviceName":"闂╬lc5","deviceNo":["11","12"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.162","deviceName":"550","deviceNo":["1"],"location":["CX-2","CX-1"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.162","deviceName":"550","deviceNo":["1"],"location":["CX-2","CX-1"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.100","deviceName":"CX2","FuLeLineNo":"QX3","deviceNo":[],"location":["CX2-2","CX2-1","5LCX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16",],"deviceType":9,"enable":1},
鐡跺澂鍏ュ簱鍖� taskPri 榛樿鍊�0 -->
<!--
1 闂紙鐙珛闂級
2 鏃犺弻鐩� 3 姘寸洊
- 4 姘寸洊缈绘枟鏈�鍏ュ簱鍫嗗彔锛屼汉宸ヨВ銆�鍑哄簱浠庡嚭搴撲綅鍑哄埌绾胯竟 绌烘杩涗汉宸ュ尯锛�- 5 鐡跺澂缈绘枟鏈�- 6 鏃犺弻缈绘枟鏈�姝ｅ父鍑哄叆搴撴祦绋� 鍫嗗彔锛屽叆搴擄紝鍑虹嚎杈� 绌烘杩涗汉宸ュ尯锛�+ 4 姘寸洊缈绘枟鏈�+ 5 鏃犺弻缈绘枟鏈�+ 6 鐢垫
8 鐡跺澂
- 9 姘寸嚎 鎴愬搧
- 10 姘寸嚎缈绘枟鏈�浜哄伐鏀剧嚎杈� 绌烘杩涗汉宸ュ尯锛�- 11 鎻愬崌鏈�鐢垫鏈�+ 9 姘寸嚎
-->
<deviceInfo>
<![CDATA[
[
- {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"550","deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
- {"address":"10.140.3.163","deviceName":"娉ㄥ鏈�,"FuLeLineNo":"娉ㄥ鏈�,"deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
- {"address":"10.140.3.161","deviceName":"缈绘枟鏈�,"FuLeLineNo":"缈绘枟鏈�,"deviceNo":["","999"],"location":["FDJ-1P-1L-1C"],"deviceType":5,"enable":1},
+ {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"闈掓邯鎴愬搧浠換X1杈撻�绾�,"deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+ {"address":"10.140.3.163","deviceName":"娉ㄥ鏈�,"deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.175","deviceName":"娉ㄥ鏈�","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.176","deviceName":"娉ㄥ鏈�","deviceNo":["","666"],"location":["ZSJ4-1","ZSJ4-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.150","deviceName":"娉ㄥ鏈�","deviceNo":["","659"],"location":["ZSJ5-1","ZSJ5-2"],"deviceType":8,"enable":1},
+
+ {"address":"10.140.3.161","deviceName":"缈绘枟鏈�,"deviceNo":["","999"],"location":["FDJ-1P-1L-1C"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.181","deviceName":"3绾跨炕鏂楁満","deviceNo":["","979"],"location":["SXFDJ1"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.182","deviceName":"4绾跨炕鏂楁満","deviceNo":["","969"],"location":["SHIFDJ1"],"deviceType":5,"enable":1},
+
{"address":"10.140.3.162","deviceName":"闂╬lc1","deviceNo":["1"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.169","deviceName":"5L550","FuLeLineNo":"5L550","deviceNo":[],"location":["5LCX-3","5LCX-2","5LCX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
- {"address":"10.140.3.165","deviceName":"5L娉ㄥ鏈�,"FuLeLineNo":"5L娉ㄥ鏈�,"deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
- {"address":"10.140.3.167","deviceName":"5L缈绘枟鏈�,"FuLeLineNo":"5L缈绘枟鏈�,"deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
+ {"address":"10.140.3.169","deviceName":"5L550","FuLeLineNo":"闈掓邯鎴愬搧浠換X2杈撻�绾�,"deviceNo":[],"location":["5LCX-3","5LCX-2","5LCX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.177","deviceName":"CX3","FuLeLineNo":"闈掓邯鎴愬搧浠換X3杈撻�绾�,"deviceNo":[],"location":["CX3-2","CX3-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.178","deviceName":"CX4","FuLeLineNo":"闈掓邯鎴愬搧浠換X4杈撻�绾�,"deviceNo":[],"location":["CX4-2","CX4-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
+
+
+ {"address":"10.140.3.165","deviceName":"5L娉ㄥ鏈�,"deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
+ {"address":"10.140.3.167","deviceName":"5L缈绘枟鏈�,"deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
{"address":"10.140.3.155","deviceName":"闂╬lc2","deviceNo":["2"],"location":[],"deviceType":1,"enable":1},
- {"address":"10.140.3.155","deviceName":"涓�ゼ鎼�妤�,"deviceNo":[],"location":["韪㈣涪韪�],"deviceType":11,"enable":1},
+ {"address":"10.140.3.179","deviceName":"闂╬lc3","deviceNo":["3"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.180","deviceName":"闂╬lc4","deviceNo":["4"],"location":[],"deviceType":1,"enable":1},
+
+
+ {"address":"10.140.3.190","deviceName":"QX3鏃犺弻鐩栫炕鏂楁満","deviceNo":["","8"],"location":["QX3FDJ-1"],"deviceType":6,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.191","deviceName":"QX4鏃犺弻鐩栫炕鏂楁満","deviceNo":["","9"],"location":["QX4FDJ-1"],"deviceType":6,"areaPriy":["QX3QX4MKRK"],"enable":1},
+ {"address":"10.140.3.193","deviceName":"涓�彿鏃犺弻鐩栨満","deviceNo":[],"location":["WJG1-1","WJG1-2"],"deviceType":2,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.189","deviceName":"姘寸洊鏈�,"deviceNo":[],"location":["SGJ-1","SGJ-2"],"deviceType":3,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+ {"address":"10.140.3.195","deviceName":"浜屽彿鏃犺弻鐩栨満","deviceNo":[],"location":["RHWJGJ-1","RHWJGJ-2"],"deviceType":2,"areaPriy":["QX3QX4MKRK"],"enable":1},
+
+
+ {"address":"10.140.3.192","deviceName":"闂╬lc6","deviceNo":["5"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.183","deviceName":"闂╬lc7","deviceNo":["13"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.194","deviceName":"闂╬lc8","deviceNo":["12"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.188","deviceName":"闂╬lc9","deviceNo":["7"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.185","deviceName":"闂╬lc10","deviceNo":["15","185"],"location":[""],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.186","deviceName":"闂╬lc11","deviceNo":["186"],"location":[""],"deviceType":1,"enable":1},
+
{"address":"10.140.3.196","deviceName":"闂╬lc12","deviceNo":["6"],"location":[""],"deviceType":1,"enable":1},
- {"address":"192.168.1.142","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
- {"address":"192.168.10.86","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"location":["YWLSXBQTSJ"],"areaPriy":[],"deviceType":13,"enable":1},
+
+ {"address":"10.140.3.197","deviceName":"闂╬lc16","deviceNo":["16"],"location":[""],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.184","deviceName":"鐡剁洊550缈绘枟鏈�,"deviceNo":["","184"],"location":["SGFDJ-1"],"deviceType":4,"areaPriy":["PGMKCK"],"enable":1},
+
+ {"address":"10.140.3.187","deviceName":"鐡剁洊5L缈绘枟鏈�,"deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
+
+ {"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.8.65","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
+
+
</deviceInfo>
-
-
+
<!--
- DoorNo 涓婃姤鐨勯棬鍙枫� 184,185閮藉畾鐨勯棬鍙�0
+ {"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1}
+ DoorNo 涓婃姤鐨勯棬鍙枫� 184,185 鑷畾鐨勯棬鍙�0
deviceNo 锛岀粰184锛�85 鑷繁瀹�涓棬鍙枫�鍐欒繖閲屻�
SignOpen 寮�棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
SignClose 鍏抽棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
@@ -92,30 +146,23 @@
-->
<DoorOneToMany>
<![CDATA[[
- {"DoorNo":"10","deviceNo":["184","15"],"SignOpen":["21","21"],"SignClose":["20","20"]},
+ {"DoorNo":"10","deviceNo":["184","185"],"SignOpen":["21","21"],"SignClose":["20","20"]},
{"DoorNo":"11","deviceNo":["187","186"],"SignOpen":["21","21"],"SignClose":["20","20"]},
]]]>
</DoorOneToMany>
-
- <!--
- NotUsingBolArea 闈炲嵆浜ф弧妗嗕綅銆� 鐡剁洊鐨勫叆搴撳爢鍙犱綅锛岀炕鏂楁満鍑哄簱绾胯竟浣�- UsingBolArea 鍗充骇婊℃浣� 杩欎釜缈绘枟鏈洪厤缃氨琛屼簡
- NotUsingEmpty 闈炲嵆浜х┖妗嗕綅锛岀┖妗嗗爢鍙犱綅 缈绘枟鏈哄叆搴撳爢鍙犱綅锛岀摱鐩栫殑鍑哄簱绾胯竟浣�- UsingEmpty 鍗充骇绌烘浣嶃� 杩欎釜鐡剁洊閰嶇疆灏辫浜�- -->
- <BOLArea>
- <![CDATA[[
- {"DeviceName":"鏃犺弻鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":2},
- {"DeviceName":"姘寸洊鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":3},
- {"DeviceName":"姘寸洊缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":4},
- {"DeviceName":"鏃犺弻缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":6},
- {"DeviceName":"姘寸嚎缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":10},
- ]]]>
- </BOLArea>
+
+
<!--
-->
- <!-- 涓嬬嚎浣嶇疆閰嶇疆銆� 浠庝笂鍒颁笅鍒嗘帓锛屼粠宸﹀埌鍙�鍒嗗垪 -->
+ <!-- 涓嬬嚎浣嶇疆閰嶇疆銆�+
+{"address":"10.140.3.185","deviceName":"550缈绘枟鏈�,"deviceNo":["","10"],"location":["SGFDJ-1"],"deviceType":6,"enable":1},
+
+{"address":"10.140.3.186","deviceName":"5L缈绘枟鏈�,"deviceNo":["","11"],"location":["SXFDJ-1"],"deviceType":6,"enable":1},
+
+
+ {"address":"10.140.3.190","deviceName":"闂╬lc5","deviceNo":["12"],"location":[],"deviceType":1,"enable":1},浠庝笂鍒颁笅鍒嗘帓锛屼粠宸﹀埌鍙�鍒嗗垪 -->
<!--
1-1鍙锋棤鑿�鍙锋棤鑿�鍙锋棤鑿� 2 - 1鍙锋按鐩�@@ -140,35 +187,84 @@
]]]>
</inStockCacheBit>-->
<!--
- agv灏忚溅鐨勫彇鏀剧偣浣�-
Location:璐т綅缂栫爜
StartBit锛氫綔涓鸿捣鐐规椂鐨勭珯鐐� EndBit锛氫綔涓虹粓鐐规椂鐨勭珯鐐� -->
-
<MoreSites>
<![CDATA[[
- {"Location":"JCJYKK-1P-1L-1C","StartBit":178,"EndBit":1335},
- {"Location":"JCJYKK-1P-2L-1C","StartBit":175,"EndBit":1336},
- {"Location":"JCJYMK-1P-1L-1C","StartBit":184,"EndBit":1333},
- {"Location":"JCJYMK-1P-2L-1C","StartBit":181,"EndBit":1334},
- {"Location":"JCJYMK-1P-3L-1C","StartBit":1372,"EndBit":1418},
- {"Location":"JCJYMK-1P-4L-1C","StartBit":1374,"EndBit":1419},
- {"Location":"鎺ラ┏鍖�BACK","StartBit":1374,"EndBit":1419},
+ {"Location":"JCJYKK1-1","StartBit":3372,"EndBit":3372},
+ {"Location":"JCJYKK2-1","StartBit":3370,"EndBit":3370},
+ {"Location":"JCJYKK3-1","StartBit":3367,"EndBit":3367},
+ {"Location":"JCJYKK1-4","StartBit":3368,"EndBit":3368},
+ {"Location":"550JCJYMK1-1","StartBit":1425,"EndBit":1424},
+ {"Location":"550JCJYMK2-1","StartBit":1426,"EndBit":1423},
+ {"Location":"550JCJYMK3-1","StartBit":1478,"EndBit":1477},
+ {"Location":"550JCJYMK4-1","StartBit":3506,"EndBit":3505},
+ {"Location":"5LJCJYMK1-1","StartBit":1488,"EndBit":1487},
+ {"Location":"5LJCJYMK2-1","StartBit":1489,"EndBit":1486},
+ {"Location":"5LJCJYMK3-1","StartBit":1335,"EndBit":178},
+ {"Location":"5LJCJYMK4-1","StartBit":1336,"EndBit":1528},
+ {"Location":"SXJCJY1-1","StartBit":3485,"EndBit":3484},
+ {"Location":"SXJCJY2-1","StartBit":3482,"EndBit":3481},
+ {"Location":"SXJCJY3-1","StartBit":3483,"EndBit":3480},
+ {"Location":"SXJCJY4-1","StartBit":3487,"EndBit":3486},
+ {"Location":"SIXJCJY1-1","StartBit":3471,"EndBit":3470},
+ {"Location":"SIXJCJY2-1","StartBit":3469,"EndBit":3468},
+ {"Location":"SIXJCJY3-1","StartBit":3466,"EndBit":3465},
+ {"Location":"QXZXZZQ1-1","StartBit":5450,"EndBit":5523},
+ {"Location":"QXZXZZQ1-2","StartBit":5455,"EndBit":5524},
+ {"Location":"QXZXZZQ1-3","StartBit":5454,"EndBit":5525},
+ {"Location":"QXZXZZQ1-4","StartBit":5453,"EndBit":5526},
+ {"Location":"QXZXZZQ1-5","StartBit":5452,"EndBit":5527},
+ {"Location":"QXZXZZQ1-6","StartBit":5451,"EndBit":5528},
+ {"Location":"QXZXZZQ1-7","StartBit":5463,"EndBit":5529},
+ {"Location":"QXZXZZQ1-8","StartBit":5464,"EndBit":5530},
+ {"Location":"QXZXZZQ2-1","StartBit":5497,"EndBit":5562},
+ {"Location":"QXZXZZQ2-2","StartBit":5502,"EndBit":5561},
+ {"Location":"QXZXZZQ2-3","StartBit":5501,"EndBit":5560},
+ {"Location":"QXZXZZQ2-4","StartBit":5500,"EndBit":5559},
+ {"Location":"QXZXZZQ2-5","StartBit":5499,"EndBit":5558},
+ {"Location":"QXZXZZQ2-6","StartBit":5498,"EndBit":5557},
+ {"Location":"QXZXZZQ2-7","StartBit":5503,"EndBit":5556},
+ {"Location":"QXZXZZQ2-8","StartBit":5504,"EndBit":5555},
+ {"Location":"QXZXZZQ3-1","StartBit":5506,"EndBit":5570},
+ {"Location":"QXZXZZQ3-2","StartBit":5511,"EndBit":5569},
+ {"Location":"QXZXZZQ3-3","StartBit":5510,"EndBit":5568},
+ {"Location":"QXZXZZQ3-4","StartBit":5509,"EndBit":5567},
+ {"Location":"QXZXZZQ3-5","StartBit":5508,"EndBit":5566},
+ {"Location":"QXZXZZQ3-6","StartBit":5507,"EndBit":5565},
+ {"Location":"QXZXZZQ3-7","StartBit":5512,"EndBit":5564},
+ {"Location":"QXZXZZQ3-8","StartBit":5513,"EndBit":5563},
+ {"Location":"QXZXZZQ4-1","StartBit":5515,"EndBit":5578},
+ {"Location":"QXZXZZQ4-2","StartBit":5520,"EndBit":5577},
+ {"Location":"QXZXZZQ4-3","StartBit":5519,"EndBit":5576},
+ {"Location":"QXZXZZQ4-4","StartBit":5518,"EndBit":5575},
+ {"Location":"QXZXZZQ4-5","StartBit":5517,"EndBit":5574},
+ {"Location":"QXZXZZQ4-6","StartBit":5516,"EndBit":5573},
+ {"Location":"QXZXZZQ4-7","StartBit":5521,"EndBit":5572},
+ {"Location":"QXZXZZQ4-8","StartBit":5522,"EndBit":5571},
+ {"Location":"WJBQJBQ1-1&BACK","StartBit":7445,"EndBit":7443},
+ {"Location":"WJBQJBQ2-1&BACK","StartBit":7446,"EndBit":7444},
]]]>
</MoreSites>
- <!--閰嶇疆 鍗充骇 绌�婊�搴撳尯锛岄潪鍗充骇搴�绌�婊�鍖�
- 1.鍗充骇婊�- 2.鍗充骇绌�- 3 闈炲嵆浜ф弧
- 4.闈炲嵆浜х┖
+ <!--
+
+ {"DeviceName":"4L5L绾跨炕鏂楁満","NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":10},
-->
- <AreaSet>
+ <BOLArea>
<![CDATA[[
- {"Area":"JCJYKK","AreaType":2},
+ {"DeviceName":"涓�彿鏃犺弻鐩栨満","NotUsingBolArea":"","UsingBolArea":"XQX3JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX3WJGJCJYKK","deviceType":2},
+
+ {"DeviceName":"浜屽彿鏃犺弻鐩栨満","NotUsingBolArea":"","UsingBolArea":"XQX4JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX3WJGJCJYKK","deviceType":2},
+ {"DeviceName":"QX3鏃犺弻鐩栫炕鏂楁満","NotUsingBolArea":"QX3QX4MKRK","UsingBolArea":"XQX3JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX34WJGJCJYKK","deviceType":6},
+ {"DeviceName":"QX4鏃犺弻鐩栫炕鏂楁満","NotUsingBolArea":"QX3QX4MKRK","UsingBolArea":"XQX4JCMKRK","NotUsingEmpty":"PGKKCK","UsingEmpty":"QX34WJGJCJYKK","deviceType":6},
+ {"DeviceName":"姘寸洊鏈�,"NotUsingBolArea":"SGHRCW","UsingBolArea":"SGJCJYMK","NotUsingEmpty":"PGKKCK","UsingEmpty":"SGJCJYKK","deviceType":3},
+ {"DeviceName":"鐡剁洊550缈绘枟鏈�,"NotUsingBolArea":"SGHCW","UsingBolArea":"SGJCJYMK","NotUsingEmpty":"SGKKHRCW","UsingEmpty":"SGJCJYKK","deviceType":4},
+ {"DeviceName":"鐡剁洊5L缈绘枟鏈�,"NotUsingBolArea":"SGRGHCW","UsingBolArea":"","NotUsingEmpty":"SGKKHRCW","UsingEmpty":"","deviceType":10},
+
]]]>
- </AreaSet>
-
+ </BOLArea>
+
</Custom>
diff --git a/HH.WCS.QingXiNongfu/settings1.xml b/HH.WCS.QingXiNongfu/settings1.xml
new file mode 100644
index 0000000..fe40669
--- /dev/null
+++ b/HH.WCS.QingXiNongfu/settings1.xml
@@ -0,0 +1,174 @@
+锘�?xml version="1.0" encoding="utf-8" ?>
+<Custom>
+ <HostToAgvServerUrl>http://192.168.1.146:9988/HostToAGV.cgi</HostToAgvServerUrl>
+ <OITcpServerUrl>http://127.0.0.1:5102</OITcpServerUrl>
+ <SqlServer>Data Source=192.168.1.137;Initial Catalog=OIMobox;User ID=sa;Password=Am123123</SqlServer>
+ <AgvSqlServer></AgvSqlServer>
+ <FuleServerUrl>http://127.0.0.1:5102</FuleServerUrl>
+ <repoNo>浠撳簱缂栫爜</repoNo>
+ <!--鑳氱洊涓婃姤-->
+ <MesServerUrl>http://127.0.0.1:5102</MesServerUrl>
+ <factoryCode>宸ュ巶缂栧彿</factoryCode>
+ <fromSystem>鏉ユ簮绯荤粺锛歁OBOX</fromSystem>
+
+ <securityKey></securityKey>
+ <tokenfrom></tokenfrom>
+
+ <FactoryCode>宸ュ巶缂栫爜</FactoryCode>
+ <TaskReportUrl>http://127.0.0.1:6666</TaskReportUrl>
+ <TaskReportKey></TaskReportKey>
+ <FactoryName>宸ュ巶鍚嶇О</FactoryName>
+ <OneSign>鍞竴鏍囪瘑</OneSign>
+
+ <!--plc淇℃伅锛宒eviceType=1 鑷姩闂� deviceType=2 鐡剁洊鏈�鏃犺弻鐩� deviceType=3 鐡剁洊鏈�姘寸洊 deviceType=4 缈绘枟鏈猴紙姘寸洊锛� deviceType=5 缈绘枟鏈猴紙鏃犺弻鐩�v1/v2锛� deviceType=6 缈绘枟鏈猴紙鏃犺弻鐩�v6锛� deviceType=7 缈绘枟鏈猴紙鏃犺弻鐩�v8锛�+ {"address":"10.122.160.35","deviceName":"1鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1005","YLWJG1006"],"deviceType":2,"enable":0},
+ {"address":"10.122.160.36","deviceName":"2鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1003","YLWJG1004"],"deviceType":2,"enable":0},
+ {"address":"10.122.160.37","deviceName":"3鍙锋棤鑿岀洊鏈�,"deviceNo":[],"location":["YLWJG1001","YLWJG1002"],"deviceType":2,"enable":0},
+ {"address":"192.168.1.87","deviceName":"1鍙锋按鐩栨満","deviceNo":[],"location":["SGJNB5","SGJNB6"],"deviceType":3,"enable":1},
+ {"address":"10.122.160.39","deviceName":"2鍙锋按鐩栨満","deviceNo":[],"location":["SGJNB3","SGJNB4"],"deviceType":3,"enable":0},
+ {"address":"10.122.160.40","deviceName":"3鍙锋按鐩栨満","deviceNo":[],"location":["SGJNB7","SGJNB8"],"deviceType":3,"enable":0},
+ {"address":"10.122.160.41","deviceName":"4鍙锋按鐩栨満","deviceNo":[],"location":["SGJNB1","SGJNB2"],"deviceType":3,"enable":0},
+
+ {"address":"10.122.160.42","deviceName":"V1/V2","deviceNo":["","13"],"location":["FDJ5469"],"deviceType":5,"enable":1},
+ {"address":"10.122.160.43","deviceName":"V3/V7","deviceNo":["","14"],"location":["FDJ5457"],"deviceType":4,"enable":1},
+ {"address":"127.0.0.1","deviceName":"V6","deviceNo":["","15"],"location":["FDJ5458"],"deviceType":6,"enable":1},
+
+ {"address":"10.122.160.46","deviceName":"V8","deviceNo":["","16"],"location":["CCC3"],"deviceType":7,"enable":0},
+ {"address":"10.122.160.45","deviceName":"V4/V5","deviceNo":["","door1"],"location":["FDJ5459"],"deviceType":4,"enable":0},
+
+ {"address":"10.122.160.30","deviceName":"闂╬lc1","deviceNo":["1","2"],"location":[],"deviceType":1,"enable":1},
+ {"address":"10.122.160.31","deviceName":"闂╬lc2","deviceNo":["4","3"],"location":[],"deviceType":1,"enable":1},
+ {"address":"10.122.160.32","deviceName":"闂╬lc3","deviceNo":["7","6","8","5"],"location":[],"deviceType":1,"enable":1},
+ {"address":"10.122.160.33","deviceName":"闂╬lc4","deviceNo":["9","10"],"location":[],"deviceType":1,"enable":1},
+ {"address":"10.122.160.34","deviceName":"闂╬lc5","deviceNo":["11","12"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.162","deviceName":"550","deviceNo":["1"],"location":["CX-2","CX-1"],"deviceType":9,"enable":1},
+
+ 鐡跺澂鍏ュ簱鍖�+ taskPri 榛樿鍊�0 -->
+ <!--
+ 1 闂紙鐙珛闂級
+ 2 鏃犺弻鐩�+ 3 姘寸洊
+ 4 姘寸洊缈绘枟鏈�鍏ュ簱鍫嗗彔锛屼汉宸ヨВ銆�鍑哄簱浠庡嚭搴撲綅鍑哄埌绾胯竟 绌烘杩涗汉宸ュ尯锛�+ 5 鐡跺澂缈绘枟鏈�+ 6 鏃犺弻缈绘枟鏈�姝ｅ父鍑哄叆搴撴祦绋� 鍫嗗彔锛屽叆搴擄紝鍑虹嚎杈� 绌烘杩涗汉宸ュ尯锛�+ 8 鐡跺澂
+ 9 姘寸嚎 鎴愬搧
+ 10 姘寸嚎缈绘枟鏈�浜哄伐鏀剧嚎杈� 绌烘杩涗汉宸ュ尯锛�+ 11 鎻愬崌鏈�鐢垫鏈�+ -->
+ <deviceInfo>
+ <![CDATA[
+ [
+ {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"550","deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.163","deviceName":"娉ㄥ鏈�,"FuLeLineNo":"娉ㄥ鏈�,"deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
+ {"address":"10.140.3.161","deviceName":"缈绘枟鏈�,"FuLeLineNo":"缈绘枟鏈�,"deviceNo":["","999"],"location":["FDJ-1P-1L-1C"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.162","deviceName":"闂╬lc1","deviceNo":["1"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.169","deviceName":"5L550","FuLeLineNo":"5L550","deviceNo":[],"location":["5LCX-3","5LCX-2","5LCX-1"],"areaPriy":["QX-02","QX-03","QX-04","QX-05"],"deviceType":9,"enable":1},
+ {"address":"10.140.3.165","deviceName":"5L娉ㄥ鏈�,"FuLeLineNo":"5L娉ㄥ鏈�,"deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
+ {"address":"10.140.3.167","deviceName":"5L缈绘枟鏈�,"FuLeLineNo":"5L缈绘枟鏈�,"deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
+
+ {"address":"10.140.3.155","deviceName":"闂╬lc2","deviceNo":["2"],"location":[],"deviceType":1,"enable":1},
+
+ {"address":"10.140.3.155","deviceName":"涓�ゼ鎼�妤�,"deviceNo":[],"location":["韪㈣涪韪�],"deviceType":11,"enable":1},
+ {"address":"10.140.3.196","deviceName":"闂╬lc12","deviceNo":["6"],"location":[""],"deviceType":1,"enable":1},
+ {"address":"192.168.1.142","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
+ {"address":"192.168.10.86","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"location":["YWLSXBQTSJ"],"areaPriy":[],"deviceType":13,"enable":1},
+
+ ]]]>
+ </deviceInfo>
+
+
+ <!--
+ DoorNo 涓婃姤鐨勯棬鍙枫� 184,185閮藉畾鐨勯棬鍙�0
+ deviceNo 锛岀粰184锛�85 鑷繁瀹�涓棬鍙枫�鍐欒繖閲屻�
+ SignOpen 寮�棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
+ SignClose 鍏抽棬淇″彿銆�涓巇eviceNo 1锛� 瀵瑰簲
+ 185 闂ㄥ彿15
+ 184锛�86锛�87 鑷畾涔�+ -->
+ <DoorOneToMany>
+ <![CDATA[[
+ {"DoorNo":"10","deviceNo":["184","15"],"SignOpen":["21","21"],"SignClose":["20","20"]},
+ {"DoorNo":"11","deviceNo":["187","186"],"SignOpen":["21","21"],"SignClose":["20","20"]},
+ ]]]>
+ </DoorOneToMany>
+
+ <!--
+ NotUsingBolArea 闈炲嵆浜ф弧妗嗕綅銆� 鐡剁洊鐨勫叆搴撳爢鍙犱綅锛岀炕鏂楁満鍑哄簱绾胯竟浣�+ UsingBolArea 鍗充骇婊℃浣� 杩欎釜缈绘枟鏈洪厤缃氨琛屼簡
+ NotUsingEmpty 闈炲嵆浜х┖妗嗕綅锛岀┖妗嗗爢鍙犱綅 缈绘枟鏈哄叆搴撳爢鍙犱綅锛岀摱鐩栫殑鍑哄簱绾胯竟浣�+ UsingEmpty 鍗充骇绌烘浣嶃� 杩欎釜鐡剁洊閰嶇疆灏辫浜�+ -->
+ <BOLArea>
+ <![CDATA[[
+ {"DeviceName":"鏃犺弻鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":2},
+ {"DeviceName":"姘寸洊鐡剁洊鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":3},
+ {"DeviceName":"姘寸洊缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":4},
+ {"DeviceName":"鏃犺弻缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":6},
+ {"DeviceName":"姘寸嚎缈绘枟鏈�,"NotUsingBolArea":"F鍗充骇绾胯竟浣峚rea","UsingBolArea":"鍗充骇绾胯竟浣峚rea",NotUsingEmpty":"闈炲嵆浜х┖妗嗗爢鍙犱綅","UsingEmpty":"鍗充骇绾胯竟绌烘浣峚rea","deviceType":10},
+ ]]]>
+ </BOLArea>
+ <!--
+
+ -->
+ <!-- 涓嬬嚎浣嶇疆閰嶇疆銆� 浠庝笂鍒颁笅鍒嗘帓锛屼粠宸﹀埌鍙�鍒嗗垪 -->
+ <!--
+ 1-1鍙锋棤鑿�鍙锋棤鑿�鍙锋棤鑿�+ 2 - 1鍙锋按鐩�+ 3-涓嬬嚎绌烘鍑哄簱浣�+ 34-涓嬬嚎绌烘浣�- 鍑哄簱缂撳瓨銆�
+ 4-涓嬬嚎绌烘鍏ュ簱浣�+ 5-鍗充骇婊℃姘寸洊
+ 6-鍗充骇婊℃鏃犺弻鐩�+ 7-鍗充骇绌烘
+ 8-搴熸枡
+ 9-涓婄嚎鍗充骇婊℃棤鑿�+ 10-涓婄嚎鍗充骇婊℃按鐩�+ 11-鍏ュ簱绌�+ 12-鍗充骇绌�+ 13-鍑哄簱婊℃按鐩�+ 14-鍑哄簱婊℃棤鑿�+ -->
+ <!--<inStockCacheBit>
+ <![CDATA[
+ [
+ {"location":"","locationType":1,"deviceName":"1鍙风摱鍧�}
+ ]]]>
+ </inStockCacheBit>-->
+ <!--
+ agv灏忚溅鐨勫彇鏀剧偣浣�+
+ Location:璐т綅缂栫爜
+ StartBit锛氫綔涓鸿捣鐐规椂鐨勭珯鐐�+ EndBit锛氫綔涓虹粓鐐规椂鐨勭珯鐐�+ -->
+
+ <MoreSites>
+ <![CDATA[[
+ {"Location":"JCJYKK-1P-1L-1C","StartBit":178,"EndBit":1335},
+ {"Location":"JCJYKK-1P-2L-1C","StartBit":175,"EndBit":1336},
+ {"Location":"JCJYMK-1P-1L-1C","StartBit":184,"EndBit":1333},
+ {"Location":"JCJYMK-1P-2L-1C","StartBit":181,"EndBit":1334},
+ {"Location":"JCJYMK-1P-3L-1C","StartBit":1372,"EndBit":1418},
+ {"Location":"JCJYMK-1P-4L-1C","StartBit":1374,"EndBit":1419},
+ {"Location":"鎺ラ┏鍖�BACK","StartBit":1374,"EndBit":1419},
+ ]]]>
+ </MoreSites>
+ <!--閰嶇疆 鍗充骇 绌�婊�搴撳尯锛岄潪鍗充骇搴�绌�婊�鍖�
+ 1.鍗充骇婊�+ 2.鍗充骇绌�+ 3 闈炲嵆浜ф弧
+ 4.闈炲嵆浜х┖
+ -->
+ <AreaSet>
+ <![CDATA[[
+ {"Area":"JCJYKK","AreaType":2},
+ ]]]>
+ </AreaSet>
+
+</Custom>
+
diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index 2dbd375..caf3060 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -276,6 +276,7 @@
/// 寮冪敤锛�鏀逛负璁板綍涓婃搴撳尯-
/// </summary>
public string TagOver { get; internal set; } = "";
+
public DateTime? TagOverTime { get; internal set; }
public string S_BQ_TRAY_TYPE { get; internal set; } = "";
/// <summary>
--
Gitblit v1.9.1