From 739a76728f9c658c7ac0ac22d98993beb98a7d91 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 五月 2024 10:15:06 +0800
Subject: [PATCH] 添加人工下料和切换托盘日志
---
/dev/null | 0
.gitignore | 3 +++
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs | 14 ++++++++++++--
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8f3b990..a7080f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@
浠ｇ爜绠＄悊/PCS/WCS_Server/WIDESEA_System/WIDESEA_System.csproj
*.csproj
/浠ｇ爜绠＄悊/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/瀛樺偍杩囩▼/StoredProcedure.cs
+/浠ｇ爜绠＄悊/WMS/WMS_Client/dist.zip
+/浠ｇ爜绠＄悊/WMS/WMS_Client/dist.zip
+/浠ｇ爜绠＄悊/WMS/WMS_Client/dist.zip
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/dist.zip" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/dist.zip"
deleted file mode 100644
index 5758a68..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/dist.zip"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
index bef8d16..fdd7795 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
@@ -28,6 +28,7 @@
using WIDESEA_Comm;
using WIDESEA_Comm.TaskNo;
using WIDESEA_Common;
+using static FreeSql.Internal.GlobalFilter;
namespace WIDESEA_WMS.Services
{
@@ -111,11 +112,13 @@
VOLContext context = new VOLContext();
Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(context);
IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
+ string json = string.Empty;
foreach (var Key in saveModel.DelKeys)
{
try
{
var station = repository.Find(x => x.id.ToString() == Key.ToString()).FirstOrDefault();
+ json = json + station.stationCode + ",";
if (!station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005")) throw new Exception($"鏃爗station.stationCode}浣跨敤鏉冮檺锛�");
if (!station.enable) throw new Exception($"{station.stationCode}鏈惎鐢紒");
if (station.location_state == LocationStateEnum.Abnormal.ToString()) throw new Exception($"{station.stationCode}鐘舵�佸紓甯革紒");
@@ -199,6 +202,7 @@
webResponse.Error(webResponse.Message += ex.Message);
}
}
+ WriteDBLog.Write($"鎵嬪姩鍒囨崲鎵樼洏 ", new { 淇℃伅 = webResponse.Message }, LogState.Sucess, "WMS", UserContext.Current.UserName);
return webResponse;
}
/// <summary>
@@ -213,6 +217,7 @@
Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(context);
IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
string completor = UserContext.Current.UserName;
+ object json = null;
foreach (var Key in saveModel.DelKeys)
{
try
@@ -229,6 +234,9 @@
if (agvtaskRepository.Find(x => x.agv_fromaddress == station.stationCode || x.agv_fromaddress == station.stationCode).Any()) throw new Exception($"{station.stationCode}瀛樺湪浠诲姟锛�");
var Work = workinfoRepository.Find(x => x.workOrder == station.Number && x.processCode == "17").FirstOrDefault();
if (Work == null) throw new Exception($"鏈壘鍒拌揣浣峽station.stationCode}鐨勬満鍔犲伐宸ュ崟淇℃伅锛�");
+ string tasktype = AGVTaskTypeEnum.TaskType_Inbound.ToString();
+ if (!string.IsNullOrEmpty(Work.area) || station.stationCode.Contains("3"))
+ tasktype = AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString();
dt_agvtask agvtask = new dt_agvtask()
{
agv_fromaddress = station.stationCode,
@@ -239,9 +247,9 @@
agv_taskstate = AGVTaskStateEnum.Queue.ToString(),
agv_materielid = station.stationType,
agv_qty = station.quantity,
- agv_tasktype = station.stationCode.Contains("3") ? AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString() : AGVTaskTypeEnum.TaskType_Inbound.ToString(),
+ agv_tasktype = tasktype,
agv_toaddress = "",
- agv_userid = UserContext.Current.UserName,
+ agv_userid = completor,
bindSN = station.bindSN,
agv_worktype = Convert.ToInt32(Work.processCode),
agv_materbarcode = Work.materialCode,
@@ -249,6 +257,7 @@
jobID = station.Number,
agv_TrayStatus = station.tray_status
};
+ json = agvtask;
agvtaskRepository.Add(agvtask, true);
station.location_state = LocationStateEnum.InBusy.ToString();
repository.Update(station, x => new { x.location_state }, true);
@@ -259,6 +268,7 @@
webResponse.Error(webResponse.Message += ex.Message);
}
}
+ WriteDBLog.Write($"鎵嬪姩涓嬫枡浠诲姟 ", new { 淇℃伅 = webResponse.Message, 鏁版嵁 = json }, LogState.Sucess, "WMS", completor);
return webResponse;
}
--
Gitblit v1.9.3