From a824b8140c6952a361aaf91f60e8dabf92753bb3 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 27 五月 2025 17:30:58 +0800
Subject: [PATCH] 双钱-日周月年产量记录表增加规格字段，WMS库存管理表增加距离过期还剩多少天字段
---
wms/SpecHelper.cs | 34 +++
Program.cs | 2
core/Monitor.cs | 197 +++++++++++++------
models/TN_YearProDetail.cs | 7
api/ApiHelper.cs | 312 ++++++++++++++----------------
models/TN_InventoryM.cs | 7
models/TN_DayProDetail.cs | 5
models/TN_MonthProDetail.cs | 7
core/WCSCore.cs | 6
models/TN_WeekProDetail.cs | 7
10 files changed, 352 insertions(+), 232 deletions(-)
diff --git a/Program.cs b/Program.cs
index 572516f..db9ded7 100644
--- a/Program.cs
+++ b/Program.cs
@@ -141,7 +141,7 @@
//鏍规嵁S7/Modbus鍗忚鍒ゆ柇杈撻�绾跨殑淇″彿 鍘熸潗鏂欎骇绾垮簱鍖�>婊℃墭缂撳瓨搴撳尯锛岀┖鎵樼紦瀛樺簱鍖�>鍘熸潗鏂欎骇绾垮簱鍖� tasks.Add(GetTask(Monitor.CheckS7Devices));
- tasks.Add(GetTask(Monitor.SynchronizationEquipPro));//鍚屾 TN_EquipProDetail TN_InventoryM
+ tasks.Add(GetTask(Monitor.SynchronizationEquipPro));//鍚屾 TN_EquipProDetail TN_InventoryM 骞存湀鏃ラ噸閲忚〃
tasks.Add(GetTask(Monitor.FullOutTime));//婊℃墭杩囨湡鍑哄簱 杩囨湡鍚堟牸鍥炲簱锛岃繃鏈熸鍝佸洖鐐�
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a8b37e2..9b86ead 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -640,204 +640,188 @@
var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
if (startPoint != null)//璧风偣瀛樺湪
{
- var woInfo = db.Queryable<TN_WorkOrder>().Where(a => a.S_LINE_NO == startPoint.ProductionLine_Name && a.S_B_STATE == "寮�惎").OrderBy(b => b.T_CREATE, OrderByType.Desc).First();
-
- if (woInfo != null)//褰撳墠浜х嚎涓嶅瓨鍦ㄥ紑鍚殑鏈�柊鐨勫伐鍗�+ var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
+ if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌￠攣浣� {
- var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
- if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌￠攣浣�+ var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
+ if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭� {
- var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
- if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭�+ result.resultCode = 1;
+ result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐у搧";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+ else
+ {
+ var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
+ if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣� {
- result.resultCode = 1;
- result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐у搧";
+ result.resultCode = 2;
+ result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐т綅";
LogHelper.Info(result.resultMsg);
return result;
}
else
{
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
- if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣�+ //鏂板璐т綅瀹瑰櫒鍏崇郴琛�+ locCntrRel = new TN_Loc_Container()
{
- result.resultCode = 2;
- result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙ｇ粦璐т綅";
+ S_LOC_CODE = startPoint.PointOut,
+ S_CNTR_CODE = model.RfId,
+ };
+
+ var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
+ byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
+ string rfids16 = BitConverter.ToString(rfid);
+ string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
+ LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+
+ if (rfids != model.RfId)
+ {
+ result.resultCode = 9;
+ result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
LogHelper.Info(result.resultMsg);
return result;
}
- else
+ var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
+ var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
+
+ var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
+
+ TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛� {
- //鏂板璐т綅瀹瑰櫒鍏崇郴琛�- locCntrRel = new TN_Loc_Container()
+ S_CNTR_CODE = model.RfId,
+ S_ITEM_SPEC = model.Spe,
+ S_SPE = model.Spe,
+ S_CAR_CODE = model.CarCode,
+ N_ITEM_STATE = 1,
+ S_ITEM_STATE = "寰呮",
+ F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�+ };
+
+ var endLoc = db.Queryable<TN_Location>().
+ Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
+ OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+
+ if (endLoc != null)
+ {
+ var task1 = new TN_Task()
{
- S_LOC_CODE = startPoint.PointOut,
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_START_AREA = startLoc.S_AREA_CODE,
+ S_END_AREA = endLoc.S_AREA_CODE,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_TYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+ N_B_STATE = 0,
S_CNTR_CODE = model.RfId,
+ S_SPEC = model.Spe,
};
- var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
- byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
- string rfids16 = BitConverter.ToString(rfid);
- string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
- LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+ startLoc.N_LOCK_STATE = 2;
+ startLoc.S_LOCK_STATE = "鍑哄簱閿�;
+ startLoc.N_CURRENT_NUM = 1;
+ startLoc.T_MODIFY = DateTime.Now;
- if (rfids != model.RfId)
+ endLoc.N_LOCK_STATE = 1;
+ endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+ startLoc.T_MODIFY = DateTime.Now;
+
+ using (var tran = db.Ado.UseTran())
{
- result.resultCode = 9;
- result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
- var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
-
- var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
-
- TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛�- {
- S_CNTR_CODE = model.RfId,
- S_ITEM_CODE = woInfo.S_ITEM_CODE,
- S_BATCH_NO = woInfo.S_BATCH_CODE,
- S_ITEM_SPEC = woInfo.S_ITEM_SPEC,
- S_SPE= woInfo.S_ITEM_SPEC,
- S_CAR_CODE = model.CarCode,
- N_ITEM_STATE = 1,
- S_ITEM_STATE = "寰呮",
- F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�- };
-
- var endLoc = db.Queryable<TN_Location>().
- Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
- OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
-
- if (endLoc != null)
- {
- var task1 = new TN_Task()
+ if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦� {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
- N_B_STATE = 0,
- S_CNTR_CODE = model.RfId,
- S_SPEC = model.Spe,
- };
-
- startLoc.N_LOCK_STATE = 2;
- startLoc.S_LOCK_STATE = "鍑哄簱閿�;
- startLoc.N_CURRENT_NUM = 1;
- startLoc.T_MODIFY = DateTime.Now;
-
- endLoc.N_LOCK_STATE = 1;
- endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
- startLoc.T_MODIFY = DateTime.Now;
-
- using (var tran = db.Ado.UseTran())
- {
- if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦�+ modelCI = new TN_CAR_IN()
{
- modelCI = new TN_CAR_IN()
- {
- S_CNTR_CODE = model.RfId,
- S_CAR_CODE = model.CarCode,
- S_B_STATE = "0",
- };
- if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
- {
- tran.RollbackTran();
- result.resultCode = 8;
- result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
- LogHelper.Info(result.resultMsg);
- return result;
- }
- }
-
- if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
- db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
- db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
- db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�- {
- tran.CommitTran();
- result.resultCode = 0;
- result.resultMsg = "鎴愬姛";
- LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
-
- Task task99 = Task.Run(() =>
- {
- WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
- });
-
- Task task98 = Task.Run(() =>
- {
- var target = new TN_EquipProDetail()
- {
- S_ID = tN_CG_Detail.S_ID,
- TASKTYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
- RFID = model.RfId,
- SPEC = woInfo.S_ITEM_SPEC,
- CARCODE = model.CarCode,
- WEIGHT = modelWeight,
- ITEMSTATE = "寰呮",
- ITEMCODE = woInfo.S_ITEM_CODE,
- LOGINNAME = model.staff,
- SHIFT = "None",
- STARTLOC = startLoc.S_CODE,
- };
- SpecHelper.InsertEquipProDetail(target);
- });
-
- Task task27 = Task.Run(() =>
- {
- var target = new TN_InventoryM()
- {
- S_ID = tN_CG_Detail.S_ID,
- RFID = model.RfId,
- SPEC = woInfo.S_ITEM_SPEC,
- WEIGHT = modelWeight,
- ITEMSTATE = "寰呮",
- ITEMCODE = woInfo.S_ITEM_CODE,
- LOGINNAME = model.staff,
- SHIFT = "None",
- };
- SpecHelper.InsertInventoryM(target);
- });
-
- return result;
- }
- else
+ S_CNTR_CODE = model.RfId,
+ S_CAR_CODE = model.CarCode,
+ S_B_STATE = "0",
+ };
+ if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
{
tran.RollbackTran();
- result.resultCode = 7;
- result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+ result.resultCode = 8;
+ result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
LogHelper.Info(result.resultMsg);
return result;
}
}
- }
- else
- {
- result.resultCode = 4;
- result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
- LogHelper.Info(result.resultMsg);
- return result;
+
+ if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
+ db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
+ db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
+ db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
+ db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ {
+ tran.CommitTran();
+ result.resultCode = 0;
+ result.resultMsg = "鎴愬姛";
+ LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
+
+ Task task99 = Task.Run(() =>
+ {
+ WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
+ });
+
+ Task task98 = Task.Run(() =>
+ {
+ var target = new TN_EquipProDetail()
+ {
+ S_ID = tN_CG_Detail.S_ID,
+ TASKTYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+ RFID = model.RfId,
+ SPEC = model.Spe,
+ CARCODE = model.CarCode,
+ WEIGHT = modelWeight,
+ ITEMSTATE = "寰呮",
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ STARTLOC = startLoc.S_CODE,
+ };
+ SpecHelper.InsertEquipProDetail(target);
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ var target = new TN_InventoryM()
+ {
+ S_ID = tN_CG_Detail.S_ID,
+ RFID = model.RfId,
+ SPEC = model.Spe,
+ WEIGHT = modelWeight,
+ ITEMSTATE = "寰呮",
+ LOGINNAME = model.staff,
+ SHIFT = "None",
+ };
+ SpecHelper.InsertInventoryM(target);
+ });
+
+ return result;
+ }
+ else
+ {
+ tran.RollbackTran();
+ result.resultCode = 7;
+ result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
}
}
+ else
+ {
+ result.resultCode = 4;
+ result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
}
- }
- else
- {
- result.resultCode = 9;
- result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
- LogHelper.Info(result.resultMsg);
- return result;
}
}
else
{
- result.resultCode = 10;
- result.resultMsg = $"褰撳墠浜х嚎{startPoint.ProductionLine_Name}浣嶇疆{startPoint.PointOut}娌℃湁寮�惎鐨勫伐鍗�;
+ result.resultCode = 9;
+ result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
LogHelper.Info(result.resultMsg);
return result;
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index b0de987..4926007 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -497,7 +497,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 +506,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 +521,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 +530,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,98 +541,172 @@
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)
{
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index c1ec6bd..8d572b2 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -143,10 +143,14 @@
Task task19 = Task.Run(() =>
{
- if (TN_Task.S_END_AREA == Settings.Areas[2])
+ if (TN_Task.S_END_AREA == Settings.Areas[1])
{
SpecHelper.UpdateInventoryM_RuKu(TN_Task.S_CNTR_CODE);
}
+ else
+ {
+ LogHelper.Info($"鏇存柊WMS搴撳瓨鏄庣粏鐨勫叆搴撴椂闂磋烦杩囷紝TN_Task.S_END_AREA锛�{TN_Task.S_END_AREA }涓嶇瓑浜�Settings.Areas[1]锛歿Settings.Areas[1]}");
+ }
});
break;
diff --git a/models/TN_DayProDetail.cs b/models/TN_DayProDetail.cs
index cca369e..e7d84ce 100644
--- a/models/TN_DayProDetail.cs
+++ b/models/TN_DayProDetail.cs
@@ -19,6 +19,11 @@
public DateTime DAYTIME { get; set; }
/// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string SPEC { get; set; }
+
+ /// <summary>
/// 鎬婚噸閲� /// </summary>
public float WEIGHT { get; set; }
diff --git a/models/TN_InventoryM.cs b/models/TN_InventoryM.cs
index d961b2f..09b8f25 100644
--- a/models/TN_InventoryM.cs
+++ b/models/TN_InventoryM.cs
@@ -12,7 +12,7 @@
/// <summary>
/// 鍏ュ簱鏃堕棿
/// </summary>
- public DateTime INAREATIME { get; set; }
+ public DateTime INAREATIME { get; set; } = System.DateTime.Now;
/// <summary>
/// 瀹瑰櫒鍙�@@ -53,5 +53,10 @@
/// 杩囨湡鏃堕棿
/// </summary>
public DateTime EXPIRATION { get; set; }
+
+ /// <summary>
+ /// 璺濈杩囨湡杩樻湁鍑犲ぉ
+ /// </summary>
+ public int EXPIRATION_DAY { get; set; } = 0;
}
}
diff --git a/models/TN_MonthProDetail.cs b/models/TN_MonthProDetail.cs
index df54725..0f0a3b2 100644
--- a/models/TN_MonthProDetail.cs
+++ b/models/TN_MonthProDetail.cs
@@ -19,7 +19,12 @@
public DateTime DAYTIME { get; set; }
/// <summary>
- /// 鎬婚噸閲�+ /// 瑙勬牸
+ /// </summary>
+ public string SPEC { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
/// </summary>
public float WEIGHT { get; set; }
diff --git a/models/TN_WeekProDetail.cs b/models/TN_WeekProDetail.cs
index 048edc2..3684b0f 100644
--- a/models/TN_WeekProDetail.cs
+++ b/models/TN_WeekProDetail.cs
@@ -19,7 +19,12 @@
public DateTime DAYTIME { get; set; }
/// <summary>
- /// 鎬婚噸閲�+ /// 瑙勬牸
+ /// </summary>
+ public string SPEC { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
/// </summary>
public float WEIGHT { get; set; }
diff --git a/models/TN_YearProDetail.cs b/models/TN_YearProDetail.cs
index 35e64e6..932da3b 100644
--- a/models/TN_YearProDetail.cs
+++ b/models/TN_YearProDetail.cs
@@ -19,7 +19,12 @@
public DateTime DAYTIME { get; set; }
/// <summary>
- /// 鎬婚噸閲�+ /// 瑙勬牸
+ /// </summary>
+ public string SPEC { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺
/// </summary>
public float WEIGHT { get; set; }
diff --git a/wms/SpecHelper.cs b/wms/SpecHelper.cs
index cc88f6b..7779c2a 100644
--- a/wms/SpecHelper.cs
+++ b/wms/SpecHelper.cs
@@ -368,7 +368,14 @@
LogHelper.Info($"鏇存柊WMS搴撳瓨鏄庣粏鐨勫叆搴撴椂闂达紝澶辫触锛屽鍣ㄥ彿锛歿cntId}");
}
}
-
+ else
+ {
+ LogHelper.Info($"鏇存柊WMS搴撳瓨鏄庣粏鐨勫叆搴撴椂闂达紝澶辫触锛屽鍣ㄥ彿锛歿cntId}锛孴N_InventoryM涓虹┖");
+ }
+ }
+ else
+ {
+ LogHelper.Info($"鏇存柊WMS搴撳瓨鏄庣粏鐨勫叆搴撴椂闂达紝澶辫触锛屽鍣ㄥ彿锛歿cntId}锛孴N_CG_Detail涓虹┖");
}
}
catch (Exception ex)
@@ -399,5 +406,30 @@
LogHelper.Error("鏇存柊WMS搴撳瓨鏄庣粏鐨勮繃鏈熸椂闂村け璐�, ex);
}
}
+
+ public static int CalculateDaysDifference(DateTime start, DateTime end)
+ {
+ try
+ {
+ // 璁＄畻鎬绘椂闂村樊
+ TimeSpan difference = end - start;
+
+ // 濡傛灉宸�涓鸿礋锛坋nd鏃╀簬start锛夛紝杩斿洖0
+ if (difference.TotalDays < 0)
+ {
+ return 0;
+ }
+
+ // 鑾峰彇鎬诲ぉ鏁帮紙鍖呮嫭灏忔暟閮ㄥ垎锛�+ double totalDays = difference.TotalDays;
+
+ // 鍚戜笂鍙栨暣
+ return (int)Math.Ceiling(totalDays);
+ }
+ catch (Exception ex)
+ {
+ return 0;
+ }
+ }
}
}
--
Gitblit v1.9.1