From ceb82ce60d984e2a9457502e74ec12b6800d26ef Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 五月 2024 08:21:24 +0800
Subject: [PATCH] 托盘数量可修改
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs | 182 ++++++++++++++-------------------------------
1 files changed, 58 insertions(+), 124 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
index bffb2d7..714b1d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
@@ -12,6 +12,7 @@
using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.TaskNo;
using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions;
using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
using WIDESEA_WCS.IRepositories;
@@ -473,11 +474,11 @@
#endregion
var AreaNr = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_AreaNr").First(), client);
- //if (AreaNr == 0)
- //{
- // client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
- // continue;
- //}
+ if (AreaNr == 0)
+ {
+ client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
+ continue;
+ }
#region 鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�
var area = client.ReadByOrder<Int16>("place_prog", name);//鏀炬枡瀹屾垚鐨勫尯鍩熷彿
@@ -495,7 +496,8 @@
var station = stationinfoRepository.Find(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString()).FirstOrDefault();
if (station != null)
{
- if (station.quantity >= 5)
+ if (station.quantity >= Mes_Work.stackNoRange)
+ //if (station.quantity >= 5)
{
Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "杞﹁疆鏁伴噺宸叉弧锛�", $"鍖哄煙鍙凤細{AreaNr}锛沑n杞﹁疆鏁帮細{station.quantity}\n閿欒淇℃伅锛氬尯鍩熷彿杞﹁疆鏁伴噺宸叉弧锛�");
@@ -544,10 +546,10 @@
station.heatNumber = Mes_Work.heatID;
station.tray_status = "StrogeTray";
}
-
+ station.remark = "";
var count = stationinfoRepository.Update(station, true);
if (count < 1)
- throw new Exception($"涓嬫枡浣嶄俊鎭洿鏂板け璐ワ紒涓嬫枡浣嶇紪鍙凤細{station.stationCode}");
+ throw new Exception($"涓嬫枡浣嶄俊鎭洿鏂板け璐ワ紒涓嬫枡浣嶇紪鍙凤細{station.stationCode}");
#endregion
@@ -560,6 +562,7 @@
throw new Exception($"宸ュ崟瀛愯〃淇℃伅鏇存柊澶辫触锛佽溅杞甋N鍙凤細{Detail.SN}");
var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID);
Head.finishNum = Head.finishNum + 1;
+ if (Head.finishNum == Head.quantity) Head.FinishTime = DateTime.Now;
count = mes_HeadRepository.Update(Head, true);
if (count < 1)
throw new Exception($"宸ュ崟澶磋〃淇℃伅鏇存柊澶辫触锛佸伐鍗曞彿锛歿Head.jobID}");
@@ -579,8 +582,6 @@
var Request = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Request_Load").First(), client);
if (!Request) continue;
- //var Area = client.ReadByOrder<Int16>("W_AreaNr", name);//璇诲彇璐т綅鍙蜂俊鎭�
- //if (Area != 0) continue;
#region 璇诲彇妗佹灦淇℃伅
var Wheel_Type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_Type").First(), client);//杞﹁疆绫诲瀷
@@ -590,29 +591,15 @@
WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", "杞﹁疆SN鍙蜂负绌�", "", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}涓虹┖");
continue;
}
-
-
var Work = workinfoRepository.Find(x => x.SN == Wheel_id && x.processCode == "17").FirstOrDefault();
if (Work == null)
{
client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
//WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟淇℃伅", "PCS");
WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", Wheel_id, "鏌ヨ鏈哄姞宸ュ伐鍗�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}鏈煡璇㈠埌宸ュ崟淇℃伅\n鍐欏叆妗佹灦淇℃伅锛歕n鏄惁鍏佽涓嬫枡锛歿false}");
+ continue;
}
-
-
#endregion
-
-
-
- #region MyRegion
- //var currentAreaNr = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_Are00aNr").First(), client);
- //var currentAreaCode = PipelineJob.area_code(name); //鏍规嵁涓嬫枡鍙ｅ崟鍏冨悕鑾峰彇鍖哄煙浠ｇ爜
- //var currentStation = stationinfoRepository.FindFirst(x => x.area == currentAreaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == currentAreaNr.ToString());
- //if (!currentStation.enable || currentStation.location_state == LocationStateEnum.Empty.ToString())
- // client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- #endregion
-
var wheel = Pipeline.QueryMateriel(Work.drawingNo);
var wheel1 = Pipeline.QueryMateriel1(Work.drawingNo);
@@ -625,6 +612,32 @@
#endregion
continue;
}
+
+ #region 鎹㈠浘鍙�,涓嬫枡鍙ｅ叾浠栧浘鍙锋墭鐩樺叏閮ㄥ叆搴�
+ var stations = Stations.Where(x => x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0 && x.stationType != Work.drawingNo).ToList();
+ foreach (var station in stations)
+ {
+ if (station.stationCode == NGStation || name == "3鍗曞厓涓嬫枡鍖�")
+ agvtask(stationinfoRepository, station, Work, "TaskType_OutsourceInbound");
+ else
+ agvtask(stationinfoRepository, station, Work, "TaskType_Inbound");
+ }
+ #endregion
+
+ #region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
+ foreach (var Stationinfo in Stations)
+ {
+ if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
+ {
+ client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ Stationinfo.location_state = LocationStateEnum.Trayswitching.ToString();
+ Stationinfo.remark = "鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏";
+ stationinfoRepository.Update(Stationinfo, x => new { x.location_state }, true);
+ }
+ }
+ #endregion
+
+ Stations = stationinfoRepository.Find(x => x.area == Pipeline.area_code(name)).OrderBy(x => x.lastUpdateTime).ToList();
var PartStatus = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PartStatus").First(), client);//1:ok;2:nok
@@ -645,7 +658,8 @@
.Where(x => x.enable
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo
&& x.Number == Work.workOrder
&& x.heatNumber == Work.heatID)
@@ -658,7 +672,8 @@
.Where(x => x.enable
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo
&& x.Number == Work.workOrder)
.OrderByDescending(x => x.quantity)
@@ -668,12 +683,9 @@
if (Stationinfo == null)
{
#region 瑙﹀彂NG浠诲姟
- var NG = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
+ var NG = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.Number != Work.workOrder && x.quantity > 0).FirstOrDefault();
if (NG != null)
- {
- if (NG.stationType != Work.drawingNo || NG.Number != Work.workOrder)
- agvtask(stationinfoRepository, NG, Work, "TaskType_OutsourceInbound");
- }
+ agvtask(stationinfoRepository, NG, Work, "TaskType_OutsourceInbound");
#endregion
Stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 0).FirstOrDefault();
@@ -684,31 +696,20 @@
{
#region 鎹㈢被鍨嬬洿鎺ュ叆搴�
- var stationinfo1 = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0 && x.stationType != Work.drawingNo).FirstOrDefault();
- if (stationinfo1 != null)
- agvtask(stationinfoRepository, stationinfo1, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
+ //var stationinfo1 = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0 && x.stationType != Work.drawingNo).FirstOrDefault();
+ //if (stationinfo1 != null)
+ // agvtask(stationinfoRepository, stationinfo1, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
#endregion
#region 鎵樼洏杞﹁疆鍫嗗灈绗洓涓椂涓嬪彂鍙﹀涓�涓倝鍙风殑鍏ュ簱浠诲姟
- if (Stationinfo.quantity + 1 >= 4)
+ //if (Stationinfo.quantity + 1 >= 4)
+ if (Stationinfo.quantity + 1 >= Work.stackNoRange - 1)
{
var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
if (stationinfo != null)
agvtask(stationinfoRepository, stationinfo, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
}
- #endregion
-
- #region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
- if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
- {
- client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
- Stationinfo.tray_type = Stationinfo.tray_type == "SmallTray" ? "SmallTray/LargeTray" : "LargeTray/SmallTray";
- Stationinfo.remark = "鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏";
- stationinfoRepository.Update(Stationinfo, true);
- continue;
- }
#endregion
var Pipelinedetails = plcRepository.Find(x => x.plcdetail_iotype == Pipelineplc.plcinfo_iotyep && x.plcdetail_number == Stationinfo.stationCode).ToList();
@@ -768,6 +769,8 @@
client.WriteByOrder("W_IndexNr", (Int16)(Stationinfo.quantity + 1), name);//鎵樼洏涓婄殑绗嚑涓溅杞�
client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
+ Stationinfo.remark = "妗佹灦涓嬫枡";
+ stationinfoRepository.Update(Stationinfo, true);
#region 鏃ュ織璁板綍
//WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細OK" +$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
// $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
@@ -784,7 +787,7 @@
#region 娌℃墭鐩樺彲鐢�,瑙﹀彂鍏ュ簱浠诲姟
if (!Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state != LocationStateEnum.Stroge.ToString()).Any())
{
- var station = Stations.Where(x => x.enable && x.stationCode != NGStation).OrderBy(x => x.lastUpdateTime).FirstOrDefault();
+ var station = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString()).OrderBy(x => x.lastUpdateTime).FirstOrDefault();
agvtask(stationinfoRepository, station, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
}
#endregion
@@ -799,7 +802,8 @@
dt_stationinfo Stationinfo = Stations.Where(x => x.enable
&& x.stationCode == NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo).FirstOrDefault();
if (Stationinfo == null)
@@ -818,16 +822,6 @@
}
if (Stationinfo != null)
{
- #region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
- //if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
- if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
- {
- Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
- Stationinfo.tray_type = Stationinfo.tray_type == "SmallTray" ? "SmallTray/LargeTray" : "LargeTray/SmallTray";
- Stationinfo.remark = "鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏";
- stationinfoRepository.Update(Stationinfo, true);
- }
- #endregion
var Pipelinedetails = plcRepository.Find(x => x.plcdetail_iotype == Pipelineplc.plcinfo_iotyep && x.plcdetail_number == Stationinfo.stationCode).ToList();
var PalletSignal = (Int16)DBExtension.Read(Pipelinedetails.Where(x => x.plcdetail_name == "R_PalletSignal").First(), Pipeline_client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
var MaterialSignal = (Int16)DBExtension.Read(Pipelinedetails.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), Pipeline_client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
@@ -879,6 +873,8 @@
client.WriteByOrder("W_IndexNr", (Int16)(Stationinfo.quantity + 1), name);//鎵樼洏涓婄殑绗嚑涓溅杞�
client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
+ Stationinfo.remark = "妗佹灦涓嬫枡";
+ stationinfoRepository.Update(Stationinfo, true);
#region 鏃ュ織璁板綍
//WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細NG" +$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
// $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
@@ -913,76 +909,14 @@
{
VOLContext Context = new VOLContext();
Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
+ Work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.processCode == "17").FirstOrDefault();
var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
if (task != null) return;
if (!string.IsNullOrEmpty(Work.area))
tasktype = "TaskType_OutsourceInbound";
AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, stationinfo, tasktype, Work);
}
-
- #region MyRegion
- /// <summary>
- /// AGV浠诲姟
- /// </summary>
- //public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, VV_Mes_Workinfo Work, string tasktype)
- //{
- // VOLContext Context = new VOLContext();
- // Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
- // Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
-
- // var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
- // if (task != null) return;
- // //var mes_Head = mes_HeadRepository.Find(x => x.jobID == Work.jobID).FirstOrDefault();
- // //if (mes_Head == null)
- // //{
- // // stationinfo.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟澶磋〃锛�";
- // // stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
- // // stationinfoRepository.Update(stationinfo, true);
- // // return;
- // //}
-
- // dt_stationinfo TargetLocation = null;
- // //int CompeletedNum = Convert.ToInt32(mes_Head.quantity) - Convert.ToInt32(mes_Head.finishNum);
- // //if (mes_Head.quantity <= 50) tasktype = "TaskType_OutsourceInbound";
-
- // if (tasktype == "TaskType_OutsourceInbound" || !string.IsNullOrEmpty(Work.area))
- // TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
- // else if (tasktype == "TaskType_Inbound")
- // TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, Work, stationinfo);
- // //TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, mes_Head, stationinfo);
- // if (TargetLocation != null)
- // {
- // dt_agvtask agvtask = new dt_agvtask()
- // {
- // agv_fromaddress = stationinfo.stationCode,
- // agv_id = Guid.NewGuid(),
- // agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- // agv_grade = 1,
- // agv_createtime = DateTime.Now,
- // agv_taskstate = "Create",
- // agv_materielid = stationinfo.stationType,
- // agv_qty = stationinfo.quantity,
- // agv_tasktype = tasktype,
- // agv_toaddress = TargetLocation.stationCode,
- // agv_userid = "绯荤粺",
- // bindSN = stationinfo.bindSN,
- // agv_worktype = Convert.ToInt32(Work.processCode),
- // agv_materbarcode = Work.materialCode,
- // agv_Traytype = stationinfo.tray_type,
- // jobID = stationinfo.Number,
- // agv_TrayStatus = stationinfo.tray_status
- // };
- // agvtaskRepository.Add(agvtask, true);
- // stationinfo.location_state = LocationStateEnum.InBusy.ToString();
- // stationinfoRepository.Update(stationinfo, true);
- // TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
- // TargetLocation.stationType = agvtask.agv_materielid;
- // TargetLocation.heatNumber = stationinfo.heatNumber;
- // TargetLocation.Number = agvtask.jobID;
- // stationinfoRepository.Update(TargetLocation, true);
- // }
- //}
- #endregion
}
}
--
Gitblit v1.9.3