From 150b2843db8bf76a35615aa46c17f59df1a0f0f4 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 28 五月 2025 17:25:04 +0800
Subject: [PATCH] 双钱-搬送流程记录班次字段
---
core/Monitor.cs | 223 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 151 insertions(+), 72 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index ed34896..ac0b0fb 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -467,7 +467,8 @@
SPEC = outTimeCg.S_SPE,
CARCODE = outTimeCg.S_CAR_CODE,
WEIGHT = outTimeCg.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = "None",
};
SpecHelper.InsertRemeltDetail(target);
});
@@ -497,7 +498,7 @@
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 != "寰呮" && i.N_ITEM_STATE != 1).First();
- if (targetEPD != null)
+ 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).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
@@ -506,7 +507,7 @@
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 && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First();
- if (targetEPD != null)
+ if (targetEPD != null)//妫�祴鍑鸿繃鏈熺殑璐у搧
{
targetEPD.ITEMSTATE = "杩囨湡";
db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
@@ -521,7 +522,7 @@
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)
+ 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();
@@ -530,9 +531,10 @@
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)
+ if (targetInM != null)//妫�祴鍑哄凡杩囨湡鐨勮揣鍝� {
targetInM.ITEMSTATE = "杩囨湡";
+ targetInM.EXPIRATION_DAY = 0;
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);
@@ -540,97 +542,171 @@
cginfo.N_ITEM_STATE = 3;
db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).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.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now,targetInM.EXPIRATION);
+ db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
+ }
// 鍚屾 TN_DayProDetail
var curDay = System.DateTime.Now.Date;
- var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay);
- if (targetDay == null)
- {
- targetDay = new TN_DayProDetail()
- {
- DAYTIME = curDay,
- };
- db.Insertable(targetDay).ExecuteCommand();
- }
-
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 specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳ぉ鐨勮揣鍝佹湁鍝簺瑙勬牸
- if (targetEPDs.Count > 0)
+ if (specList.Count>0)
{
- if (targetDay.WEIGHT != sumWeight)
+ foreach (var item in specList)
{
- targetDay.WEIGHT = sumWeight;
- db.Updateable(targetDay).ExecuteCommand();
- }
+ var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay && a.SPEC == item);
+ if (targetDay == null)
+ {
+ targetDay = new TN_DayProDetail()
+ {
+ DAYTIME = curDay,
+ SPEC = item,
+ };
+ db.Insertable(targetDay).ExecuteCommand();
+ }
+ else
+ {
+ var sumWeight = targetEPDs.Where(b=>b.SPEC == item).Sum(a => a.WEIGHT);
+ if (targetDay.WEIGHT != sumWeight)
+ {
+ targetDay.WEIGHT = sumWeight;
+ db.Updateable(targetDay).ExecuteCommand();
+ }
+ else
+ {
+ LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_DayProDetail璺宠繃");
+ }
+ }
+ }
+ }
+ else
+ {
+ LogHelper.Info("褰撳ぉ鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_DayProDetail璺宠繃");
}
// 鍚屾 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);
- if (targetWeek == null)
- {
- targetWeek = new TN_WeekProDetail()
- {
- DAYTIME = curWeek,
- };
- db.Insertable(targetWeek).ExecuteCommand();
- }
-
targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curWeek && a.DOWNLINETIME <= curWeek.AddDays(7)).ToList();
- if (targetEPDs.Count > 0)
+ specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳懆鐨勮揣鍝佹湁鍝簺瑙勬牸
+ if (specList.Count > 0)
{
- if (targetWeek.WEIGHT != sumWeight)
+ foreach (var item in specList)
{
- targetWeek.WEIGHT = sumWeight;
- db.Updateable(targetWeek).ExecuteCommand();
+ var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DAYTIME == curWeek && a.SPEC == item);
+ if (targetWeek == null)
+ {
+ targetWeek = new TN_WeekProDetail()
+ {
+ DAYTIME = curWeek,
+ SPEC = item,
+ };
+ db.Insertable(targetWeek).ExecuteCommand();
+ }
+ else
+ {
+ var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
+ if (targetWeek.WEIGHT != sumWeight)
+ {
+ targetWeek.WEIGHT = sumWeight;
+ db.Updateable(targetWeek).ExecuteCommand();
+ }
+ else
+ {
+ LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_WeekProSpcDetail璺宠繃");
+ }
+ }
}
+ }
+ else
+ {
+ LogHelper.Info("褰撳懆鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_WeekProSpcDetail璺宠繃");
}
// 鍚屾 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);
- if (targetMonth == null)
- {
- targetMonth = new TN_MonthProDetail()
- {
- DAYTIME = curMonth,
- };
- db.Insertable(targetMonth).ExecuteCommand();
- }
targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curMonth && a.DOWNLINETIME <= curMonth.AddMonths(1)).ToList();
- if (targetEPDs.Count > 0)
+ specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撴湀鐨勮揣鍝佹湁鍝簺瑙勬牸
+ if (specList.Count > 0)
{
- if (targetMonth.WEIGHT != sumWeight)
+ foreach (var item in specList)
{
- targetMonth.WEIGHT = sumWeight;
- db.Updateable(targetMonth).ExecuteCommand();
+ var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DAYTIME == curMonth && a.SPEC == item);
+ if (targetMonth == null)
+ {
+ targetMonth = new TN_MonthProDetail()
+ {
+ DAYTIME = curMonth,
+ SPEC = item,
+ };
+ db.Insertable(targetMonth).ExecuteCommand();
+ }
+ else
+ {
+ var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
+ if (targetMonth.WEIGHT != sumWeight)
+ {
+ targetMonth.WEIGHT = sumWeight;
+ db.Updateable(targetMonth).ExecuteCommand();
+ }
+ else
+ {
+ LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_MonthProSpcDetail璺宠繃");
+ }
+ }
}
+ }
+ else
+ {
+ LogHelper.Info("褰撴湀鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_MonthProSpcDetail璺宠繃");
}
// 鍚屾 TN_YearProSpcDetail
var curYear = new DateTime(DateTime.Now.Year, 1, 1).Date;
- var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear);
- if (targetYear == null)
- {
- targetYear = new TN_YearProDetail()
- {
- DAYTIME = curYear,
- };
- db.Insertable(targetYear).ExecuteCommand();
- }
+
targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curYear && a.DOWNLINETIME <= curYear.AddYears(1)).ToList();
- if (targetEPDs.Count > 0)
+ specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳勾鐨勮揣鍝佹湁鍝簺瑙勬牸
+ if (specList.Count > 0)
{
- if (targetYear.WEIGHT != sumWeight)
+ foreach (var item in specList)
{
- targetYear.WEIGHT = sumWeight;
- db.Updateable(targetYear).ExecuteCommand();
+ var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear && a.SPEC == item);
+ if (targetYear == null)
+ {
+ targetYear = new TN_YearProDetail()
+ {
+ DAYTIME = curYear,
+ SPEC = item,
+ };
+ db.Insertable(targetYear).ExecuteCommand();
+ }
+ else
+ {
+ var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT);
+ if (targetYear.WEIGHT != sumWeight)
+ {
+ targetYear.WEIGHT = sumWeight;
+ db.Updateable(targetYear).ExecuteCommand();
+ }
+ else
+ {
+ LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_YearProSpcDetail璺宠繃");
+ }
+ }
}
+ }
+ else
+ {
+ LogHelper.Info("褰撳勾鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_YearProSpcDetail璺宠繃");
}
}
catch (Exception ex)
@@ -701,21 +777,24 @@
var db = new SqlHelper<object>().GetInstance();
try
{
- var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.S_AREA_CODE == Settings.Areas[7]);
- if (endLoc == null)
- {
- LogHelper.Info($"鏈壘鍒板悎閫傜殑缁堢偣璐т綅锛岃姹俛.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 鏃�&& a.S_AREA_CODE == Settings.Areas[7]");
- return;
- }
+
var startLoc = 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) => o.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.S_AREA_CODE == Settings.Areas[1]
&& s.N_ITEM_STATE == 2 && s.S_ITEM_STATE == "涓嶅悎鏍�).First();
-
- if (endLoc == null)
+
+ if (startLoc == null)
{
LogHelper.Info($"鏈壘鍒板悎閫傜殑璧风偣璐т綅锛岃姹俹.N_CURRENT_NUM == 1 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 鏃�&& o.S_AREA_CODE == Settings.Areas[1] && s.N_ITEM_STATE ==2 && s.S_ITEM_STATE==涓嶅悎鏍�);
+ return;
+ }
+
+
+ var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.S_AREA_CODE == Settings.Areas[7]);
+ if (endLoc == null)
+ {
+ LogHelper.Info($"鏈壘鍒板悎閫傜殑缁堢偣璐т綅锛岃姹俛.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 鏃�&& a.S_AREA_CODE == Settings.Areas[7]");
return;
}
@@ -733,7 +812,7 @@
LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�
- LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}");
Task task27 = Task.Run(() =>
{
@@ -742,7 +821,7 @@
}
else
{
- LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟澶辫触锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟澶辫触锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}");
}
--
Gitblit v1.9.1