From a93b0e99036c24b9bd58c79bf5e7364b1ba28bae Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期二, 01 七月 2025 16:02:33 +0800
Subject: [PATCH] 福建佳通-流程优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/Monitor.cs | 214 +++++++++++++++++++++--------------------------------
1 files changed, 85 insertions(+), 129 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/Monitor.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/Monitor.cs
index d7a5809..951bf44 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/Monitor.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/core/Monitor.cs
@@ -23,55 +23,59 @@
/// </summary>
internal class Monitor
{
-
+
/// <summary>
- /// 鐩戝惉MES浠诲姟涓棿琛�- /// 1.閽㈠寘婊℃枡涓嬬嚎
- /// 2.鎴愬瀷鏈哄彨鏂�+ /// 鐩戝惉閽㈠寘婊℃枡涓嬬嚎MES浠诲姟
/// </summary>
- public static void MonitorMesTask() {
- LogHelper.Info("鐩戝惉MES浠诲姟涓棿琛�, "WMS");
+ public static void MonitorGBOffLineMesTask()
+ {
var mesTaskList = WMSHelper.GetLjMesTaskList("PENDING");
- foreach (var mesTask in mesTaskList)
+ if (mesTaskList.Count > 0)
{
- // 1.閽㈠寘婊℃枡涓嬬嚎
- List<string> lineLoclist = new List<string>() { };
- lineLoclist.Add("GBJTW-01");
- lineLoclist.Add("GBJTW-02");
- if (mesTask.MSG_TYPE == "1" && mesTask.PALLET_TYPE == "7" && lineLoclist.Contains(mesTask.PALLET_ID))
+ mesTaskList = mesTaskList.Where(a => a.MSG_TYPE == "1" && a.PALLET_TYPE == "7").ToList();
+ if (mesTaskList.Count > 0)
{
- LogHelper.Info("MES閽㈠寘婊℃枡涓嬬嚎浠诲姟", "WMS");
- OffLineRequest request = new OffLineRequest(){ loc = mesTask.POSITION_ID, cntrNo = mesTask.PALLET_ID};
- ApiHelper.offLineProcess(request);
- }
-
- // 2.鎴愭柊鏈哄彨鏂�- if (mesTask.MSG_TYPE == "0") {
- var lineSideLoc = WMSHelper.GetLineSideLoc(mesTask.POSITION_ID);
- if (lineSideLoc != null )
+ foreach (var mesTask in mesTaskList)
{
- LogHelper.Info("MES鎴愭柊鏈哄彨鏂欎换鍔�, "WMS");
+ LogHelper.Info("MES閽㈠寘婊℃枡涓嬬嚎浠诲姟", "WMS");
+ OffLineRequest request = new OffLineRequest() { loc = mesTask.POSITION_ID, cntrNo = mesTask.PALLET_ID };
+ ApiHelper.offLineProcess(request);
+ }
+ }
+ }
+ }
- // 2.1鎴愭柊鏈哄彨鏂�鏂滆)
- if (mesTask.PALLET_TYPE == "5" || mesTask.PALLET_TYPE == "6")
+ /// <summary>
+ /// 鐩戝惉鎴愬瀷鏈哄彨鏂橫ES浠诲姟
+ /// </summary>
+ public static void MonitorCXJCallMaterialMesTask()
+ {
+ var mesTaskList = WMSHelper.GetLjMesTaskList("PENDING");
+ if (mesTaskList.Count > 0)
+ {
+ mesTaskList = mesTaskList.Where(a => a.MSG_TYPE == "0").ToList();
+ if (mesTaskList.Count > 0)
+ {
+ foreach (var mesTask in mesTaskList)
+ {
+ var lineSideLoc = WMSHelper.GetLineSideLoc(mesTask.EQP);
+ if (lineSideLoc != null)
{
- var xcTask = WMSHelper.GetLjXcTaskById(mesTask.ID);
- if (xcTask == null)
+ LogHelper.Info($"鎴愬瀷鏈哄彨鏂欎换鍔★紝MES浠诲姟ID锛歿mesTask.ID}", "WMS");
+ if (mesTask.PALLET_TYPE == "5" || mesTask.PALLET_TYPE == "6")
{
- ApiHelper.callMaterialHDK(mesTask.MATERIAL_CODE, mesTask.POSITION_ID, mesTask.ID);
+ // 2.1鎴愭柊鏈哄彨鏂�鏂滆)
+ var xcTask = WMSHelper.GetLjXcTaskById(mesTask.ID);
+ if (xcTask == null)
+ {
+ ApiHelper.callMaterialXC(mesTask.MATERIAL_CODE, mesTask.POSITION_ID, mesTask.ID);
+ }
}
else
{
- mesTask.RETURN_CODE = xcTask.RETURN_CODE;
- mesTask.RECEIVE_FLAG = xcTask.RECEIVE_FLAG;
- mesTask.RECEIVE_DATE = xcTask.RECEIVE_DATE;
- WMSHelper.updateLjMesTask(mesTask);
+ // 2.2 鎴愭柊鏈哄彨鏂�+ ApiHelper.callMaterial(mesTask.MATERIAL_CODE, mesTask.EQP, mesTask.ID);
}
- }
- else
- {
- // 2.2 鎴愭柊鏈哄彨鏂�- ApiHelper.callMaterial(mesTask.MATERIAL_CODE, mesTask.POSITION_ID, mesTask.ID);
}
}
}
@@ -79,103 +83,53 @@
}
/// <summary>
- /// 鐩戝惉XC鍑哄簱浠诲姟涓棿琛�- /// 璇诲彇鏂滆绔嬪簱鍑哄簱浠诲姟琛紝鏌ヨ浠诲姟鏄惁鎵ц瀹屾垚锛屽畬鎴愬垯锛岃Е鍙慉GV浠诲姟
+ /// 鐩戝惉浠诲姟涓棿琛� /// </summary>
- public static void MonitorXcOutTask()
+ public static void MonitorXcTask()
{
- var xcOutTasks = WMSHelper.getLjXcOutTask("PENDING", "2");
- foreach (var outTask in xcOutTasks)
+ var ljMesTasks = WMSHelper.GetLjMesTaskListHD();
+ foreach (var mesTask in ljMesTasks)
{
- var mesTask = WMSHelper.GetLjMesTaskById(outTask.ID);
- if (mesTask != null && mesTask.RETURN_CODE == "2")
+ var xcTask = WMSHelper.GetLjXcTaskById(mesTask.ID);
+ if (xcTask != null && xcTask.RETURN_CODE != mesTask.RETURN_CODE)
{
- Location startLoc = LocationHelper.GetLoc(outTask.POSITION_ID);
- Location endLoc = LocationHelper.GetLoc(mesTask.POSITION_ID);
-
- var wmsTask = WMSHelper.GetWmsTaskByCntr(outTask.PALLET_ID);
- if (wmsTask == null)
+ if (xcTask.RETURN_CODE == "3")
{
- if (startLoc.N_LOCK_STATE == 0 && endLoc.N_LOCK_STATE == 0)
+ var wcsTask = WCSHelper.GetTask(xcTask.AGVORDER_ID);
+ if (wcsTask != null)
{
- // 1.鍒涘缓鏂滆-鎴愭柊鏈哄彨鏂欎綔涓�- wmsTask = new WMSTask()
+ var wmsTask = WMSHelper.GetWmsTask(wcsTask.S_OP_CODE);
+ if (wmsTask != null)
{
- S_CNTR_CODE = outTask.PALLET_ID,
- S_CODE = WMSHelper.GenerateTaskNo(),
- S_START_LOC = startLoc.S_CODE,
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_TYPE = "鍙枡鍑哄簱浠诲姟",
- S_OP_DEF_CODE = mesTask.ID.ToString(),
- S_OP_DEF_NAME = "鎴愬瀷鏈哄彨鏂欏嚭搴撲换鍔�鏂滆)",
- T_START_TIME = DateTime.Now,
- };
- if (WMSHelper.CreateWmsTask(wmsTask))
- {
- WCSTask wcsTask = new WCSTask()
+ Location startLoc = LocationHelper.GetLoc(xcTask.POSITION_ID);
+ if (startLoc != null)
{
- S_OP_NAME = wmsTask.S_OP_DEF_NAME,
- S_OP_CODE = wmsTask.S_CODE,
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_CNTR_CODE = wmsTask.S_CNTR_CODE,
- S_TYPE = wmsTask.S_TYPE,
- S_START_LOC = startLoc.S_CODE,
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_SCHEDULE_TYPE = "AGV",
- N_PRIORITY = 10,
- T_START_TIME = DateTime.Now,
- };
+ wcsTask.S_CNTR_CODE = xcTask.PALLET_ID;
+ wcsTask.S_START_LOC = startLoc.S_CODE;
+ wcsTask.S_START_AREA = startLoc.S_AREA_CODE;
+ wcsTask.N_B_STATE = 0;
+ wcsTask.S_B_STATE = "绛夊緟";
+ WCSHelper.UpdateWcsTask(wcsTask);
- if (WCSHelper.CreateTask(wcsTask))
- {
- // 璧风偣銆佺粓鐐瑰姞閿�- LocationHelper.LockLoc(wcsTask.S_START_LOC, 2);
- LocationHelper.LockLoc(wcsTask.S_END_LOC, 1);
-
- // 鏇存柊浣滀笟浠诲姟鐘舵�
+ wmsTask.S_CNTR_CODE = xcTask.PALLET_ID;
+ wmsTask.S_START_LOC = startLoc.S_CODE;
+ wmsTask.S_START_AREA = startLoc.S_AREA_CODE;
wmsTask.N_B_STATE = 1;
- WMSHelper.UpdateTaskState(wmsTask);
+ wmsTask.S_B_STATE = "鎵ц";
+ WMSHelper.UpdateWmsTask(wmsTask);
+
+ // 鏌ヨ鎵樼洏鐗╂枡淇℃伅琛�+ WMSHelper.updateCarrier(mesTask.PALLET_ID);
}
}
}
- else
- {
- LogHelper.Info($"XC鍑哄簱浠诲姟ID锛歿mesTask.ID},鏃犳硶鐢熸垚鍙枡浠诲姟,璧风偣鎴栫粓鐐逛笂閿�, "鏂滆");
- }
}
- else
- {
- WCSTask wcsTask = new WCSTask()
- {
- S_OP_NAME = wmsTask.S_OP_DEF_NAME,
- S_OP_CODE = wmsTask.S_CODE,
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_CNTR_CODE = wmsTask.S_CNTR_CODE,
- S_TYPE = wmsTask.S_TYPE,
- S_START_LOC = startLoc.S_CODE,
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_SCHEDULE_TYPE = "AGV",
- N_PRIORITY = 10,
- T_START_TIME = DateTime.Now,
- };
- if (WCSHelper.CreateTask(wcsTask))
- {
- // 璧风偣銆佺粓鐐瑰姞閿�- LocationHelper.LockLoc(wcsTask.S_START_LOC, 2);
- LocationHelper.LockLoc(wcsTask.S_END_LOC, 1);
-
- // 鏇存柊浣滀笟浠诲姟鐘舵�
- wmsTask.N_B_STATE = 1;
- WMSHelper.UpdateTaskState(wmsTask);
- }
- }
+ mesTask.POSITION_ID = xcTask.POSITION_ID;
+ mesTask.RETURN_CODE = xcTask.RETURN_CODE;
+ mesTask.YCL_BATCH = xcTask.YCL_BATCH;
+ mesTask.PALLET_ID = xcTask.PALLET_ID;
+ WMSHelper.updateLjMesTask(mesTask);
}
}
}
@@ -278,25 +232,24 @@
WMSHelper.updateMateral();
}
+
/// <summary>
/// 瀹氭椂鏇存柊搴撳瓨淇℃伅 鏇存柊棰戠巼锛�1鍒嗛挓
/// </summary>
public static void UpdateInventoryRegularly()
{
var db = new SqlHelper<object>().GetInstance();
+ var areaCodeList = Settings.areaPropertyList.Select(a => a.areaCode).ToList();
var locations = db.Queryable<Location>()
- .LeftJoin<LjLotOnhand>((a, b) => a.S_CODE == b.STORAGE_LOCATION)
- .LeftJoin<LocCntrRel>((a, b, c) => a.S_CODE == c.S_LOC_CODE)
- .Where((a, b, c) => b.PALLET_ID != c.S_CNTR_CODE)
+ .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
+ .Where((a,b) => a.N_CURRENT_NUM > 0 && b.S_CNTR_CODE != null && areaCodeList.Contains(a.S_AREA_CODE) )
.ToList();
+
+ // 鍒犻櫎鎵�湁搴撳瓨淇℃伅锛岃繘琛岄噸缃�+ db.Deleteable<LjLotOnhand>().ExecuteCommand();
foreach (var loc in locations)
{
- var lotOnhand = db.Queryable<LjLotOnhand>().Where(a => a.STORAGE_LOCATION == loc.S_CODE).First();
- if (lotOnhand != null) {
- db.Deleteable(lotOnhand).ExecuteCommand();
- }
-
var locCntrRels = LocationHelper.GetLocCntr(loc.S_CODE);
if (locCntrRels != null && locCntrRels.Count > 0)
{
@@ -307,16 +260,19 @@
var material = WMSHelper.GetMaterial(cntrItem.S_ITEM_CODE);
LjLotOnhand ljLotOnhand = new LjLotOnhand()
{
+ ID = WMSHelper.GenerateStockRecordNo(),
MATERIAL_CODE = cntrItem.S_ITEM_CODE,
LOT_NAME = cntrItem.S_BATCH_NO,
PALLET_ID = cntrItem.S_CNTR_CODE,
STORAGE_LOCATION = loc.S_CODE,
QC_STATUS = cntrItem.S_ITEM_STATE,
- UNIT = material.S_UNIT,
+ UNIT = material == null ? "":material.S_UNIT,
QTY = cntrItem.F_QTY,
- IN_DATE = cntrItem.T_INBOUND_TIME,
+ IN_DATE = cntrItem.T_INBOUND_TIME.ToString("yyyy-MM-dd"),
+ CREATION_DATE = DateTime.Now,
+ WAREHOUSE_TYPE = "2"
};
- db.Insertable(lotOnhand).ExecuteCommand();
+ db.Insertable(ljLotOnhand).ExecuteCommand();
}
});
}
--
Gitblit v1.9.1