From e883d7e4bf057f7a2ed7cc001fe27083d82baa22 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 四月 2024 19:17:44 +0800
Subject: [PATCH] 优化NG下料位任务触发逻辑
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs | 142 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 43 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
index 3e52774..8783dc3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
@@ -25,6 +25,7 @@
using WIDESEA_Core.ManageUser;
using WIDESEA_Comm.LogInfo;
using StackExchange.Redis;
+using WIDESEA_Comm;
namespace WIDESEA_WMS.Services
{
@@ -45,63 +46,118 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//base.Init(dbRepository);
}
- /// <summary>
- /// 娣诲姞浠诲姟
- /// </summary>
- /// <param name="saveDataModel"></param>
- /// <returns></returns>
+
+ #region 娣诲姞NG浠诲姟
public override WebResponseContent Add(SaveModel saveDataModel)
{
WebResponseContent content = new WebResponseContent();
try
{
+ var fromaddress = saveDataModel.MainData["agv_fromaddress"].ToString();
VOLContext context = new VOLContext();
Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
- var fromaddress = saveDataModel.MainData["agv_fromaddress"].ToString();
- var toaddress = saveDataModel.MainData["agv_toaddress"].ToString();
- var tasktype = saveDataModel.MainData["agv_tasktype"].ToString();
- var grade = saveDataModel.MainData["agv_grade"].ToInt();
- var worktype = saveDataModel.MainData["agv_worktype"].ToInt();
- var station1 = stationinfoRepository.FindFirst(x => x.stationCode == fromaddress);
- var station2 = stationinfoRepository.FindFirst(x => x.stationCode == toaddress);
- if (station1 == null || station2 == null)
- throw new Exception($"璧风偣鍦板潃{fromaddress}鎴栫粓鐐瑰湴鍧�{toaddress}涓嶅瓨鍦紒");
- if (string.IsNullOrEmpty(station1.stationType))
- throw new Exception($"璧风偣{fromaddress}鏈粦瀹氱墿鏂欑被鍨嬶紒");
- var task = _repository.Find(t => t.agv_fromaddress == fromaddress
- || t.agv_fromaddress == toaddress
- || t.agv_toaddress == fromaddress
- || t.agv_toaddress == toaddress
- ).Any();
- if (task)
- throw new Exception("璧峰鎴栫洰鐨勫湴鍧�锛屽凡瀛樺湪浠诲姟涓紒");
- dt_agvtask agvtask = new dt_agvtask();
- agvtask.agv_id = Guid.NewGuid();
- agvtask.agv_fromaddress = fromaddress;
- agvtask.agv_toaddress = toaddress;
- agvtask.agv_tasknum = IdenxManager.GetTaskNo("KH-");
- agvtask.agv_TrayStatus = station1.tray_status;
- agvtask.agv_Traytype = station1.tray_type;
- agvtask.agv_taskstate = AGVTaskStateEnum.Create.ToString();
- agvtask.agv_tasktype = tasktype;
- agvtask.agv_worktype = worktype;//宸ヤ綔绫诲瀷
- agvtask.bindSN = station1.bindSN;
- agvtask.agv_materielid = station1.stationType;//鐗╂枡绫诲瀷
- agvtask.agv_qty = station1.quantity;
- agvtask.agv_createtime = DateTime.Now;
- agvtask.agv_grade = grade;//浠诲姟浼樺厛绾�
- agvtask.agv_userid = UserContext.Current.UserName;
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
+ var station = stationinfoRepository.Find(x => x.stationCode == fromaddress).FirstOrDefault();
+ if (_repository.Find(x => x.agv_fromaddress == fromaddress || x.agv_toaddress == fromaddress).Any())
+ throw new Exception($"璐т綅{fromaddress}宸插瓨鍦ㄤ换鍔★紒");
+ if (station == null) throw new Exception($"鏈壘鍒拌揣浣峽fromaddress}锛�");
+ if (!station.enable) throw new Exception($"璐т綅{fromaddress}鏈惎鐢紒");
+ if (station.quantity < 1) throw new Exception($"璐т綅{fromaddress}鏃犺溅杞紒");
+ var Work = workinfoRepository.Find(x => x.workOrder == station.Number && x.processCode == "17").FirstOrDefault();
+ if (Work == null) throw new Exception($"鏈壘鍒拌揣浣峽fromaddress}鐨勬満鍔犲伐宸ュ崟淇℃伅");
+ dt_agvtask agvtask = new dt_agvtask()
+ {
+ agv_fromaddress = station.stationCode,
+ agv_id = Guid.NewGuid(),
+ agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
+ agv_grade = 1,
+ agv_createtime = DateTime.Now,
+ agv_taskstate = "Queue",
+ agv_materielid = station.stationType,
+ agv_qty = station.quantity,
+ agv_tasktype = "TaskType_OutsourceInbound",
+ agv_toaddress = "",
+ agv_userid = UserContext.Current.UserName,
+ bindSN = station.bindSN,
+ agv_worktype = Convert.ToInt32(Work.processCode),
+ agv_materbarcode = Work.materialCode,
+ agv_Traytype = station.tray_type,
+ jobID = station.Number,
+ agv_TrayStatus = station.tray_status
+ };
_repository.Add(agvtask, true);
+ station.location_state = LocationStateEnum.InBusy.ToString();
+ stationinfoRepository.Update(station, true);
content.OK();
- WriteDBLog.Success($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel }, "WMS", UserContext.Current.UserName);
}
catch (Exception ex)
{
- WriteDBLog.Error($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel, 寮傚父淇℃伅 = ex.Message }, "WMS", UserContext.Current.UserName);
- content.Error(ex.Message);
+ content.Message = ex.Message;
}
-
return content;
}
+ #endregion
+
+ #region 娣诲姞浠诲姟
+ /// <summary>
+ /// 娣诲姞浠诲姟
+ /// </summary>
+ /// <param name="saveDataModel"></param>
+ /// <returns></returns>
+ //public override WebResponseContent Add(SaveModel saveDataModel)
+ //{
+ // WebResponseContent content = new WebResponseContent();
+ // try
+ // {
+ // VOLContext context = new VOLContext();
+ // Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
+ // var fromaddress = saveDataModel.MainData["agv_fromaddress"].ToString();
+ // var toaddress = saveDataModel.MainData["agv_toaddress"].ToString();
+ // var tasktype = saveDataModel.MainData["agv_tasktype"].ToString();
+ // var grade = saveDataModel.MainData["agv_grade"].ToInt();
+ // var worktype = saveDataModel.MainData["agv_worktype"].ToInt();
+ // var station1 = stationinfoRepository.FindFirst(x => x.stationCode == fromaddress);
+ // var station2 = stationinfoRepository.FindFirst(x => x.stationCode == toaddress);
+ // if (station1 == null || station2 == null)
+ // throw new Exception($"璧风偣鍦板潃{fromaddress}鎴栫粓鐐瑰湴鍧�{toaddress}涓嶅瓨鍦紒");
+ // if (string.IsNullOrEmpty(station1.stationType))
+ // throw new Exception($"璧风偣{fromaddress}鏈粦瀹氱墿鏂欑被鍨嬶紒");
+ // var task = _repository.Find(t => t.agv_fromaddress == fromaddress
+ // || t.agv_fromaddress == toaddress
+ // || t.agv_toaddress == fromaddress
+ // || t.agv_toaddress == toaddress
+ // ).Any();
+ // if (task)
+ // throw new Exception("璧峰鎴栫洰鐨勫湴鍧�锛屽凡瀛樺湪浠诲姟涓紒");
+ // dt_agvtask agvtask = new dt_agvtask();
+ // agvtask.agv_id = Guid.NewGuid();
+ // agvtask.agv_fromaddress = fromaddress;
+ // agvtask.agv_toaddress = toaddress;
+ // agvtask.agv_tasknum = IdenxManager.GetTaskNo("KH-");
+ // agvtask.agv_TrayStatus = station1.tray_status;
+ // agvtask.agv_Traytype = station1.tray_type;
+ // agvtask.agv_taskstate = AGVTaskStateEnum.Create.ToString();
+ // agvtask.agv_tasktype = tasktype;
+ // agvtask.agv_worktype = worktype;//宸ヤ綔绫诲瀷
+ // agvtask.bindSN = station1.bindSN;
+ // agvtask.agv_materielid = station1.stationType;//鐗╂枡绫诲瀷
+ // agvtask.agv_qty = station1.quantity;
+ // agvtask.agv_createtime = DateTime.Now;
+ // agvtask.agv_grade = grade;//浠诲姟浼樺厛绾�
+ // agvtask.agv_userid = UserContext.Current.UserName;
+ // _repository.Add(agvtask, true);
+ // content.OK();
+ // WriteDBLog.Success($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel }, "WMS", UserContext.Current.UserName);
+ // }
+ // catch (Exception ex)
+ // {
+ // WriteDBLog.Error($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel, 寮傚父淇℃伅 = ex.Message }, "WMS", UserContext.Current.UserName);
+ // content.Error(ex.Message);
+ // }
+
+ // return content;
+ //}
+ #endregion
+
}
}
--
Gitblit v1.9.3