From d2cef0150abe6d14cbfa60c8845795b91a1f5f97 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 20 四月 2024 19:50:53 +0800
Subject: [PATCH] 添加入库触发条件,修改上料区任务逻辑
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs | 126 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 54 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
index 2bfc135..a89959d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
@@ -5,10 +5,14 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Comm;
+using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.TaskNo;
-using WIDESEA_Core.FreeDB;
+using WIDESEA_Core.EFDbContext;
using WIDESEA_Entity.DomainModels;
-using WIDESEA_WCS.JobsPart.Common.瀛樺偍杩囩▼;
+using WIDESEA_WCS.IRepositories;
+using WIDESEA_WCS.Repositories;
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
using static FreeSql.Internal.GlobalFilter;
using static System.Collections.Specialized.BitVector32;
@@ -16,30 +20,33 @@
{
public class ReplaceTray
{
- static FreeDB freeDB = new FreeDB();
+ #region MyRegion
+ //public static void a()
+ //{
+ // FreeDB freeDB = new FreeDB();
+ // var mes_Detail = freeDB.Select<dt_mes_detail>().Where(x => x.SN == "1202956016").First();
+ // var mes_Head = freeDB.Select<dt_mes_head>().Where(x => x.jobID == mes_Detail.jobID).First();
- public static void a()
- {
- var mes_Detail = freeDB.Select<dt_mes_detail>().Where(x => x.SN == "1202956016").First();
- var mes_Head = freeDB.Select<dt_mes_head>().Where(x => x.jobID == mes_Detail.jobID).First();
+ // dt_inventory inventory = new dt_inventory()
+ // {
+ // SN = mes_Detail.SN,
+ // Name = mes_Head.productName,
+ // FigureNumber = mes_Head.drawingNo,
+ // area = "2",
+ // HeatNumber = mes_Detail.heatID,
+ // BilletNumber = mes_Detail.billetID,
+ // OnlineTime = DateTime.Now,
+ // Operator = "AGV",
+ // stationCode = "B01001001",
+ // jobID = mes_Detail.jobID,
+ // ID = Guid.NewGuid(),
+ // remark = ""
+ // };
+ // StoredProcedure.Main(inventory, "Delete");
+ // //StoredProcedure.EXECAdd(inventory, "");
+ //}
+ #endregion
- dt_inventory inventory = new dt_inventory()
- {
- SN = mes_Detail.SN,
- Name = mes_Head.productName,
- FigureNumber = mes_Head.drawingNo,
- area = "2",
- HeatNumber = mes_Detail.heatID,
- BilletNumber = mes_Detail.billetID,
- OnlineTime = DateTime.Now,
- Operator = "AGV",
- stationCode = "B01001001",
- jobID = mes_Detail.jobID,
- ID = Guid.NewGuid(),
- remark=""
- };
- StoredProcedure.EXEC( inventory,"");
- }
/// <summary>
/// 鍒涘缓鏇存崲鎵樼洏浠诲姟
/// </summary>
@@ -47,18 +54,22 @@
{
try
{
- var stations = freeDB.Select<dt_stationinfo>().Where(x => x.stationCode.Contains("X") && x.location_state == LocationStateEnum.Abnormal.ToString() && (x.tray_type == "SmallTray/LargeTray" || x.tray_type == "LargeTray/SmallTray")).ToList();
+ VOLContext context = new VOLContext();
+ Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
+ Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(context);
+ var stations = stationinfoRepository.Find(x => (x.stationCode.Contains("X")|| x.stationCode.Contains("W01001004") || x.stationCode.Contains("W01001005")) && x.location_state == "Abnormal" /*LocationStateEnum.Abnormal.ToString()*/ && (x.tray_type == "SmallTray/LargeTray" || x.tray_type == "LargeTray/SmallTray") && x.enable).ToList();
foreach (var station in stations)
{
+ if (agvtaskRepository.Find(x => x.agv_fromaddress == station.stationCode || x.agv_toaddress == station.stationCode).Any()) continue;
var types = station.tray_type.Split('/');
var area = types[0] == "SmallTray" ? "11" : "10";
//鎵�1搴撳尯鐨勭┖鎵樹綅
-
- var EmptyStation = freeDB.Select<dt_stationinfo>().Where(x => x.area == area && x.stationCode.Contains("A") && x.location_state == "Empty" && x.enable)
- .OrderBy(x => x.column).OrderByDescending(x => x.line).First();
- if (EmptyStation == null)
- EmptyStation = freeDB.Select<dt_stationinfo>().Where(x => x.area == area && x.stationCode.Contains("C") && x.location_state == "Empty" && x.enable)
- .OrderBy(x => x.line).OrderBy(x => x.column).First();
+ var EmptyStation = GetStation.EmptyPalletStation(area);
+ //var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") /*&& x.location_state == "Empty"*/ && x.enable)
+ // .OrderBy(x => x.column).OrderBy(x => x.line).FirstOrDefault();
+ //if (EmptyStation == null)
+ // EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") /*&& x.location_state == "Empty"*/ && x.enable)
+ // .OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
if (EmptyStation != null)
{
dt_agvtask agvtask = new dt_agvtask()
@@ -71,6 +82,8 @@
agv_taskstate = "Create",
//agv_materielid = station.stationType,
agv_qty = 1,
+ StarQuantity = 0,
+ EndQuantity = EmptyStation.quantity,
agv_tasktype = "TaskType_EmptyPallet",
agv_toaddress = EmptyStation.stationCode,
agv_userid = "绯荤粺",
@@ -80,42 +93,47 @@
//agv_materbarcode = mesinfo.materialCode,
agv_Traytype = types[0]
};
- freeDB.Add(agvtask);
- CreatePartQueue(agvtask, types[1]);
+ agvtaskRepository.Add(agvtask, true);
+ station.location_state = LocationStateEnum.Busy.ToString();
+ stationinfoRepository.Update(EmptyStation, true);
+ EmptyStation.location_state = LocationStateEnum.Busy.ToString();
+ stationinfoRepository.Update(EmptyStation, true);
+ WriteDBLog.Success("鍒涘缓鏇存崲绌虹洏浠诲姟", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
+ CreatePartQueue(agvtaskRepository, agvtask, types[1]);
}
}
}
catch (Exception ex)
{
-
- throw;
+ WriteDBLog.Error("鍒涘缓鏇存崲绌虹洏浠诲姟", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
}
}
/// <summary>
/// 鍒涘缓瀹屾暣鐨勮ˉ绌烘墭浠诲姟
/// </summary>
/// <param name="agvtask"></param>
- public static void CreatePartQueue(dt_agvtask agvtask, string type = "")
+ public static void CreatePartQueue(Idt_agvtaskRepository agvtaskRepository, dt_agvtask agvtask, string type = "")
{
- if (agvtask.agv_fromaddress.Contains("X"))
+ //if (agvtask.agv_fromaddress.Contains("X") || agvtask.agv_fromaddress.Contains("W01001004") || agvtask.agv_fromaddress.Contains("W01001005"))
+ //{
+ dt_agvtask taskPart = new dt_agvtask()
{
- dt_agvtask taskPart = new dt_agvtask()
- {
- agv_fromaddress = "",
- agv_id = Guid.NewGuid(),
- agv_tasknum = agvtask.agv_tasknum + "_1",
- agv_grade = 2,
- agv_createtime = DateTime.Now,
- agv_taskstate = "Queue",
- agv_qty = 1,
- agv_tasktype = "TaskType_EmptyPallet",
- agv_toaddress = agvtask.agv_fromaddress,
- agv_userid = "绯荤粺",
- agv_TrayStatus = agvtask.agv_TrayStatus,
- agv_Traytype = type
- };
- freeDB.Add(taskPart);
- }
+ agv_fromaddress = "",
+ agv_id = Guid.NewGuid(),
+ agv_tasknum = agvtask.agv_tasknum + "_1",
+ agv_grade = 2,
+ agv_createtime = DateTime.Now,
+ agv_taskstate = "Queue",
+ agv_qty = 1,
+ agv_tasktype = "TaskType_EmptyPallet",
+ agv_toaddress = agvtask.agv_fromaddress,
+ agv_userid = "绯荤粺",
+ agv_TrayStatus = agvtask.agv_TrayStatus,
+ agv_Traytype = type == "" ? agvtask.agv_Traytype : type,
+ };
+ agvtaskRepository.Add(taskPart, true);
+ WriteDBLog.Success("鍒涘缓鏇存崲绌虹洏浠诲姟", $"浠诲姟缂栧彿锛歿taskPart.agv_tasknum}", "PCS");
+ //}
}
}
}
--
Gitblit v1.9.3