From 84f3b1fc2e8f48bbe7749ed90362793b42e0edc4 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 11 五月 2024 16:37:51 +0800
Subject: [PATCH] 优化入库逻辑,PLC地址读写失败重新连接
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
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 c7891fa..a9c5dbf 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"
@@ -23,6 +23,8 @@
using WIDESEA_Core.ManageUser;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using static System.Collections.Specialized.BitVector32;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_WMS.Repositories;
namespace WIDESEA_WMS.Services
{
@@ -59,7 +61,7 @@
WebResponseContent webResponse = new WebResponseContent();
try
{
- var Tel = UserContext.Current.UserInfo.Tel;//缂撳瓨鏋舵潈闄�
+ var Tel = UserContext.Current.UserInfo.Tel;
var data = JsonConvert.DeserializeObject<Parm>(json.ToString());
//var updateList = FreeDB.DB.Select<dt_stationinfo>().Where(t => data.data.Contains(t.id.ToString())).ToList();
var updateList = _repository.Find(x => data.data.Contains(x.id.ToString())).ToList();
@@ -84,22 +86,39 @@
.ExecuteAffrows();
var msg = data.type == 1 ? "鍚敤" : "绂佺敤";
- WriteDBLog.Write($"鎵嬪姩{msg}绔欑偣 ", $"{string.Join('銆�', updateList.Select(t => t.stationCode).ToArray())}", LogState.Sucess, "WCS", UserContext.Current.UserName);
+ WriteDBLog.Write($"鎵嬪姩{msg}绔欑偣 ", $"{string.Join('銆�', updateList.Select(t => t.stationCode).ToArray())}", LogState.Sucess, "WMS", UserContext.Current.UserName);
webResponse.OK();
}
catch (Exception ex)
{
- WriteDBLog.Write($"鎵嬪姩鍚敤鎴栫鐢ㄧ珯鐐� ", new { 閿欒淇℃伅 = ex.Message, 鏁版嵁 = json }, LogState.Error, "WCS", UserContext.Current.UserName);
+ WriteDBLog.Write($"鎵嬪姩鍚敤鎴栫鐢ㄧ珯鐐� ", new { 閿欒淇℃伅 = ex.Message, 鏁版嵁 = json }, LogState.Error, "WMS", UserContext.Current.UserName);
webResponse.Error(ex.Message);
}
return webResponse;
}
+
+ public WebResponseContent SendAGVTask(object json)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return webResponse;
+ }
+
public override WebResponseContent Add(SaveModel saveDataModel)
{
return base.Add(saveDataModel);
}
+
+
public override WebResponseContent Update(SaveModel saveModel)
{
@@ -119,8 +138,34 @@
station.stationType = saveModel.MainData["stationType"].ToString();
station.heatNumber = saveModel.MainData["heatNumber"].ToString();
station.Number = saveModel.MainData["Number"].ToString();
+ station.billetID = saveModel.MainData["billetID"].ToString();
station.remark = saveModel.MainData["remark"].ToString();
- station.tray_status= saveModel.MainData["tray_status"].ToString();
+ station.tray_type = saveModel.MainData["tray_type"].ToString();
+ if (list.Count == 0)
+ {
+ //station.tray_status = "EmptyTray";
+ station.stationType = string.Empty;
+ station.heatNumber = string.Empty;
+ station.Number = string.Empty;
+ }
+ station.tray_status = string.IsNullOrEmpty(station.stationType) ? "EmptyTray" : "StrogeTray";
+ if (station.location_state == "Empty" && !string.IsNullOrEmpty(station.stationType))
+ {
+ webResponse.Error("鍥惧彿涓嶄负绌�,璐т綅鐘舵�佷笉鑳借缃负绌鸿揣浣嶏紒");
+ }
+ //station.tray_status = list.Count == 0 ? "EmptyTray" : "StrogeTray";
+ if (station.location_state == "Empty")
+ {
+ station.stationType = string.Empty;
+ station.heatNumber = string.Empty;
+ station.Number = string.Empty;
+ station.billetID = string.Empty;
+ station.tray_status = string.Empty;
+ station.bindSN = string.Empty;
+ station.quantity = 0;
+ //if (!station.stationCode.Contains("S") && !station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005"))
+ // station.tray_type = string.Empty;
+ }
var count = _repository.Update(station, true);
if (count > 0)
webResponse.OK();
@@ -129,5 +174,23 @@
return webResponse;
}
+
+ public WebResponseContent dt_stationinfolist()
+ {
+ WebResponseContent content = new WebResponseContent();
+ VOLContext volContext = new VOLContext();
+ Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
+ string[] stationCodes = { "A","S", "X", "W", "DD","B", "C", "D01"};
+ List<Tuple<List<dt_stationinfo>, int>> responseData = new List<Tuple<List<dt_stationinfo>, int>>();
+ foreach (string code in stationCodes)
+ {
+ var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
+ int inst = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).GroupBy(a => a.line).Count();
+ responseData.Add(Tuple.Create(data, inst));
+ }
+ content.Data = responseData;
+ return content;
+ }
+
}
}
--
Gitblit v1.9.3