From 2e5f13ec5bbb47ec3462ee8060d9484691808ae1 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 04 七月 2025 18:53:05 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/settings.xml | 4
HH.WCS.QingXiNongfu/Program.cs | 5
HH.WCS.QingXiNongfu/bin/Debug/settings.xml | 4
HH.WCS.QingXiNongfu/wms/LocationHelper.cs | 7
HH.WCS.QingXiNongfu/core/TaskCore.cs | 2
HH.WCS.QingXiNongfu/core/Monitor.cs | 1459 +++++++++++++++++++++++++++++++++++++++++-----------------
HH.WCS.QingXiNongfu/wms/WCSModel.cs | 1
7 files changed, 1,041 insertions(+), 441 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index 82bd5f6..7a98936 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -19,7 +19,6 @@
using System.Threading;
using System.Threading.Tasks;
using Topshelf;
-using static System.Net.Mime.MediaTypeNames;
using Monitor = HH.WCS.QingXigongchang.core.Monitor;
namespace HH.WCS.QingXigongchang
@@ -755,8 +754,8 @@
//鍘熸潗鏂�鑷姩涓浆 - 灞曠ず娴佺▼銆�鍓嶆湡娴嬭瘯鐢ㄧ殑
//GetTask(Monitor.AutoRun),
GetTask(Monitor.YwlTKPEBQ_Auto),//鏍囩鏃犺弻姘寸嚎鍑哄叆搴撱�
- //鍘熸潗鏂欑殑 鏂颁腑杞祦绋嬨�
- GetTask(Monitor.YWL_ZX_Turn),
+ //鍘熸潗鏂欑殑 鏂颁腑杞祦绋嬨�
+ GetTask(Monitor.YWL_ZX_Turn),//--绉诲簱
GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
GetTask(Monitor.AutoRunABD),
GetTask(Monitor.AutoRun13TSJ),
diff --git a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
index c20275e..a0d5f42 100644
--- a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
+++ b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
@@ -127,8 +127,8 @@
{"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.9.167","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.167","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.168","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index ec2cd39..5189a8a 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1413,403 +1413,462 @@
public static string RK_BQCDQ = "SXBQDDKQ";
+ /// <summary>
+ /// 涓按绾胯竟
+ /// </summary>
+ public static string YWLZSXBKQ = "YWLZSXBKQ";
+
+
}
+
+ public static bool LocLock(string AreaCode)
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var TaskListNum = db.Queryable<Location>().Where(l => l.S_AREA_CODE == AreaCode && (l.S_LOCK_STATE == "鍑哄簱閿� || l.S_LOCK_STATE == "鍏ュ簱閿�)).ToList();
+ if (TaskListNum.Any())
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ return false;
+ }
+ }
+ public static object NewLock = new object();
/// <summary>
/// 鎻愭墸 銆傛爣绛俱�PE鑶滃嚭搴� /// </summary>
internal static void YwlTKPEBQ_Auto()
{
- LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶�>>>>>>>>>>>> ", ConsoleColor.Cyan);
- var locsFirst1 = LocationHelper.GetAreaNormalLocList(BQ_PRA.YWLRGDD);
- var db = new SqlHelper<object>().GetInstance();
- var locsFirstA = db.Queryable<LocCntrRel>()//鏍囩缁戝畾蹇呴』閮芥槸鍗曞眰銆�- 娑夊強鍫嗗彔涓庤揣鏋�灞傞棶棰樸�
- .InnerJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
- //.LeftJoin<ItemInfo>((lcr, cir, item) => cir.S_ITEM_CODE == item.S_ITEM_CODE && cir.S_ITEM_NAME == item.S_ITEM_NAME)
- .InnerJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
- .Where((lcr, cir, lo) =>/* cir.S_ITEM_NAME.Contains("鏍囩")&& */ locsFirst1.Select(x => x.S_LOC_CODE).Contains(lo.S_LOC_CODE) && lo.S_AREA_CODE == BQ_PRA.YWLRGDD)
- .Select((lcr, cir, lo) => new locCntItem
- {
- N_CURRENT_NUM = lo.N_CURRENT_NUM,
- S_TYPE = lcr.S_TYPE,
- S_LOC_CODE = lo.S_LOC_CODE,
- S_AREA_CODE = lo.S_AREA_CODE,
- N_ROW = lo.N_ROW,
- N_COL = lo.N_COL,
- HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
- S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
- S_ITEM_CODE = cir.S_ITEM_CODE,
- S_ITEM_NAME = cir.S_ITEM_NAME,
- S_BATCH_NO = cir.S_BATCH_NO,
- S_CJ_NAME = cir.S_CJ_NAME,
- S_CNTR_CODE = cir.S_CNTR_CODE
- })
- .ToList();
- /// 浜哄伐鍫嗗彔鍖虹焊绠�鍜�鏍囩 鏄寜鏍囪瘑+鐗╂枡绛涢�杩涜鍏ュ簱杞繍銆�
- /// 鐗╂枡鍚嶇О鍖呭惈瀵瑰簲绉嶇被杩涜鍏ュ簱銆�- foreach (var item in locsFirstA)
+ lock (NewLock)
{
- if (!string.IsNullOrEmpty(item.S_BATCH_NO))
+ LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶�>>>>>>>>>>>> ", ConsoleColor.Cyan);
+ var locsFirst1 = LocationHelper.GetAreaNormalLocList(BQ_PRA.YWLRGDD);
+ var db = new SqlHelper<object>().GetInstance();
+ var locsFirstA = db.Queryable<LocCntrRel>()//鏍囩缁戝畾蹇呴』閮芥槸鍗曞眰銆�- 娑夊強鍫嗗彔涓庤揣鏋�灞傞棶棰樸�
+ .InnerJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
+ //.LeftJoin<ItemInfo>((lcr, cir, item) => cir.S_ITEM_CODE == item.S_ITEM_CODE && cir.S_ITEM_NAME == item.S_ITEM_NAME)
+ .InnerJoin<Location>((lcr, cir, lo) => lcr.S_LOC_CODE == lo.S_LOC_CODE)
+ .Where((lcr, cir, lo) =>/* cir.S_ITEM_NAME.Contains("鏍囩")&& */ locsFirst1.Select(x => x.S_LOC_CODE).Contains(lo.S_LOC_CODE) && lo.S_AREA_CODE == BQ_PRA.YWLRGDD)
+ .Select((lcr, cir, lo) => new locCntItem
+ {
+ N_CURRENT_NUM = lo.N_CURRENT_NUM,
+ S_TYPE = lcr.S_TYPE,
+ S_LOC_CODE = lo.S_LOC_CODE,
+ S_AREA_CODE = lo.S_AREA_CODE,
+ N_ROW = lo.N_ROW,
+ N_COL = lo.N_COL,
+ HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
+ S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
+ S_ITEM_CODE = cir.S_ITEM_CODE,
+ S_ITEM_NAME = cir.S_ITEM_NAME,
+ S_BATCH_NO = cir.S_BATCH_NO,
+ S_CJ_NAME = cir.S_CJ_NAME,
+ S_CNTR_CODE = cir.S_CNTR_CODE
+ })
+ .ToList();
+ /// 浜哄伐鍫嗗彔鍖虹焊绠�鍜�鏍囩 鏄寜鏍囪瘑+鐗╂枡绛涢�杩涜鍏ュ簱杞繍銆�
+ /// 鐗╂枡鍚嶇О鍖呭惈瀵瑰簲绉嶇被杩涜鍏ュ簱銆�+ foreach (var item in locsFirstA)
{
- item.S_NOTE = item.S_NOTE + "&" + item.S_BATCH_NO;
- }
- }
- var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
- var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
- var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鎻愭墸-"));
- var PElocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏀剁缉鑶�"));
-
- //if (mun % 20 == 0)
- //{
- // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�鏃犺弻锛� + JsonConvert.SerializeObject(locsFirst));
- // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�姘寸嚎锛� + JsonConvert.SerializeObject(SlocsFirst));
- //}
-
- var TASKs = new List<Task>();
- var task1 = Task.Run(() =>
- {
- try
- {
- // var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
- if (!yuworders.Any())
+ if (!string.IsNullOrEmpty(item.S_BATCH_NO))
{
- YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
+ item.S_NOTE = item.S_NOTE + "&" + item.S_BATCH_NO;
}
- else
- {
- LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
- // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�- YwlBQ_CreWJOutOrder();
- }
-
- // 鏍囩鏃犺弻閫�簱銆�
- YwlBQ_CreWJTK();
}
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
+ var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
+ var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏍囩-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
+ var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鎻愭墸-"));
+ var PElocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("鏀剁缉鑶�"));
- var plc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "T2鎻愬崌鏈�).FirstOrDefault();
- var task2 = Task.Run(() =>
- {
- try
- {
- string pline = "T2鎻愬崌鏈�鏍囩";
- var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
- //yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+ //if (mun % 20 == 0)
+ //{
+ // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�鏃犺弻锛� + JsonConvert.SerializeObject(locsFirst));
+ // Console.WriteLine("鏍囩鍙夎繍浜哄伐缁戝畾鍖�姘寸嚎锛� + JsonConvert.SerializeObject(SlocsFirst));
+ //}
- var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
- if (!Syuworders.Any())
+ var TASKs = new List<Task>();
+ var task1 = Task.Run(() =>
+ {
+ try
{
- //姘寸嚎鏍囩鍏ュ簱
- YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
- }
- if (tklist.Count() > 0)
- {
- var tk = tklist.FirstOrDefault();
- var loc = LocationHelper.GetLoc(plc.location[0]);
- if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
+ // var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
+ if (LocLock(WJ_BQ.RK_BBHJQ))
{
- var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
- if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
+ //鏍囩鍏ュ簱
+ YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
+ }
+ if (yuworders.Any())
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
+ // 鏍囩鍑哄簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ YwlBQ_CreWJOutOrder();
+ }
+
+ // 鏍囩鏃犺弻閫�簱銆�
+ YwlBQ_CreWJTK();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ });
+
+ var task11 = Task.Run(() =>
+ {
+ try
+ {
+ // var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "涓按鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0).OrderBy(x => x.TagOverTime).ToList();
+ if (LocLock(SX_BQ.RK_BBHJQ))
+ {
+ YwlBQ_CreInwork(locsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
+ }
+ if (yuworders.Any())
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 宸ュ崟寮�惎涓�");
+ // 涓按鏍囩閫�簱銆傝揣鏋剁洿鎺ュ嚭鍒扮嚎杈�+ ZsBQ_CreWJOutOrder();
+ }
+ // 涓按鏍囩閫�簱銆�
+ ZsBQ_CreWJTK();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ });
+
+ var plc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "T2鎻愬崌鏈�).FirstOrDefault();
+ var task2 = Task.Run(() =>
+ {
+ try
+ {
+ string pline = "T2鎻愬崌鏈�灏忔按鏍囩";
+ var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ //yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+
+ var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
+
+ if (LocLock(SX_BQ.RK_BBHJQ))
+ {
+ //姘寸嚎鏍囩鍏ュ簱
+ YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
+ }
+ if (tklist.Count() > 0)
+ {
+ var tk = tklist.FirstOrDefault();
+ var loc = LocationHelper.GetLoc(plc.location[0]);
+ if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
{
- var s_type = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
- if (s_type == 0)
+ var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
+ if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
{
- LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
- }
- Location Endbit = null;
- // var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == SX_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0);
- // var hjs = db.Queryable<Location>().Where(l => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE.Trim() == "鏃�).ToList();
- var hjs = LocationHelper.GetAreaNormalLocList(SX_BQ.RK_BBHJQ, true, false);
- Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
- if (Endbit != null)
- {
- var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-SX鏍囩閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
- LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-SX鏍囩閫�簱 锛屽垱寤簕re}");
+ var s_type = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ if (s_type == 0)
+ {
+ LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
+ }
+ Location Endbit = null;
+ // var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == SX_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0);
+ // var hjs = db.Queryable<Location>().Where(l => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE.Trim() == "鏃�).ToList();
+ var hjs = LocationHelper.GetAreaNormalLocList(SX_BQ.RK_BBHJQ, true, false);
+ Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ if (Endbit != null)
+ {
+ var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-SX鏍囩閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-SX鏍囩閫�簱 锛屽垱寤簕re}");
+ }
}
}
}
- }
- else if (Syuworders.Any())
- {
- YwlBQ_CreSXOutOrder(plc, Syuworders.FindAll(x => x.OutNum > 0));
- }
- }
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
- var task3 = Task.Run(() =>
- {
- try
- {
- //return;
- YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鎻愭墸鍙夎繍");//鎻愭墸 涓按 閫�簱銆�- YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸涓按鍑哄簱
- }
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
- var task4 = Task.Run(() =>
- {
- try
- {
- //return;
- ///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�- YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 2);//PE鑶�- YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1); //鎻愭墸
- //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
- //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�-
- var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
- if (tklist.Count() > 0)
- {
- LogHelper.Info("-鏀剁缉鑶� 閫�簱锛�);
- var tk = tklist.FirstOrDefault();
-
- var loc = LocationHelper.GetLoc(plc.location[0]);
- if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
+ else if (Syuworders.Any())
{
- var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
- if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
- {
- var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
- if (cir == null)
- { LogHelper.CErrorLog($"{loc.S_LOC_CODE} 娌℃湁鎵樼洏鐗╂枡鏁版嵁锛侊紒"); return; }
- var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
- if (s_type == 0)
- {
- LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
- }
- Location Endbit = null;
- //Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
- //if (Endbit != null)
- //{
- // var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�T2閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
- // LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-T2閫�簱 锛屽垱寤簕re}");
- //}
- string v = "YWLTKMKQ";
- var rklist = LocationHelper.GetRowLock(v);
- int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
+ YwlBQ_CreSXOutOrder(plc, Syuworders.FindAll(x => x.OutNum > 0));
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ });
+ var task3 = Task.Run(() =>
+ {
+ try
+ {
+ //return;
+ YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鎻愭墸鍙夎繍");//鎻愭墸 涓按 閫�簱銆�+ YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鎻愭墸鍙夎繍", 1);//鎻愭墸涓按鍑哄簱
+ YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "涓按鑶滃弶杩�, 1);//涓按鍑哄簱
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ });
+ var task4 = Task.Run(() =>
+ {
+ try
+ {
+ //return;
+ ///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�+ YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 2);//PE鑶�+ YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1); //鎻愭墸
+ //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
+ //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�
- var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
- Location EndBit = null;
- var NormalList = LocationHelper.GetAreaNormalLocList(v);
- //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (inlock != null)
+ var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
+ if (tklist.Count() > 0)
+ {
+ LogHelper.Info("-鏀剁缉鑶� 閫�簱锛�);
+ var tk = tklist.FirstOrDefault();
+
+ var loc = LocationHelper.GetLoc(plc.location[0]);
+ if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "鏃�)
+ {
+ var rr_clrel = LocationHelper.GetLocCntrRel(loc.S_LOC_CODE);
+ if (rr_clrel.FirstOrDefault()?.S_TYPE == BQ_PRA.B && DateTime.Now.Subtract(rr_clrel.FirstOrDefault()?.T_CREATE ?? DateTime.Now).TotalSeconds > 10)
{
- var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
- foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
+ var cir = ContainerHelper.GetCntrItemRel(rr_clrel.FirstOrDefault().S_CNTR_CODE).FirstOrDefault();
+ if (cir == null)
+ { LogHelper.CErrorLog($"{loc.S_LOC_CODE} 娌℃湁鎵樼洏鐗╂枡鏁版嵁锛侊紒"); return; }
+ var s_type = cir?.N_BQ_TRAY_TYPE ?? 0;
+ if (s_type == 0)
{
- var srloclist = rs.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
+ LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
+ }
+ Location Endbit = null;
+ //Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ //if (Endbit != null)
+ //{
+ // var re = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�T2閫�簱", rr_clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ // LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-T2閫�簱 锛屽垱寤簕re}");
+ //}
+ string v = "YWLTKMKQ";
+ var rklist = LocationHelper.GetRowLock(v);
+ int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
+
+ var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
+ Location EndBit = null;
+ var NormalList = LocationHelper.GetAreaNormalLocList(v);
+ //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
+ if (inlock != null)
+ {
+ var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+ foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
{
- var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any()) continue;
- var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME || xcir.S_CJ_NAME != cir.S_CJ_NAME)
- continue;
+ var srloclist = rs.OrderBy(x => x.N_COL).ToList();
+ var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ if (!xcirs.Any()) continue;
+ var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME || xcir.S_CJ_NAME != cir.S_CJ_NAME)
+ continue;
+ }
+ EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ if (EndBit != null)
+ break;
}
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- if (EndBit != null)
- break;
+ }
+ else
+ {
+ var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ if (EptRowlist.Any())
+ {
+ EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ }
+ }
+ if (EndBit != null)
+ {
+ var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�鍏ュ簱", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
+ LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("鏀剁缉鑶滃弶杩�鍏ュ簱")} 锛屽垱寤簕res} ");
+
+ if (res && inlock == null)
+ {
+ var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
+ var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
+ if (row != null)
+ {
+ if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ {
+ db.Deleteable(row).ExecuteCommand();
+ db.Insertable(r).ExecuteCommand();
+ }
+ }
+ else db.Insertable(r).ExecuteCommand();
+ }
+ }
+ Thread.Sleep(1000);
+
+ }
+ }
+ }
+ else
+ //YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴�+ {
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛�);
+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ if (!yuworders.Any())
+ {
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛佹病鏈夊嚭搴撳崟銆�);
+ return;
+ }
+ var ploc = plc.location[0];
+ retuse:
+ var order = yuworders.FirstOrDefault();
+ if (yuworders.Count() > 0)
+ {
+ //var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
+ //if (Cjsj.Count() > 0)
+ //{
+ // var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
+ // order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
+ //}
+ }
+ if (order != null)
+ {
+ var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
+ if (Porder == null)
+ {
+ LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ yuworders.Remove(order);
+ goto retuse;
+ }
+ var oto = new List<string>();
+ //if (!string.IsNullOrEmpty(order.TagOver))
+ // oto = order.TagOver.Split(',').ToList();
+ var oic = order.SQL_ItemCode?.Trim();
+ var oin = order.SQL_ItemName?.Trim();
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ goto retuse;
+ }
+ LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛� + oic + oin);
+
+ string v = "YWLTKMKQ";
+ int ord = -1;
+ locCntItem StartBit = null;
+ Location EndBit = null;
+ CntrItemRel cir = null;
+ var rklist = LocationHelper.GetRowLock(v);
+ var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
+ var NormalList = LocationHelper.GetAreaNormalLocList(v);
+ if (outlock != null)
+ {
+ NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
+ }
+ var taglist = new List<string>() { oic };
+ foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
+ {
+ locCntItem Temp = null;
+ var y = item.OrderBy(x => x.N_COL).ToList();
+ var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (!CNTR.Any()) continue;
+ var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any()) continue;
+ cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ LogHelper.Info($"鏀剁缉鑶�鍑哄簱锛亄item.Key}鎺�[{cir.S_ITEM_CODE}-{order.SQL_ItemCode}] [{cir.S_ITEM_NAME}-{order.SQL_ItemName}] [{cir.S_CJ_NAME}-{order.S_CJ_NAME}] {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)}");
+ if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)
+ {
+ //plg 2025骞�鏈�3鏃�09:08:10
+ Temp = new locCntItem
+ {
+ N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
+ S_CNTR_CODE = cir.S_CNTR_CODE,
+ S_LOC_CODE = lastfull.S_LOC_CODE,
+ HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
+ S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
+ S_CJ_NAME = cir.S_CJ_NAME
+ };
+ if (outlock != null)
+ {
+ StartBit = Temp;
+ break;
+ }
+ }
+ if (Temp != null)
+ {
+ if (StartBit == null)
+ StartBit = Temp;
+ else if (StartBit.HalfOrFull > Temp.HalfOrFull)
+ {
+ StartBit = Temp;
+ }
+ if (StartBit.HalfOrFull == 1) break;
+ }
+ }
+ }
+ if (StartBit != null)
+ {
+ var tagLoc = StartBit;
+ // 鐩存帴鍑烘彁鍗囨満浣�+
+ LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
+ if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
+ {
+ var loc = LocationHelper.GetLoc(ploc);
+ LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
+ if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "鏃�)
+ {
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
+ LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満 锛屽垱寤簕re} ");
+ if (re)
+ {
+ oto.Add(oic);
+ if (outlock == null)
+ {
+ var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+ db.Insertable(r).ExecuteCommand();
+ }
+ }
+ }
}
}
else
{
- var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
- var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
- if (EptRowlist.Any())
- {
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
- }
+ LogHelper.Info(order.SQL_PLineNo + "-鏀剁缉鑶� 鍑哄簱锛�娌℃湁鍙敤鐗╂枡");
}
- if (EndBit != null)
+ var set1 = new HashSet<string>(oto);
+ var set2 = new HashSet<string>(taglist);
+
+ if (set1.SetEquals(set2))
{
- var res = TaskProcess.CreateTransport("", loc.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, "鏀剁缉鑶滃弶杩�鍏ュ簱", new List<string> { cir.S_CNTR_CODE }, 1, EndBit.N_CURRENT_NUM + 1, 1, 62);
- LogHelper.CSucessLog($"from {loc.S_LOC_CODE} to {EndBit.S_LOC_CODE} {("鏀剁缉鑶滃弶杩�鍏ュ簱")} 锛屽垱寤簕res} ");
+ //order.OutNum++;
- if (res && inlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
- var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
- if (row != null)
- {
- if (row.S_LOCK_SRC != r.S_LOCK_SRC)
- {
- db.Deleteable(row).ExecuteCommand();
- db.Insertable(r).ExecuteCommand();
- }
- }
- else db.Insertable(r).ExecuteCommand();
- }
+ order.OutNum--;
+ order.TagOverTime = DateTime.Now;
+ //order.TagOver = string.Empty;
+ db.Updateable(order).UpdateColumns(it => new { /*it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
+ LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
}
- Thread.Sleep(1000);
-
}
}
}
- else
- //YwlPETKOutOrder("YWLTKMKQ", "", "PE鍙夎繍");// PE灏忓嚭搴�+ catch (Exception ex)
{
- LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛�);
- var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
- if (!yuworders.Any())
- {
- LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛佹病鏈夊嚭搴撳崟銆�);
- return;
- }
- var ploc = plc.location[0];
- retuse:
- var order = yuworders.FirstOrDefault();
- if (yuworders.Count() > 0)
- {
- //var Cjsj = LocationHelper.GetList<CjTimeOrder>(x => yuworders.Select(c => c.S_CJ_NAME).ToList().Contains(x.S_CJ_NAME) && yuworders.Select(c => c.SQL_ItemCode).ToList().Contains(x.S_ITEM_CODE));
- //if (Cjsj.Count() > 0)
- //{
- // var Cj = Cjsj.OrderBy(e => e.T_CJ_TIME).ToList().FirstOrDefault();
- // order = yuworders.Find(e => e.S_CJ_NAME == Cj.S_CJ_NAME && e.SQL_ItemCode == Cj.S_ITEM_CODE);
- //}
- }
- if (order != null)
- {
- var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
- var oto = new List<string>();
- //if (!string.IsNullOrEmpty(order.TagOver))
- // oto = order.TagOver.Split(',').ToList();
- var oic = order.SQL_ItemCode?.Trim();
- var oin = order.SQL_ItemName?.Trim();
- if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
- {
- LogHelper.CErrorLog("灏忔按鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
- goto retuse;
- }
- LogHelper.Info("-鏀剁缉鑶� 鍑哄簱锛� + oic + oin);
-
- string v = "YWLTKMKQ";
- int ord = -1;
- locCntItem StartBit = null;
- Location EndBit = null;
- CntrItemRel cir = null;
- var rklist = LocationHelper.GetRowLock(v);
- var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
- var NormalList = LocationHelper.GetAreaNormalLocList(v);
- if (outlock != null)
- {
- NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
- }
- var taglist = new List<string>() { oic };
- foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
- {
- locCntItem Temp = null;
- var y = item.OrderBy(x => x.N_COL).ToList();
- var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (lastfull != null)
- {
- var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
- if (!CNTR.Any()) continue;
- var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
- cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- LogHelper.Info($"鏀剁缉鑶�鍑哄簱锛亄item.Key}鎺�[{cir.S_ITEM_CODE}-{order.SQL_ItemCode}] [{cir.S_ITEM_NAME}-{order.SQL_ItemName}] [{cir.S_CJ_NAME}-{order.S_CJ_NAME}] {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)}");
- if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)
- {
- //plg 2025骞�鏈�3鏃�09:08:10
- Temp = new locCntItem
- {
- N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
- S_CNTR_CODE = cir.S_CNTR_CODE,
- S_LOC_CODE = lastfull.S_LOC_CODE,
- HalfOrFull = (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)),
- S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
- S_CJ_NAME = cir.S_CJ_NAME
- };
- if (outlock != null)
- {
- StartBit = Temp;
- break;
- }
- }
- if (Temp != null)
- {
- if (StartBit == null)
- StartBit = Temp;
- else if (StartBit.HalfOrFull > Temp.HalfOrFull)
- {
- StartBit = Temp;
- }
- if (StartBit.HalfOrFull == 1) break;
- }
- }
- }
- if (StartBit != null)
- {
- var tagLoc = StartBit;
- // 鐩存帴鍑烘彁鍗囨満浣�-
- LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
- if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
- {
- var loc = LocationHelper.GetLoc(ploc);
- LogHelper.Info(order.SQL_PLineNo + $"-鏀剁缉鑶滃嚭搴擄紒缁堢偣{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
- if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "鏃�)
- {
- var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
- LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満 锛屽垱寤簕re} ");
- if (re)
- {
- oto.Add(oic);
- if (outlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
- db.Insertable(r).ExecuteCommand();
- }
- }
- }
- }
- }
- else
- {
- LogHelper.Info(order.SQL_PLineNo + "-鏀剁缉鑶� 鍑哄簱锛�娌℃湁鍙敤鐗╂枡");
- }
-
- var set1 = new HashSet<string>(oto);
- var set2 = new HashSet<string>(taglist);
-
- if (set1.SetEquals(set2))
- {
- //order.OutNum++;
-
- order.OutNum--;
- order.TagOverTime = DateTime.Now;
- //order.TagOver = string.Empty;
- db.Updateable(order).UpdateColumns(it => new { /*it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
- LogHelper.CSucessLog($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
- }
- }
+ LogHelper.Error(ex.Message, ex);
}
- }
- catch (Exception ex)
- {
- LogHelper.Error(ex.Message, ex);
- }
- });
- Task.WaitAll(task1, task2, task3, task4);
- LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶� Over=============== ", ConsoleColor.Cyan);
+ });
+ // Task.WaitAll(task1, task2, task3, task4);
+ LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶� Over=============== ", ConsoleColor.Cyan);
+ }
}
/// <summary>
/// 鎻愭墸锛屼腑姘�閫�簱
@@ -1826,6 +1885,7 @@
LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
.Where((l, c) => (l.S_AREA_CODE == v1) && c.S_TYPE == BQ_PRA.B)
.ToList();
+
if (v.Any())
{
foreach (var area in v.Select(x => x.S_AREA_CODE).Distinct())
@@ -1843,59 +1903,47 @@
var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
if (!cirs.Any()) continue;
var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (CNTR.FirstOrDefault().S_TYPE == BQ_PRA.B)
+ if (cirs.FirstOrDefault().S_ITEM_NAME.Contains("鏍囩-"))
{
- var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ continue;
+ }
- var rklist = LocationHelper.GetRowLock(v2);
- int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));
- var inlock = rklist.Find(x => x.S_AREA_CODE == v2 && x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
- Location EndBit = null;
- var NormalList = LocationHelper.GetAreaNormalLocList(v2);
- //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
- if (inlock != null)
- {
- var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
- foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
- {
- var srloclist = rs.OrderBy(x => x.N_COL).ToList();
- var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
- if (EndBit != null)
- break;
- }
- }
- else
- {
- var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
- var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
- if (EptRowlist.Any())
- {
- EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
- }
- }
- if (EndBit != null)
- {
- var res = TaskProcess.CreateTransport("", lastfull1.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v3 + "-閫�簱", new List<string> { cir.S_CNTR_CODE }, lastfull1.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
- LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-閫�簱 锛屽垱寤簕res} ");
+ 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 == cir.S_ITEM_CODE && t.S_ITEM_NAME == cir.S_ITEM_NAME && t.S_CJ_NAME == cir.S_CJ_NAME && o.S_AREA_CODE == v2);
+ var lstCanOutL = db.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();
- if (res && inlock == null)
- {
- var r = new RowLock { S_LOCK_SRC = (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
- db.Insertable(r).ExecuteCommand();
- //var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
- //if (row != null)
- //{
- // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
- // {
- // db.Deleteable(row).ExecuteCommand();
- // db.Insertable(r).ExecuteCommand();
- // }
- //}
- //else db.Insertable(r).ExecuteCommand();
- }
+ Location EndBit = null;
+ var NormalList = LocationHelper.GetAreaNormalLocList(v2);
+ NormalList = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
+ //鏈夊叆搴撻攣鎺掋� 鑳藉叆灏卞叆銆備笉鑳藉氨绛夈�
+ if (NormalList.Count() > 0)
+ {
+ var loclist1 = NormalList.ToList();
+ foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
+ {
+ var srloclist = rs.OrderBy(x => x.N_COL).ToList();
+ var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 1) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ if (EndBit != null)
+ break;
}
}
+ else
+ {
+ var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
+ if (EptRowlist.Any())
+ {
+ EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (-1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ }
+ }
+ if (EndBit != null)
+ {
+ var res = TaskProcess.CreateTransport("", lastfull1.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v3 + "-閫�簱", new List<string> { cir.S_CNTR_CODE }, lastfull1.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-閫�簱 锛屽垱寤簕res} ");
+
+ }
+
}
}
}
@@ -1905,6 +1953,49 @@
}
}
//鏍囩閫�簱銆�绾胯竟杞埌 璐ф灦銆�+ private static void ZsBQ_CreWJTK()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var v = db.Queryable<Location>().
+ LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
+ .Where((l, c) => (l.S_AREA_CODE == SX_BQ.YWLZSXBKQ /*|| l.S_AREA_CODE == WJ_BQ.RK_BQJBQ*/) && c.S_TYPE == BQ_PRA.B)
+ .ToList();
+ if (v.Any())
+ {
+ foreach (var area in v.Select(x => x.S_AREA_CODE).Distinct())
+ {
+ var rowsss = v.FindAll(x => x.S_AREA_CODE == area).Select(x => x.N_ROW).Distinct();
+ var locs = LocationHelper.GetAreaNormalLocList(area).FindAll(x => rowsss.Contains(x.N_ROW));
+ foreach (var item in locs.GroupBy(x => x.N_ROW))
+ {
+ var y = item.OrderBy(x => x.N_COL).ToList();
+ var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (!CNTR.Any()) continue;
+ var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any()) continue;
+ var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (CNTR.FirstOrDefault().S_TYPE == BQ_PRA.B)
+ {
+ var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
+ Location Endbit = null;
+ var hjs = LocationHelper.GetAreaNormalLocListAll(SX_BQ.RK_BBHJQ);
+ Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ if (Endbit != null)
+ {
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
+ }
+
+ }
+ }
+ }
+ }
+ }
+
+ }
private static void YwlBQ_CreWJTK()
{
var db = new SqlHelper<object>().GetInstance();
@@ -2023,7 +2114,7 @@
var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
if (!cirs.Any()) continue;
cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName && cir.S_CJ_NAME == od.S_CJ_NAME)
+ if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName)
{
//plg 2025骞�鏈�3鏃�09:09:25
Temp = new locCntItem
@@ -2059,6 +2150,10 @@
//var rklist = LocationHelper.GetRowLock(v);
//var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3))) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
var NormalList2 = LocationHelper.GetAreaNormalLocList(v1);
+ if (NormalList2.Any())
+ {
+ NormalList2 = NormalList2.FindAll(e => e.N_ROW == 2).ToList();
+ }
//if (inlock != null)
//{
// var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
@@ -2081,6 +2176,172 @@
if (EndBit != null)
break;
}
+ //}
+ //else
+ if (EndBit == null)
+ {
+ var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
+ var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
+ if (EptRowlist.Any())
+ {
+ EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
+ }
+ }
+
+ //foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
+ //{
+ // var y = item.OrderBy(x => x.N_COL).ToList();
+ // var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ // EndBit = y.Find(x => x.N_COL >= (lastfull?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
+ // if (lastfull != null)
+ // {
+ // var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ // if (!CNTR.Any()) continue;
+ // if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
+ // var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ // if (!cirs.Any()) continue;
+ // var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ // if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
+ // continue;
+ // }
+ // if (EndBit != null)
+ // break;
+ //}
+ if (EndBit != null)
+ {
+ var re = TaskProcess.CreateTransport("", StartBit.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, (oin.Contains("鎻愭墸") ? "鎻愭墸" : "鏀剁缉鑶�) + "鍙夎繍-鍑哄簱绾胯竟", new List<string> { StartBit.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
+ LogHelper.Info($"from {StartBit.S_LOC_CODE} to {EndBit.S_LOC_CODE} {pline}-鍑哄簱绾胯竟 锛屽垱寤簕re} ");
+ if (re)
+ {
+ od.TagOverTime = DateTime.Now;
+ od.OutNum--;
+ WCSHelper.Do(db =>
+ {
+ db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.OutNum }).ExecuteCommand();
+
+ //var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE + StartBit.HalfOrFull), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+ //var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
+ //if (row != null)
+ //{
+ // if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+ // {
+ // db.Deleteable(row).ExecuteCommand();
+ // db.Insertable(r).ExecuteCommand();
+ // }
+ //}
+ //else
+ if (outlock == null)
+ {
+ var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+ db.Insertable(r).ExecuteCommand();
+ }
+ });
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ private static void YwlPEZsOutOrder(string v, string v1, string v2, int v3 = 3)
+ {
+ List<YWLWorkOrder> Orders = new List<YWLWorkOrder>();
+
+ foreach (var pline in new[] { "涓按PE鑶滃嚭搴� })
+ {
+ Orders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+ foreach (var od in Orders)
+ {
+ var oic = od.SQL_ItemCode?.Trim();
+ var oin = od.SQL_ItemName?.Trim();
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("涓按PE鑶滐細" + (od.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ continue;
+ }
+ int ord = oin.Contains("涓按") ? 1 : -1;
+ locCntItem StartBit = null;
+ Location EndBit = null;
+ CntrItemRel cir = null;
+ var rklist = LocationHelper.GetRowLock(v);
+ var outlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (oic + "&" + oin) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
+ var NormalList = LocationHelper.GetAreaNormalLocList(v);
+ if (outlock != null)
+ {
+ NormalList = NormalList.FindAll(x => outlock.N_ROW == (x.N_ROW));
+ }
+ foreach (var item in NormalList.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
+ {
+ locCntItem Temp = null;
+ var y = item.OrderBy(x => x.N_COL).ToList();
+ var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (!CNTR.Any()) continue;
+ var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any()) continue;
+ cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (cir.S_ITEM_CODE == od.SQL_ItemCode && cir.S_ITEM_NAME == od.SQL_ItemName)
+ {
+ //plg 2025骞�鏈�3鏃�09:09:25
+ Temp = new locCntItem
+ {
+ N_CURRENT_NUM = lastfull.N_CURRENT_NUM,
+ S_CNTR_CODE = cir.S_CNTR_CODE,
+ S_LOC_CODE = lastfull.S_LOC_CODE,
+ S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
+ S_CJ_NAME = cir.S_CJ_NAME
+ };
+ if (outlock != null)
+ {
+ StartBit = Temp;
+ break;
+ }
+ }
+ if (Temp != null)
+ {
+ if (StartBit == null)
+ StartBit = Temp;
+ else if (StartBit.HalfOrFull > Temp.HalfOrFull)
+ {
+ StartBit = Temp;
+ }
+ if (StartBit.HalfOrFull == 1) break;
+ }
+ }
+ }
+ //}
+ if (StartBit != null)
+ {
+ //var rklist = LocationHelper.GetRowLock(v);
+ //var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3))) && x.S_LOCK_STATE.Contains("鍑哄簱閿�));
+ var NormalList2 = LocationHelper.GetAreaNormalLocList(v1);
+ if (NormalList2.Any())
+ {
+ NormalList2 = NormalList2.FindAll(e => e.N_ROW == 1).ToList();
+ }
+ //if (inlock != null)
+ //{
+ // var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
+
+ var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
+ var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (!CNTR.Any()) continue;
+ if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
+ var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any()) continue;
+ var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
+ continue;
+ EndBit = srloclist.Find(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "鎶ュ簾" && x.N_COL >= (lastfull?.N_COL ?? 0));
+ }
+ if (EndBit != null)
+ break;
+
//}
//else
if (EndBit == null)
@@ -2292,12 +2553,12 @@
if (order != null)
{
var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("SX鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
+ //if (Porder == null)
+ //{
+ // LogHelper.CErrorLog("SX鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ // yuworders.Remove(order);
+ // goto retuse;
+ //}
var oto = new List<string>();
//if (!string.IsNullOrEmpty(order.TagOver))
// oto = order.TagOver.Split(',').ToList();
@@ -2786,12 +3047,12 @@
if (order != null)
{
var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
- if (Porder == null)
- {
- LogHelper.CErrorLog("鏃犺弻鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
- yuworders.Remove(order);
- goto retuse;
- }
+ //if (Porder == null)
+ //{
+ // LogHelper.CErrorLog("鏃犺弻鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ // yuworders.Remove(order);
+ // goto retuse;
+ //}
var oto = new List<string>();
//if (!string.IsNullOrEmpty(order.TagOver))
@@ -2920,6 +3181,290 @@
}
}
+
+
+
+ internal static void ZsBQ_CreWJOutOrder()
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 寮�");
+ //1.妫�煡鏄惁鏈夐�搴�+ var db = new SqlHelper<object>().GetInstance();
+
+ if (false)
+ {
+ ///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
+ var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鎺ラ┏鏈夋暟鎹�);
+ var y2 = jbr.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ //鍥炲簱銆�+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 鏈�閫�簱" + l2.S_LOC_CODE);
+ continue;
+ }
+ var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any())
+ {
+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + c.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+ var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+
+ var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
+ foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 绾胯竟鏈夋暟鎹�);
+ var x2 = x1.OrderBy(x => x.N_COL).ToList();
+ var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l3 != null)
+ {
+ var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
+ if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鏈�閫�簱" + xc.FirstOrDefault()?.S_TYPE);
+ continue;
+ }
+ var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
+ if (!xcirs.Any())
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+
+ var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鐗╂枡涓嶅尮閰�鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+ }
+ var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ LogHelper.Info($"鏃犺弻 鐢熸垚浠诲姟==> 鏄惁鏈夊悎閫傜殑璐т綅淇℃伅" + e?.S_LOC_CODE);
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏杞嚎杈�, new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
+ LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏杞嚎杈�锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ }
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
+ ///鎷嗗灈鍖哄彇娑堛�
+ ///绗簩娈碉細鎷嗗灈鍖恒�鎷嗗幓鎺ラ┏銆�鎴栬�鍥炲簱銆�+ var v = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQCDQ);
+ ///鎷嗗灈鐨勫嚭搴撱� 鍗曞眰鐨勫洖搴� 鍗曞眰涓嶅叆鎷嗗灈鍖�+ foreach (var item in v.GroupBy(x => x.N_ROW))
+ {
+ var y = item.OrderBy(x => x.N_COL).ToList();
+ var lastfull = y.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (lastfull != null)
+ {
+ var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
+ if (lastfull.N_CURRENT_NUM == 2)
+ {
+ if (CNTR.Find(x => x.S_TYPE == BQ_PRA.Out) == null)
+ {
+ LogHelper.CError($" 寮�惎鍑哄簱娴佺▼銆�鍫嗗彔鍖烘槸鍏ュ簱鍫嗗彔鎵樼洏锛岀粓姝㈠嚭搴撱� 杩欓噷鍙互鎵ц鍏ュ簱銆�);
+ return;
+ }
+ //鎷嗕竴涓埌鎺ラ┏ - 鎺ラ┏浣嶆帓锛屽鏋滄槸閫�簱鐨勶紝灏辨崲涓�帓銆�+ var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
+ {
+ var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null && l2.N_CURRENT_NUM == 1)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ continue;
+ }
+ }
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎷嗗灈鎺ラ┏", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 2, 1, 1, 62);
+ LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎷嗗灈鎺ラ┏ 锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ else
+ {
+ //鍥炶揣鏋�+ var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == WJ_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).OrderBy(x => x.N_LAYER).ThenBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ if (hjs != null)
+ {
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), hjs.S_LOC_CODE, "鏍囩鍙夎繍-鎷嗗灈鍥�, new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62);
+ LogHelper.Info($"from {lastfull.S_LOC_CODE} to {hjs.S_LOC_CODE} 鏍囩鍙夎繍-鎷嗗灈鍥�锛屽垱寤簕re} ");
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ ///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆�+ var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "涓按鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
+
+ //foreach (var order in yuworders)
+ retuse:
+ var order = yuworders.FirstOrDefault();
+ if (order != null)
+ {
+ var Porder = WCSHelper.GetWorkOrder(order.SQL_LinkLineNO);
+ //if (Porder == null)
+ //{
+ // LogHelper.CErrorLog("鏃犺弻鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + "娌℃湁銆愭墽琛屼腑銆戠殑宸ュ崟");
+ // yuworders.Remove(order);
+ // goto retuse;
+ //}
+
+ var oto = new List<string>();
+ //if (!string.IsNullOrEmpty(order.TagOver))
+ // oto = order.TagOver.Split(',').ToList();
+ var oic = order.SQL_ItemCode;
+ var oin = order.SQL_ItemName;
+ if (string.IsNullOrEmpty(oic) || string.IsNullOrEmpty(oin))
+ {
+ LogHelper.CErrorLog("涓按鏍囩鍑哄簱锛� + (order.SQL_WorkNo) + "娌℃湁銆愭寚瀹氱墿鏂欙紱");
+ goto retuse;
+ }
+ //var item_ = ContainerHelper.GetItem(x => x.S_ITEM_CODE == oic && x.S_ITEM_NAME == oin);
+
+ //鎸夐『搴忓尮閰嶆爣绛撅紝鐩村埌瀹屾垚鎵�湁鏍囩銆傚悗 娓呯┖鏍囩锛屽苟閲嶇疆鏍囩瀹屾垚鏃堕棿= 褰撳墠鏃堕棿銆�+ var hjs = db.Queryable<Location>()
+ .LeftJoin<LocCntrRel>((l, lc) => l.S_LOC_CODE == lc.S_LOC_CODE)
+ .LeftJoin<CntrItemRel>((l, lc, ci) => lc.S_CNTR_CODE == ci.S_CNTR_CODE)
+ .Where((l, lc, ci) => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE == "鏃�).Select((l, lc, ci) => new locCntItem
+ {
+ N_CURRENT_NUM = l.N_CURRENT_NUM,
+ S_TYPE = lc.S_TYPE,
+ S_LOC_CODE = l.S_LOC_CODE,
+ S_AREA_CODE = l.S_AREA_CODE,
+ HalfOrFull = (ci.N_BQ_TRAY_TYPE == .5 ? 1 : (ci.N_BQ_TRAY_TYPE == .75 ? 2 : 3)), // 鍗婃墭涓�.5 鏁存墭涓� 銆�杞崲涓烘暣鏁� *2 )銆� 鍗婃墭涓�1锛屾暣鎵�2
+ N_LAYER = l.N_LAYER,
+ S_NOTE = ci.S_ITEM_CODE.Trim() + "&" + ci.S_ITEM_NAME.Trim(),
+ S_ITEM_CODE = ci.S_ITEM_CODE,
+ S_ITEM_NAME = ci.S_ITEM_NAME,
+ S_CNTR_CODE = ci.S_CNTR_CODE
+ }).ToList();
+ var taglist = new List<string>() { oic };
+ //if (!string.IsNullOrEmpty(item_.S_BQ_NAME))
+ // taglist = item_.S_BQ_NAME.Split(',').ToList();
+ foreach (var item in taglist)
+ {
+ //if (oto.Contains(item))
+ // continue;
+ //var Ii = ContainerHelper.GetItem(x => x.S_ITEM_CODE == item);
+ //if (Ii == null)
+ //{
+ // LogHelper.CError($"{order.SQL_WorkNo} - {order.SQL_PLineNo} - {item} 鐗╂枡椤哄簭涓嶅瓨鍦ㄣ�");
+ // return;
+ //}
+ var tagLoc = hjs.FindAll(x => x.S_ITEM_CODE == oic/* Ii.S_ITEM_CODE*/ && x.S_ITEM_NAME == oin /*Ii.S_ITEM_NAME x.S_NOTE == (Ii.S_ITEM_CODE + "&" + Ii.S_ITEM_NAME)*/).OrderBy(x => x.HalfOrFull).FirstOrDefault();
+ if (tagLoc != null)
+ {
+ if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
+ {
+ // 鐩存帴鍑烘帴椹充綅
+ var jbqs = LocationHelper.GetAreaNormalLocList(SX_BQ.YWLZSXBKQ);
+ if (jbqs.Any())
+ {
+ jbqs = jbqs.FindAll(e => e.N_ROW == 3).ToList();
+ }
+ foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
+ {
+ var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null && l2.N_CURRENT_NUM == 1)
+ {
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ continue;
+ }
+ //var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ //if (!cirs.Any()) continue;
+ //var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ //if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
+ // continue;
+ }
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑虹嚎杈�, new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
+ LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-璐ф灦鍑烘帴椹�锛屽垱寤簕re} ");
+ if (re)
+ oto.Add(item);
+ break;
+ }
+ }
+ }
+ else
+ {
+ var taglocs = hjs.FindAll(x => x.S_LOC_CODE == tagLoc.S_LOC_CODE);
+ var v = LocationHelper.GetAreaNormalLocList(SX_BQ.YWLZSXBKQ);
+ if (v.Any())
+ {
+ v = v.FindAll(e => e.N_ROW == 3).ToList();
+ }
+ foreach (var cdr in v.GroupBy(x => x.N_ROW))
+ {
+ var y2 = cdr.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ if (e != null)
+ {
+ var tgs = taglocs.Select(x => x.S_CNTR_CODE).ToList();
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑烘媶鍨�, tgs, 1, 1, tgs.Count, 62, BQ_PRA.Out);
+ LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-璐ф灦鍑烘媶鍨�锛屽垱寤簕re} ");
+ if (re)
+ oto.Add(item);
+ break;
+ }
+ }
+ }
+ }
+ else
+ {
+ LogHelper.CErrorLog("涓按鏍囩鍑哄簱锛� + (order.SQL_LinkLineNO) + $" 璐ф灦涓婃病鏈夎繖涓猍{item}]鏍囩鐗╂枡銆�);
+ }
+ }
+
+ var set1 = new HashSet<string>(oto);
+ var set2 = new HashSet<string>(taglist);
+
+ if (set1.SetEquals(set2))
+ {
+ order.OutNum--;
+ order.TagOverTime = DateTime.Now;
+ //order.TagOver = string.Empty;
+ db.Updateable(order).UpdateColumns(it => new {/* it.TagOver,*/it.OutNum, it.TagOverTime }).ExecuteCommand();
+ LogHelper.CSucess($"{order.SQL_PLineNo}-{order.SQL_LinkLineNO} 鏍囩瀹屾垚銆傞噸缃暟鎹�);
+ }
+ else
+ {
+ //string otgo = string.Join(",", oto);
+ //if (order.TagOver != otgo)
+ //{
+ // order.TagOver = otgo;
+ // db.Updateable(order).UpdateColumns(it => new { it.TagOver }).ExecuteCommand();
+ //}
+ }
+ }
+
+ }
+
+
//鍏ュ簱-鍫嗗彔-璐ф灦
static bool from_mid_to(locCntItem startLoc, string MidArea, List<Location> locHJs)
@@ -4345,6 +4890,8 @@
/// </summary>
internal static void YWL_ZX_Turn()
{
+ var dbcd = new SqlHelper<object>().GetInstance();
+
foreach (var ODs in LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц").GroupBy(x => x.S_START_AREA))
{
var locS = LocationHelper.GetAreaNormalLocList(ODs.Key);
@@ -4380,6 +4927,26 @@
}
else
{
+ if (od.N_END_ROW > 0)
+ {
+ var EndRow = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_ROW == od.N_END_ROW && l.N_CURRENT_NUM == 0).ToList();
+ if (EndRow.Count() == 0)
+ {
+ //缃负瀹屾垚銆�
+ od.S_ZX_STATE = "瀹屾垚";
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(x => new { x.S_ZX_STATE }).ExecuteCommand());
+ }
+ }
+ else
+ {
+ var EndRow = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_CURRENT_NUM == 0).ToList();
+ if (EndRow.Count() == 0)
+ {
+ //缃负瀹屾垚銆�
+ od.S_ZX_STATE = "瀹屾垚";
+ WCSHelper.Do(db => db.Updateable(od).UpdateColumns(x => new { x.S_ZX_STATE }).ExecuteCommand());
+ }
+ }
var lastful = rows.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
if (lastful != null)
{
@@ -4410,27 +4977,52 @@
string nextarea = !string.IsNullOrEmpty(od.S_ZZ_AREA) ? od.S_ZZ_AREA : od.S_END_AREA;
var zzlocs = LocationHelper.GetAreaNormalLocList(nextarea);
Location Endbit = null;
- foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
+ if (od.N_END_ROW == 0 && zzlocs.Any())
{
- var zzrloclist = zzrs.ToList();
- var _cl2 = zzrloclist.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
- if (_cl2 != null)
+ foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
{
- var rel = LocationHelper.GetLocCntrRel(_cl2.S_LOC_CODE);
- var cntrrel = ContainerHelper.GetCntrItemRel(rel.FirstOrDefault()?.S_CNTR_CODE).FirstOrDefault();
- if (cntrrel == null)
- continue;
- if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
+ var zzrloclist = zzrs.ToList();
+ var _cl2 = zzrloclist.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
+ if (_cl2 != null)
{
+ var rel = LocationHelper.GetLocCntrRel(_cl2.S_LOC_CODE);
+ var cntrrel = ContainerHelper.GetCntrItemRel(rel.FirstOrDefault()?.S_CNTR_CODE).FirstOrDefault();
+ if (cntrrel == null)
+ continue;
+ if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
+ {
+ Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
+ }
+ }
+ else
Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
+ if (Endbit != null)
+ {
+ LogHelper.Info($"鍏ヤ腑杞尯{nextarea}浣跨敤{Endbit.S_LOC_CODE}");
+ break;
}
}
- else
- Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
- if (Endbit != null)
+ }
+ else
+ {
+ if (zzlocs.Any() && od.N_END_ROW > 0)//鐢ㄤ簬搴撳唴 姣斿A搴撴煇鎺掔Щ鍒癆搴撶殑鍙︿竴鎺� {
- LogHelper.Info($"鍏ヤ腑杞尯{nextarea}浣跨敤{Endbit.S_LOC_CODE}");
- break;
+ if (ABlist.Contains(od.S_END_AREA))
+ {
+ continue;
+ }
+ zzlocs = zzlocs.FindAll(e => e.N_ROW == od.N_END_ROW);
+ //
+ var EndMt = dbcd.Queryable<Location>().Where(l => l.S_AREA_CODE == od.S_END_AREA && l.N_ROW == od.N_END_ROW && l.N_CURRENT_NUM > 0).ToList();
+ if (EndMt.Any())
+ {
+ var ggh = EndMt.OrderByDescending(e => e.N_COL).FirstOrDefault();
+ zzlocs = zzlocs.FindAll(e => e.N_COL > ggh.N_COL).ToList();
+ }
+ if (zzlocs.Any())
+ {
+ Endbit = zzlocs.OrderBy(e => e.N_COL).FirstOrDefault();
+ }
}
}
LogHelper.Info($"YWL_ZX_Turn from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 鎵惧埌绉诲簱缁堢偣銆媨Endbit?.S_LOC_CODE}");
@@ -4445,6 +5037,7 @@
}
}
}
+
}
}
}
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 42025e7..093bc4d 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -98,7 +98,7 @@
TaskHelper.BeEnd(wmsTask);
break;
case 9://寮哄埗鍙栨秷 //璧风偣瑙ｇ粦閿侀噴鏀�缁堢偣閿侀噴鏀�-
+ var R = NDCHelper.CancelS(model.No);
r = TaskProcess.OperateStatus(wmsTask, 9);
if (r.ResultCode != -1)
{
diff --git a/HH.WCS.QingXiNongfu/settings.xml b/HH.WCS.QingXiNongfu/settings.xml
index c20275e..a0d5f42 100644
--- a/HH.WCS.QingXiNongfu/settings.xml
+++ b/HH.WCS.QingXiNongfu/settings.xml
@@ -127,8 +127,8 @@
{"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.9.167","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.167","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.168","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
diff --git a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
index 5500ec4..a50a32f 100644
--- a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -177,6 +177,13 @@
}
return locs;
}
+
+ public static List<Location> GetAreaNormalLocListAll(string areeacode)
+ {
+ var locs = LocationHelper.GetLocList(x => x.S_AREA_CODE == areeacode && x.S_LOCK_STATE.Trim() == "鏃� && x.N_CURRENT_NUM == 0);
+
+ return locs;
+ }
internal static List<Location> GetAllLocListByAreaCode(string _areacode, int minRow, int maxRow)
{
var db = new SqlHelper<object>().GetInstance();
diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index 5ac2008..7ce11e3 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -507,6 +507,7 @@
public string SQL_WorkNo { get; set; }
public string S_START_AREA { get; set; }
public int N_START_ROW { get; set; }
+ public int N_END_ROW { get; set; }
public string S_ZZ_AREA { get; set; }
public string S_END_AREA { get; set; }
public string S_ZX_STATE { get; set; }
--
Gitblit v1.9.1