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/StationTask.cs | 275 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 177 insertions(+), 98 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
index 414efc7..8b52c8e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
@@ -6,18 +6,23 @@
using WIDESEA_WCS.IRepositories;
using WIDESEA_WCS.Repositories;
using WIDESEA_Core.EFDbContext;
-using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
using WIDESEA_Comm;
using static System.Collections.Specialized.BitVector32;
using WIDESEA_Comm.TaskNo;
+using WIDESEA_Entity.ToAGV;
+using WIDESEA_WCS.WCSClient;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
+using static FreeSql.Internal.GlobalFilter;
+using WIDESEA_Comm.LogInfo;
namespace WIDESEA_WCS.JobsPart.Common
{
public class StationTask
{
- static FreeDB freeDB = new FreeDB();
/// <summary>
/// 鍒涘缓鍏ュ簱浠诲姟
/// </summary>
@@ -27,98 +32,64 @@
{
VOLContext context = new VOLContext();
Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
- Idt_WorkinfoRepository workinfoRepository = new dt_WorkinfoRepository(context);
+ Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(context);
+ Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(context);
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
- List<dt_stationinfo> stationinfos = freeDB.Select<dt_stationinfo>().Where(x => x.stationCode.Contains("X") && x.quantity > 0 && !string.IsNullOrEmpty(x.stationType)).ToList();
+ var Pipeline_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "閾炬潯鏈�");
+ if (Pipeline_client == null) throw new Exception("閾炬潯鏈鸿皟搴︽湇鍔℃湭寮�鍚紒");
+ if (!Pipeline_client.IsConnected) throw new Exception("涓庨摼鏉℃満杩炴帴瓒呮椂锛�");
+
+ List<dt_stationinfo> stationinfos = stationinfoRepository.Find(x => x.stationCode.Contains("X") && x.enable && x.quantity > 0 && !string.IsNullOrEmpty(x.stationType) && !string.IsNullOrEmpty(x.Number)).ToList();
foreach (var item in stationinfos)
{
- //鏍规嵁涓嬫枡鍙ｇ殑缁戝畾淇℃伅鏌ヨ瀵瑰簲宸ュ崟锛屾娴嬫宸ュ崟鏄惁宸插畬鎴� 瀹屾垚鍗冲彲灏嗗叾閫佸叆搴�
-
- dt_mes_head mesinfo = freeDB.Select<dt_mes_head>().Where(x => x.jobID == item.Number).First();
- dt_geometry_data dt_Geometry_Data = freeDB.Select<dt_geometry_data>().Where(x => x.Description == mesinfo.drawingNo).First();
- int CompeletedNum = Convert.ToInt32(mesinfo.quantity) - Convert.ToInt32(mesinfo.finishNum);
-
-
//鍒ゅ畾浠诲姟鏄惁宸插垱寤�//濡傚凡瀛樺湪
- if (freeDB.Select<dt_agvtask>().Where(x => x.agv_fromaddress == item.stationCode).Count() > 0)
+ if (agvtaskRepository.Find(x => x.agv_fromaddress == item.stationCode).Any())
continue;
- if (item.quantity == 5 || CompeletedNum == 0) //寰幆璇诲彇杞﹁疆鏁颁负5鎴栬�呰鍗曞凡瀹屾垚鏁伴噺鐨勪笅鏂欏彛 鈫掑伐鍗曚汉宸ュ叧闂殑宸ュ崟
+ var PalletSignal = Pipeline_client.ReadByOrder<Int16>("R_PalletSignal", item.stationCode);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+ var MaterialSignal = Pipeline_client.ReadByOrder<Int16>("R_MaterialSignal", item.stationCode);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+ if (PalletSignal != 1 || MaterialSignal != 1) continue;
+
+ //鏍规嵁涓嬫枡鍙ｇ殑缁戝畾淇℃伅鏌ヨ瀵瑰簲宸ュ崟锛屾娴嬫宸ュ崟鏄惁宸插畬鎴� 瀹屾垚鍗冲彲灏嗗叾閫佸叆搴�
+
+ var work = workinfoRepository.Find(x => x.workOrder == item.Number && x.drawingNo == item.stationType && x.heatID == item.heatNumber && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ if (work == null)
{
+ item.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟淇℃伅锛�";
+ item.location_state = LocationStateEnum.Abnormal.ToString();
+ stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
+ continue;
+ }
+ var geometry = Pipeline.QueryMateriel(work.drawingNo);
+ if (geometry == null)
+ {
+ item.remark = "鏈壘鍒拌溅杞俊鎭紒";
+ item.location_state = LocationStateEnum.Abnormal.ToString();
+ stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
+ continue;
+ }
+ dt_stationinfo TargetLocation = null;
+ string tasktype = "";
- if (mesinfo.quantity <= 50 || item.stationCode.Contains("3")) //灏忎簬50浠剁洿鎺ュ嚭搴�
- {
- dt_stationinfo TargetLocation = GetEmptyLocation(stationinfoRepository);
- //todo 瀵绘壘鍙斁璐у鍗忔斁璐у彴
- if (TargetLocation != null)
- {
- dt_agvtask agvtask = new dt_agvtask()
- {
- agv_fromaddress = item.stationCode,
- agv_id = Guid.NewGuid(),
- agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- agv_grade = 1,
- agv_createtime = DateTime.Now,
- agv_taskstate = "Create",
- agv_materielid = item.stationType,
- agv_qty = item.quantity,
- agv_tasktype = "TaskType_OutsourceInbound",
- agv_toaddress = TargetLocation.stationCode,
- agv_userid = "绯荤粺",
- bindSN = item.bindSN,
- agv_worktype = Convert.ToInt32(mesinfo.processCode),
- agv_materbarcode = mesinfo.materialCode,
- agv_Traytype = item.tray_type,
- agv_TrayStatus = item.tray_status
- };
-
- freeDB.Add(agvtask);
- TargetLocation.location_state = LocationStateEnum.Busy.ToString();
- freeDB.Update(TargetLocation);
- }
- }
+ //if (item.quantity == 5)
+ if (item.quantity == geometry.stackNoRange)
+ {
+ if (!string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
+ tasktype = "TaskType_OutsourceInbound";
else
- {
- dt_stationinfo TargetLocation = GetEmptyLocation(stationinfoRepository, mesinfo, item, CompeletedNum, dt_Geometry_Data.e);
+ tasktype = "TaskType_Inbound";
- if (TargetLocation != null)
- {
- //todo: 璋冪敤WMS鎺ュ彛鍒涘缓浠诲姟
- dt_agvtask agvtask = new dt_agvtask()
- {
- agv_fromaddress = item.stationCode,
- agv_id = Guid.NewGuid(),
- agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- agv_grade = 1,
- agv_createtime = DateTime.Now,
- agv_taskstate = "Create",
- agv_materielid = item.stationType,
- agv_qty = item.quantity,
- agv_tasktype = "TaskType_Inbound",
- agv_toaddress = TargetLocation.stationCode,
- agv_userid = "绯荤粺",
- bindSN = item.bindSN,
- agv_worktype = Convert.ToInt32(mesinfo.processCode),
- agv_materbarcode = mesinfo.materialCode,
- agv_Traytype = item.tray_type,
- agv_TrayStatus = item.tray_status
- };
-
- freeDB.Add(agvtask);
- TargetLocation.location_state = LocationStateEnum.Busy.ToString();
- freeDB.Update(TargetLocation);
- }
- }
+ AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, item, tasktype, work);
}
}
}
catch (Exception ex)
{
-
+ WriteDBLog.Error("鍒涘缓鍏ュ簱浠诲姟", $"閿欒淇℃伅锛� {ex.Message}", "PCS");
}
-
}
/// <summary>
@@ -128,10 +99,53 @@
/// <param name="workinfo">璁㈠崟</param>
/// <param name="stationinfo">涓嬫枡鍙ｄ俊鎭�</param>
/// <returns></returns>
- private static dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository, dt_mes_head mesinfo, dt_stationinfo stationinfo, int CompeletedNum, float e)
+ public static dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository, dt_mes_head mesinfo, dt_stationinfo stationinfo, int CompeletedNum, float e)
{
//鏀捐揣浣�
dt_stationinfo TargetLocation = null;
+
+ #region 鍚岀被鍨嬫斁涓�琛�
+ //if (area1 == "1")
+ TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo).FirstOrDefault();
+
+ //TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo && x.area == area1).OrderByDescending(x => x.line).OrderBy(x => x.column).FirstOrDefault();
+ if (TargetLocation != null)
+ {
+ #region 鍚屼竴琛屽彧鍏佽涓�涓换鍔�
+ //var count = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.enable && x.area == TargetLocation.area && x.location_state == LocationStateEnum.Busy.ToString()).ToList();
+ //if (count.Count > 0)
+ // return null;
+ #endregion
+
+ #region 鍑哄簱浠诲姟浼樺厛,瀛樺湪鍑哄簱浠诲姟鍒欎笉鑳藉叆搴�
+ bool OutTask = false;
+ if (TargetLocation.area == "1")
+ {
+ TargetLocation = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderByDescending(x => x.line).FirstOrDefault();
+ if (TargetLocation != null)
+ OutTask = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.OutBusy.ToString()).Any();
+ if (OutTask)//杩欏垪瀛樺湪鍑哄簱浠诲姟,瀵绘壘涓�鍒楃┖璐т綅
+ TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.column).FirstOrDefault();
+ if (TargetLocation != null) return TargetLocation;
+ }
+ else
+ {
+ TargetLocation = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.column).FirstOrDefault();
+ if (TargetLocation != null)
+ OutTask = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.location_state == LocationStateEnum.OutBusy.ToString()).Any();
+ //搴撳唴瀛樺湪鍑哄簱浠诲姟锛岄噸鏂板紑涓�琛屽叆搴�
+ if (OutTask)
+ TargetLocation = stationinfoRepository.Find(x => x.column == (TargetLocation.area == "2" ? 1 : 10) && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.line).FirstOrDefault();
+ if (TargetLocation != null) return TargetLocation;
+ }
+
+ #endregion
+
+ //TargetLocation = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.column).FirstOrDefault();
+ //if (TargetLocation != null)
+ // return TargetLocation;
+ }
+ #endregion
#region 鏍规嵁璁㈠崟鏁伴噺鏉ュ鎵惧搴斿簱鍖轰笖鍚岀墿鏂欑被鍨嬪簱浣�
//if (workinfo.PlannedQuantity < 50) //搴撳尯1 鐗╂枡绫诲瀷澶�
@@ -208,23 +222,38 @@
//}
#endregion
- var detail = freeDB.Select<dt_mes_detail>().Where(x => x.jobID == mesinfo.jobID).First();
+ VOLContext context = new VOLContext();
+ Idt_mes_detailRepository mes_DetailRepository = new dt_mes_detailRepository(context);
+ Idt_inventoryRepository inventoryRepository = new dt_inventoryRepository(context);
+ var detail = mes_DetailRepository.Find(x => x.jobID == mesinfo.jobID).FirstOrDefault();
+ if (detail == null)
+ {
+ stationinfo.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟瀛愯〃锛�";
+ stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ stationinfoRepository.Update(stationinfo, true);
+ return null;
+ }
+
+ #region 鏌ユ壘搴撳瓨
dt_inventory inventory = null;
if (detail.heatID != null)
{
- inventory = freeDB.Select<dt_inventory>().Where(x => x.HeatNumber == detail.heatID && x.FigureNumber == mesinfo.drawingNo && x.jobID == mesinfo.jobID).First();
+ inventory = inventoryRepository.Find(x => /*x.HeatNumber == detail.heatID &&*/ x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).OrderByDescending(x => x.OnlineTime).FirstOrDefault();
}
else
{
- inventory = freeDB.Select<dt_inventory>().Where(x => x.FigureNumber == mesinfo.drawingNo && x.jobID == mesinfo.jobID).First();
+ inventory = inventoryRepository.Find(x => x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).OrderByDescending(x => x.OnlineTime).FirstOrDefault();
}
+ #endregion
+
+ #region 鏍规嵁搴撳瓨鏌ユ壘鍙叆搴撶┖璐т綅
if (inventory != null)
{
var station = stationinfoRepository.FindFirst(x => x.stationCode == inventory.stationCode);
- if (CompeletedNum <= 15 || station.area == "1")
+ if (/*CompeletedNum <= 15 ||*/ station.area == "1")
{
- TargetLocation = stationinfoRepository.Find(x => x.column == station.column && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == inventory.area).OrderBy(x => x.line).FirstOrDefault();
+ TargetLocation = stationinfoRepository.Find(x => x.column == station.column && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == inventory.area).OrderByDescending(x => x.line).FirstOrDefault();
}
else
{
@@ -232,10 +261,15 @@
}
if (TargetLocation != null) return TargetLocation;
}
+ #endregion
- if (CompeletedNum <= 15)
+
+
+ var area1 = string.IsNullOrEmpty(mesinfo.area) ? GetArea(mesinfo.quantity, e) : mesinfo.area;
+
+ if (CompeletedNum <= 15 || area1 == "1")
{
- TargetLocation = stationinfoRepository.Find(x => x.line == 1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).FirstOrDefault();
+ TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).FirstOrDefault();
}
else
{
@@ -244,10 +278,35 @@
//else if (180 < mesinfo.quantity && mesinfo.quantity <= 225 && e < 1100)
// TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == "3" && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
//if (50 < mesinfo.quantity && e > 1100 || TargetLocation == null)
- var area = GetArea(mesinfo.quantity, e);
- TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
+
+ //var area = GetArea(mesinfo.quantity, e);
+
+
+ TargetLocation = stationinfoRepository.Find(x => x.column == (area1 == "2" ? 1 : 10) && x.area == area1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
if (TargetLocation == null)
- TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == "4" && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
+ {
+ if (area1 == "2")
+ area1 = "3";
+ else if (area1 == "3")
+ area1 = "2";
+ TargetLocation = stationinfoRepository.Find(x => x.column == (area1 == "2" ? 1 : 10) && x.area == area1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
+ if (TargetLocation == null)
+ {
+ //TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo && x.area == "1").OrderByDescending(x => x.column).FirstOrDefault();
+
+ //if (TargetLocation != null)
+ // TargetLocation = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderByDescending(x => x.line).FirstOrDefault();
+ //if (TargetLocation == null)
+ // TargetLocation = stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).OrderByDescending(x => x.line).FirstOrDefault();
+ if (TargetLocation == null)
+ TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).FirstOrDefault();
+
+ }
+
+ }
+
+ //if (TargetLocation == null)
+ // TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == "4" && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
}
#region
@@ -282,21 +341,41 @@
}
return TargetLocation;
}
-
- private static dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository)
+ /// <summary>
+ /// 涓存椂浣跨敤
+ /// </summary>
+ /// <param name="stationinfoRepository"></param>
+ /// <returns></returns>
+ public static dt_stationinfo GetEmptyLocation1(Idt_stationinfoRepository stationinfoRepository)
+ {
+ return stationinfoRepository.Find(x => x.line == 1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "3").OrderBy(x => x.column).FirstOrDefault();//琛屽拰鍖哄煙闇�鍐欐
+ }
+ /// <summary>
+ /// 鍘诲鍗�
+ /// </summary>
+ /// <param name="stationinfoRepository"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public static dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository)
{
dt_stationinfo TargetLocation = null;
- List<string> target = new List<string>() { "W01001001", "W01001002", "W01001003" };
+ List<string> target = new List<string>() { "W01001003", "W01001002", "W01001001" };
+ var Pipeline_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "閾炬潯鏈�");
+ if (Pipeline_client == null) throw new Exception("閾炬潯鏈鸿皟搴︽湇鍔℃湭寮�鍚紒");
+ if (!Pipeline_client.IsConnected) throw new Exception("涓庨摼鏉℃満杩炴帴瓒呮椂锛�");
foreach (var item in target)
{
- TargetLocation = stationinfoRepository.FindFirst(x => x.stationCode == item && x.location_state == LocationStateEnum.Empty.ToString() && x.enable);
- if (TargetLocation != null) continue;
+ TargetLocation = stationinfoRepository.Find(x => x.stationCode == item && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).FirstOrDefault();
+
+ var PalletSignal = Pipeline_client.ReadByOrder<Int16>("R_PalletSignal", item);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+ var MaterialSignal = Pipeline_client.ReadByOrder<Int16>("R_MaterialSignal", item);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+ if (TargetLocation != null && PalletSignal == 2 && MaterialSignal == 2) return TargetLocation;
}
- if (TargetLocation == null)
- {
- throw new Exception("澶栧崗鍏ュ簱鍙ｅ凡婊�");
- }
+ //if (TargetLocation == null)
+ //{
+ // throw new Exception("澶栧崗鍏ュ簱鍙ｅ凡婊�");
+ //}
return TargetLocation;
}
/// <summary>
@@ -310,7 +389,7 @@
{
if (quantity <= 180)
return "2";
- else if (quantity <= 225)
+ else /*if (quantity <= 225)*/
return "3";
}
else
@@ -324,7 +403,7 @@
// return "3";
//else if (quantity > 50 && e > 1100)
// return "4";
- return null;
+ //return null;
}
}
}
--
Gitblit v1.9.3