From ba51d2ed8f5d96c7d86da68ef2c966d9c17f299f Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期四, 15 五月 2025 15:25:51 +0800
Subject: [PATCH] 双钱-AGV软件文件变更
---
core/Monitor.cs | 234 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 165 insertions(+), 69 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 1175125..ed34896 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -197,16 +197,16 @@
var target = new TN_EquipProDetail()
{
S_ID = tN_CG_Detail.S_ID,
- TaskType = "PLC婊℃墭涓嬬嚎鍏ュ簱",
+ TASKTYPE = "PLC婊℃墭涓嬬嚎鍏ュ簱",
RFID = result.RfidData,
- Spec = woInfo.S_ITEM_SPEC,
- CarCode = modelCI.S_CAR_CODE,
- Weight = result.Weight,
- ItemState = "寰呮",
- ItemCode = woInfo.S_ITEM_CODE,
- LoginName = woInfo.S_LINE_NO,
- Shift = "None",
- StartLoc = startLoc.S_CODE,
+ SPEC = woInfo.S_ITEM_SPEC,
+ CARCODE = modelCI.S_CAR_CODE,
+ WEIGHT = result.Weight,
+ ITEMSTATE = "寰呮",
+ ITEMCODE = woInfo.S_ITEM_CODE,
+ LOGINNAME = woInfo.S_LINE_NO,
+ SHIFT = "None",
+ STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertEquipProDetail(target);
});
@@ -217,12 +217,12 @@
{
S_ID = tN_CG_Detail.S_ID,
RFID = result.RfidData,
- Spec = woInfo.S_ITEM_SPEC,
- Weight = result.Weight,
- ItemState = "寰呮",
- ItemCode = woInfo.S_ITEM_CODE,
- LoginName = woInfo.S_LINE_NO,
- Shift = "None",
+ SPEC = woInfo.S_ITEM_SPEC,
+ WEIGHT = result.Weight,
+ ITEMSTATE = "寰呮",
+ ITEMCODE = woInfo.S_ITEM_CODE,
+ LOGINNAME = woInfo.S_LINE_NO,
+ SHIFT = "None",
};
SpecHelper.InsertInventoryM(target);
});
@@ -347,7 +347,7 @@
}
/// <summary>
- /// 婊℃墭杩囨湡鍑哄簱 婊℃墭杩囨湡鍥炲簱锛屾弧鎵樿繃鏈熷洖鐐�+ /// 婊℃墭杩囨湡鍑哄簱 杩囨湡鍚堟牸鍥炲簱锛岃繃鏈熸鍝佸洖鐐� /// </summary>
internal static void FullOutTime()
{
@@ -378,12 +378,17 @@
LocationHelper.LockLoc(startLoc_1.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc_1.S_CODE, 1);//缁堢偣鍏ュ簱閿� LogHelper.Info($"鐢熸垚婊℃墭杩囨湡鍑哄簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{outTimeCg.S_CNTR_CODE}锛岃捣鐐箋startLoc_1.S_CODE}锛岀粓鐐箋endLoc_1.S_CODE}");
+
+ Task task27 = Task.Run(() =>
+ {
+ SpecHelper.DeleteInventoryM(outTimeCg.S_ID);
+ });
}
}
}
- //婊℃墭杩囨湡鍥炲簱
+ //杩囨湡鍚堟牸鍥炲簱
var startLoc_2 = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE)
.LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE)
@@ -391,10 +396,91 @@
&& o.S_AREA_CODE == Settings.Areas[12] && o.N_CURRENT_NUM > 0
&& o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First();
+ if (startLoc_2 != null)
+ {
+ var endLoc_2 = db.Queryable<TN_Location>()
+ .First(o => o.S_AREA_CODE == Settings.Areas[2] &&
+ o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�);
+
+ if (endLoc_2 != null)
+ {
+ var cntCode = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == startLoc_2.S_CODE);
+ var outTimeCg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntCode.S_CNTR_CODE);
+ if (WCSHelper.CreateTask(startLoc_2.S_CODE, endLoc_2.S_CODE, "杩囨湡鍚堟牸鍥炲簱", 3, outTimeCg.S_CNTR_CODE, outTimeCg.S_SPE))
+ {
+ LocationHelper.LockLoc(startLoc_2.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
+ LocationHelper.LockLoc(endLoc_2.S_CODE, 1);//缁堢偣鍏ュ簱閿�+
+ Task task27 = Task.Run(() =>
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = outTimeCg.S_ID,
+ RFID = outTimeCg.S_CNTR_CODE,
+ SPEC = outTimeCg.S_SPE,
+ WEIGHT = outTimeCg.F_QTY,
+ ITEMSTATE = outTimeCg.S_ITEM_STATE,
+ ITEMCODE = outTimeCg.S_ITEM_CODE,
+ LOGINNAME = "杩囨湡鍚堟牸鍥炲簱杞",
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
+ });
+
+ LogHelper.Info($"鐢熸垚杩囨湡鍚堟牸鍥炲簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{outTimeCg.S_CNTR_CODE}锛岃捣鐐箋startLoc_2.S_CODE}锛岀粓鐐箋endLoc_2.S_CODE}");
+ }
+ }
+ }
+
+ //杩囨湡娆″搧鍥炵倝
+ var startLoc_3 = db.Queryable<TN_Location>()
+ .LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE)
+ .LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE)
+ .Where((o, i, s) => s.N_ITEM_STATE == 2 && s.S_ITEM_STATE == "涓嶅悎鏍�
+ && o.S_AREA_CODE == Settings.Areas[12] && o.N_CURRENT_NUM > 0
+ && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First();
+
+ if (startLoc_3 != null)
+ {
+ var endLoc_3 = db.Queryable<TN_Location>()
+ .First(o => o.S_AREA_CODE == Settings.Areas[11] &&
+ o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�);
+
+ if (endLoc_3 != null)
+ {
+ var cntCode = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == startLoc_3.S_CODE);
+ var outTimeCg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntCode.S_CNTR_CODE);
+ if (WCSHelper.CreateTask(startLoc_3.S_CODE, endLoc_3.S_CODE, "杩囨湡娆″搧鍥炵倝", 3, outTimeCg.S_CNTR_CODE,out string taskno, outTimeCg.S_SPE))
+ {
+ LocationHelper.LockLoc(startLoc_3.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
+ LocationHelper.LockLoc(endLoc_3.S_CODE, 1);//缁堢偣鍏ュ簱閿�+
+ Task task2 = Task.Run(() =>
+ {
+ var target = new TN_RemeltDetail()
+ {
+ TASKNO = taskno,
+ CNTCODE = outTimeCg.S_CNTR_CODE,
+ STARTLOC = startLoc_3.S_CODE,
+ LOGINNAME = "杩囨湡娆″搧鍥炵倝杞",
+ ITEMCODE = outTimeCg.S_ITEM_CODE,
+ SPEC = outTimeCg.S_SPE,
+ CARCODE = outTimeCg.S_CAR_CODE,
+ WEIGHT = outTimeCg.F_QTY,
+ REMELTTIME = DateTime.Now
+ };
+ SpecHelper.InsertRemeltDetail(target);
+ });
+
+ LogHelper.Info($"鐢熸垚杩囨湡娆″搧鍥炵倝浠诲姟鎴愬姛锛屽鍣ㄥ彿{outTimeCg.S_CNTR_CODE}锛岃捣鐐箋startLoc_3.S_CODE}锛岀粓鐐箋endLoc_3.S_CODE}");
+ }
+ }
+ }
+
}
catch (Exception ex)
{
- LogHelper.Error($"鍙戠敓浜嗗紓甯革紝婊℃墭杩囨湡鍑哄簱 婊℃墭杩囨湡鍥炲簱锛屾弧鎵樿繃鏈熷洖鐐�寮傚父锛寋ex.Message}", ex);
+ LogHelper.Error($"鍙戠敓浜嗗紓甯革紝婊℃墭杩囨湡鍑哄簱 杩囨湡鍚堟牸鍥炲簱锛岃繃鏈熸鍝佸洖鐐�寮傚父锛寋ex.Message}", ex);
}
}
@@ -409,48 +495,75 @@
// 鍚屾 TN_EquipProDetail 涓�TN_CG_Detail
var targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => o.ItemState != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮").First();
+ Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮" && i.N_ITEM_STATE != 1).First();
+
if (targetEPD != null)
{
- targetEPD.ItemState = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID).S_ITEM_STATE;
-
- db.Updateable<TN_EquipProDetail>(targetEPD).ExecuteCommand();
+ targetEPD.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID).S_ITEM_STATE;
+ db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
}
targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => System.DateTime.Now >= o.Expiration).First();
+ Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First();
+
if (targetEPD != null)
{
- targetEPD.ItemState = "杩囨湡";
- db.Updateable<TN_EquipProDetail>(targetEPD).ExecuteCommand();
+ targetEPD.ITEMSTATE = "杩囨湡";
+ db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID);
cginfo.S_ITEM_STATE = "杩囨湡";
cginfo.N_ITEM_STATE = 3;
- db.Updateable<TN_CG_Detail>(cginfo).ExecuteCommand();
+ db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
}
+
+ // 鍚屾 TN_InventoryM 涓�TN_CG_Detail
+ var targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
+ Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮" && i.N_ITEM_STATE != 1).First();
+
+ if (targetInM != null)
+ {
+ targetInM.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID).S_ITEM_STATE;
+ db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
+ }
+
+ targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
+ Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First();
+
+ if (targetInM != null)
+ {
+ targetInM.ITEMSTATE = "杩囨湡";
+ db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
+
+ var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID);
+ cginfo.S_ITEM_STATE = "杩囨湡";
+ cginfo.N_ITEM_STATE = 3;
+ db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+ }
+
+
// 鍚屾 TN_DayProDetail
var curDay = System.DateTime.Now.Date;
- var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DayTime == curDay);
+ var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay);
if (targetDay == null)
{
targetDay = new TN_DayProDetail()
{
- DayTime = curDay,
+ DAYTIME = curDay,
};
db.Insertable(targetDay).ExecuteCommand();
}
- var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curDay && a.DownLineTime <= curDay.AddDays(1)).ToList();
+ var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList();
- var sumWeight = targetEPDs.Sum(a => a.Weight);
+ var sumWeight = targetEPDs.Sum(a => a.WEIGHT);
if (targetEPDs.Count > 0)
{
- if (targetDay.Weight != sumWeight)
+ if (targetDay.WEIGHT != sumWeight)
{
- targetDay.Weight = sumWeight;
+ targetDay.WEIGHT = sumWeight;
db.Updateable(targetDay).ExecuteCommand();
}
@@ -458,88 +571,66 @@
// 鍚屾 TN_WeekProSpcDetail
var curWeek = System.DateTime.Now.Date.AddDays(-(int)System.DateTime.Now.DayOfWeek + 1);
- var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DayTime == curWeek);
+ var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DAYTIME == curWeek);
if (targetWeek == null)
{
targetWeek = new TN_WeekProDetail()
{
- DayTime = curWeek,
+ DAYTIME = curWeek,
};
db.Insertable(targetWeek).ExecuteCommand();
}
- targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curWeek && a.DownLineTime <= curWeek.AddDays(7)).ToList();
+ targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curWeek && a.DOWNLINETIME <= curWeek.AddDays(7)).ToList();
if (targetEPDs.Count > 0)
{
- if (targetWeek.Weight != sumWeight)
+ if (targetWeek.WEIGHT != sumWeight)
{
- targetWeek.Weight = sumWeight;
+ targetWeek.WEIGHT = sumWeight;
db.Updateable(targetWeek).ExecuteCommand();
}
}
// 鍚屾 TN_MonthProSpcDetail
var curMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).Date;
- var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DayTime == curMonth);
+ var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DAYTIME == curMonth);
if (targetMonth == null)
{
targetMonth = new TN_MonthProDetail()
{
- DayTime = curMonth,
+ DAYTIME = curMonth,
};
db.Insertable(targetMonth).ExecuteCommand();
}
- targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curMonth && a.DownLineTime <= curMonth.AddMonths(1)).ToList();
+ targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curMonth && a.DOWNLINETIME <= curMonth.AddMonths(1)).ToList();
if (targetEPDs.Count > 0)
{
- if (targetMonth.Weight != sumWeight)
+ if (targetMonth.WEIGHT != sumWeight)
{
- targetMonth.Weight = sumWeight;
+ targetMonth.WEIGHT = sumWeight;
db.Updateable(targetMonth).ExecuteCommand();
}
}
// 鍚屾 TN_YearProSpcDetail
var curYear = new DateTime(DateTime.Now.Year, 1, 1).Date;
- var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DayTime == curYear);
+ var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear);
if (targetYear == null)
{
targetYear = new TN_YearProDetail()
{
- DayTime = curYear,
+ DAYTIME = curYear,
};
db.Insertable(targetYear).ExecuteCommand();
}
- targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DownLineTime >= curYear && a.DownLineTime <= curYear.AddYears(1)).ToList();
+ targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curYear && a.DOWNLINETIME <= curYear.AddYears(1)).ToList();
if (targetEPDs.Count > 0)
{
- if (targetYear.Weight != sumWeight)
+ if (targetYear.WEIGHT != sumWeight)
{
- targetYear.Weight = sumWeight;
+ targetYear.WEIGHT = sumWeight;
db.Updateable(targetYear).ExecuteCommand();
}
- }
-
- // 鍚屾 TN_InventoryM 涓�TN_CG_Detail
- var targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => o.ItemState != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮").First();
- if (targetInM != null)
- {
- targetInM.ItemState = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID).S_ITEM_STATE;
-
- db.Updateable<TN_InventoryM>(targetInM).ExecuteCommand();
- }
- targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => System.DateTime.Now >= o.Expiration).First();
- if (targetInM != null)
- {
- targetInM.ItemState = "杩囨湡";
- db.Updateable<TN_InventoryM>(targetInM).ExecuteCommand();
-
- var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID);
- cginfo.S_ITEM_STATE = "杩囨湡";
- cginfo.N_ITEM_STATE = 3;
- db.Updateable<TN_CG_Detail>(cginfo).ExecuteCommand();
}
}
catch (Exception ex)
@@ -643,6 +734,11 @@
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�
LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}");
+
+ Task task27 = Task.Run(() =>
+ {
+ SpecHelper.DeleteInventoryM(cgInfo.S_ID);
+ });
}
else
{
--
Gitblit v1.9.1