From fcafa52c43d54fb57822f045595e1bbb5de55b29 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 28 七月 2025 08:24:48 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 25 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index 841a51f..532a4c7 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -2721,7 +2721,7 @@
i = 0;
}
- LogHelper.Info($"_methodCache>>>>" + _methodCache.Count + ">>>>" + JsonConvert.SerializeObject(_methodCache.Keys));
+ //LogHelper.Info($"_methodCache>>>>" + _methodCache.Count + ">>>>" + JsonConvert.SerializeObject(_methodCache.Keys));
//Console.WriteLine($"SA2030 浠诲姟鐘舵�锛� =====>");
//Console.WriteLine($"SA2030 浠诲姟鐘舵�锛歿tag.SA2030.RtaskState}- 绌洪棽{tag.SA2030.R5绌洪棽} - barcode:{tag.SA2030.R鎵樼洏鐮亇");
@@ -2746,7 +2746,7 @@
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} {(sx == null ? "闈� : "鏄�)}鎬昏鏈哄櫒浜轰换鍔�);
if (sx == null)
{
- gotoOOOOOOOOO:
+ gotoOOOOOOOOO:
if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
{
// 鍙枡浠诲姟銆�鎸囧畾鐗╂枡涓嶆寚瀹氭墭鐩橈紝闇�鍑哄簱
@@ -2755,28 +2755,32 @@
switch (task.S_START_LOC)
{
case "2030":
- if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
+ //if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
+ //{
+ // LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 2030 鍑哄彛鎵樼洏鍙穥tag.SA2030.R鎵樼洏鐮亇 鍖归厤鏍￠獙銆�);
+ // var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+ // {
+ // cntrCode = tag.SA2030.R鎵樼洏鐮�
+ // type = 1
+ // }));
+ // var strr = JsonConvert.DeserializeObject<MES2234>(str);
+ // if (strr.success && strr.data.materialCode == task.S_INDEX)
+ // {
+ // task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+ // taskservice.Update(task);
+ // goto gotoOOOOOOOOO;
+ // }
+ // else
+ // {
+ // LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�2030 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
+ // }
+ //}
+ //else
+ if (string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 2030 鍑哄彛鎵樼洏鍙穥tag.SA2030.R鎵樼洏鐮亇 鍖归厤鏍￠獙銆�);
- var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
- {
- cntrCode = tag.SA2030.R鎵樼洏鐮�
- type = 1
- }));
- var strr = JsonConvert.DeserializeObject<MES2234>(str);
- if (strr.success && strr.data.materialCode == task.S_INDEX)
- {
- task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
- taskservice.Update(task);
- goto gotoOOOOOOOOO;
- }
- else
- {
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐗╂枡{task.S_INDEX} 涓�2030 鍑哄彛鐨勬墭鐩樼墿鏂檣strr.data.materialCode}涓嶇鍚�);
- }
- }
- else
- {
+ //鍒涘缓鍑哄簱鐩存帴璧嬪�缁檓es浠诲姟銆傞槻姝㈠嚭搴撴參锛屽娆″嚭搴撱�
+
+
//2027 2220 2013.. 璇嗗埆涓�笅锛屽紑濮嬪簱
//1 鐪�7 20 13 鏄惁鏈変换鍔°� 鏈夊垯涓嶅嚭浜嗐� 绛夊嚭鍙ｅ垽鏂尮閰嶃�
//2 閮芥病鏈変换鍔★紝閫愪釜鍖归厤鏄惁绗﹀悎锛屽垯鍑哄簱銆�@@ -2792,7 +2796,7 @@
}
{
var t20132027 = tag.ssx杈撻�绾�s2020;
- LogHelper.Info($"璇嗗埆2027浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
+ LogHelper.Info($"璇嗗埆2020浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) || (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
{
LogHelper.Info($"2020浠诲姟 浠诲姟缁堢偣鏄�030 锛岀粓姝�);
@@ -2801,13 +2805,14 @@
}
{
var t20132027 = tag.ssx杈撻�绾�s2013;
- LogHelper.Info($"璇嗗埆2027浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
+ LogHelper.Info($"璇嗗埆2013浠诲姟 鎵樼洏鍙凤細{t20132027.R鎵樼洏鐮亇 RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) || (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
{
LogHelper.Info($"2013浠诲姟 浠诲姟缁堢偣鏄�030 锛岀粓姝�);
continue;
}
}
+
if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�)
{
var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
@@ -2823,6 +2828,8 @@
tag.ssx杈撻�绾�s2027.wTaskNo = 20272030;
tag.ssx杈撻�绾�s2027.wEbit = 2030;
LogHelper.Info($"2027 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
+ task.S_CNTRS = tag.ssx杈撻�绾�s2027.R鎵樼洏鐮�
+ taskservice.Update(task);
continue;
}
}
@@ -2841,6 +2848,8 @@
tag.ssx杈撻�绾�s2020.wTaskNo = 20202030;
tag.ssx杈撻�绾�s2020.wEbit = 2030;
LogHelper.Info($"2020 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
+ task.S_CNTRS = tag.ssx杈撻�绾�s2020.R鎵樼洏鐮�
+ taskservice.Update(task);
continue;
}
}
@@ -2860,6 +2869,8 @@
tag.ssx杈撻�绾�s2013.wTaskNo = 20132030;
tag.ssx杈撻�绾�s2013.wEbit = 2030;
LogHelper.Info($"2013 > 2030 SSX浠诲姟涓嬪彂瀹屾垚銆�);
+ task.S_CNTRS = tag.ssx杈撻�绾�s2013.R鎵樼洏鐮�
+ taskservice.Update(task);
continue;
}
}
@@ -3010,6 +3021,15 @@
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 1019 RtaskState>{tag.SA1019.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
continue;
}
+ if (!string.IsNullOrEmpty(tag.SA1019.R鎵樼洏鐮� && tag.SA1019.R鎵樼洏鐮�== task.S_CNTRS)
+ {
+
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 1019 鎵樼洏鍙蜂笌浠诲姟涓嶅尮閰嶏紝涓嶆帹閫�);
+ continue;
+ }
}
break;
case "2030":
@@ -3018,6 +3038,15 @@
if (tag.SA2030.RtaskState != 4)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 2030 RtaskState>{tag.SA2030.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
+ continue;
+ }
+ if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮� && tag.SA2030.R鎵樼洏鐮�== task.S_CNTRS)
+ {
+
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 2030 鎵樼洏鍙蜂笌浠诲姟涓嶅尮閰嶏紝涓嶆帹閫�);
continue;
}
}
@@ -3030,6 +3059,15 @@
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3005 RtaskState>{tag.ssx杈撻�绾�s3005.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
continue;
}
+ if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s3005.R鎵樼洏鐮� && tag.ssx杈撻�绾�s3005.R鎵樼洏鐮�== task.S_CNTRS)
+ {
+
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3005 鎵樼洏鍙蜂笌浠诲姟涓嶅尮閰嶏紝涓嶆帹閫�);
+ continue;
+ }
}
break;
case "3010":
@@ -3040,6 +3078,15 @@
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3010 RtaskState>{tag.ssx杈撻�绾�s3010.RtaskState} 鏈敵璇稲GV浠诲姟锛屼笉鎺ㄩ�");
continue;
}
+ if (!string.IsNullOrEmpty(tag.ssx杈撻�绾�s3010.R鎵樼洏鐮� && tag.ssx杈撻�绾�s3010.R鎵樼洏鐮�== task.S_CNTRS)
+ {
+
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 璧风偣 3010 鎵樼洏鍙蜂笌浠诲姟涓嶅尮閰嶏紝涓嶆帹閫�);
+ continue;
+ }
}
break;
}
--
Gitblit v1.9.1