From 7a4c218909936721fe281737491d10efc7378e09 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 19 七月 2024 17:53:30 +0800
Subject: [PATCH] 优化工单信息页面
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/EmptyTrayIn.cs | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 53 insertions(+), 44 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/EmptyTrayIn.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/EmptyTrayIn.cs"
index 10751c5..8fc4ab7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/EmptyTrayIn.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/EmptyTrayIn.cs"
@@ -27,52 +27,10 @@
{
VOLContext Context = new VOLContext();
Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
- Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
- var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.quantity == 5 && x.enable).ToList();
+ var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 5 && x.enable).ToList();
foreach (var EmptyStation in EmptyStations)
{
- try
- {
- if (agvtaskRepository.Find(x => x.agv_fromaddress == EmptyStation.stationCode || x.agv_toaddress == EmptyStation.stationCode).Any()) continue;
- var area = EmptyStation.tray_type == "SmallTray" ? "11" : "10";
- var toEmptyStation = GetStation.EmptyPalletStation(area);
- if (toEmptyStation != null)
- {
- #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔�
- if (agvtaskRepository.Find(x => x.agv_fromaddress == toEmptyStation.stationCode || x.agv_toaddress == toEmptyStation.stationCode).Any()) continue;
- #endregion
-
- dt_agvtask agvtask = new dt_agvtask()
- {
- agv_fromaddress = EmptyStation.stationCode,
- agv_id = Guid.NewGuid(),
- agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- agv_grade = 3,
- agv_createtime = DateTime.Now,
- agv_taskstate = "Create",
- //agv_materielid = station.stationType,
- agv_qty = EmptyStation.quantity - toEmptyStation.quantity,
- StarQuantity = toEmptyStation.quantity,
- EndQuantity = toEmptyStation.quantity,
- agv_tasktype = "TaskType_EmptyPallet",
- agv_toaddress = toEmptyStation.stationCode,
- agv_userid = "绯荤粺",
- agv_TrayStatus = "EmptyTray",//station.tray_status,
- agv_Traytype = EmptyStation.tray_type,
- };
- agvtaskRepository.Add(agvtask, true);
- EmptyStation.location_state = LocationStateEnum.Busy.ToString();
- stationinfoRepository.Update(EmptyStation, true);
- toEmptyStation.location_state = LocationStateEnum.Busy.ToString();
- stationinfoRepository.Update(toEmptyStation, true);
- WriteDBLog.Success("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
- }
- }
- catch (Exception ex)
- {
- WriteDBLog.Success("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
- }
-
+ CreateEmptyTrayIn(stationinfoRepository, EmptyStation);
}
}
catch (Exception ex)
@@ -80,5 +38,56 @@
WriteDBLog.Success("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
}
}
+ /// <summary>
+ /// 鍒涘缓绌烘墭鍙犵洏鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="stationinfoRepository"></param>
+ /// <param name="EmptyStation"></param>
+ public static void CreateEmptyTrayIn(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo EmptyStation)
+ {
+ VOLContext Context = new VOLContext();
+ Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
+ try
+ {
+ if (agvtaskRepository.Find(x => x.agv_fromaddress == EmptyStation.stationCode || x.agv_toaddress == EmptyStation.stationCode).Any()) return;
+ var area = EmptyStation.tray_type == "SmallTray" ? "11" : "10";
+ var toEmptyStation = GetStation.EmptyPalletStation(area);
+ if (toEmptyStation != null)
+ {
+ #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔�
+ if (agvtaskRepository.Find(x => x.agv_fromaddress == toEmptyStation.stationCode || x.agv_toaddress == toEmptyStation.stationCode).Any()) return;
+ #endregion
+
+ dt_agvtask agvtask = new dt_agvtask()
+ {
+ agv_fromaddress = EmptyStation.stationCode,
+ agv_id = Guid.NewGuid(),
+ agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
+ agv_grade = 3,
+ agv_createtime = DateTime.Now,
+ agv_taskstate = "Create",
+ //agv_materielid = station.stationType,
+ agv_qty = EmptyStation.quantity - toEmptyStation.quantity,
+ StarQuantity = toEmptyStation.quantity,
+ EndQuantity = toEmptyStation.quantity,
+ agv_tasktype = "TaskType_EmptyPallet",
+ agv_toaddress = toEmptyStation.stationCode,
+ agv_userid = "绯荤粺",
+ agv_TrayStatus = "EmptyTray",//station.tray_status,
+ agv_Traytype = EmptyStation.tray_type,
+ };
+ agvtaskRepository.Add(agvtask, true);
+ EmptyStation.location_state = LocationStateEnum.Busy.ToString();
+ stationinfoRepository.Update(EmptyStation, true);
+ toEmptyStation.location_state = LocationStateEnum.Busy.ToString();
+ stationinfoRepository.Update(toEmptyStation, true);
+ WriteDBLog.Success("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
+ }
+ }
+ catch (Exception ex)
+ {
+ WriteDBLog.Error("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+ }
+ }
}
}
--
Gitblit v1.9.3