From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs | 44 +++++++++++-----------
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 30 +++++++++-----
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs | 3 -
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 24 ++++++++----
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs | 2
新建文件夹/WMS/src/views/Index.vue | 3 +
6 files changed, 60 insertions(+), 46 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
index 536d322..5a10030 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
@@ -35,7 +35,7 @@
var day = (item.ValidityPeriod - DateTime.Now).Days;
string d = $"杩樻湁{day}澶╄繃鏈�";
if (day < 0) d = $"宸茶繃鏈焮Math.Abs(day)}澶�";
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryExceedAlarm, "鐗╂枡鍚嶇О:" + item.MaterielName, $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆憑d}");
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryExceedAlarm, "鐗╂枡鍚嶇О:" + item.MaterielName, $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆憑d}", messageRemark: $"鐗╂枡缂栧彿銆恵item.MaterielCode}銆戠墿鏂欐壒娆°�恵item.BatchNo}銆�");
}
}
catch (Exception ex)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
index 365a8ea..55e2047 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
@@ -48,10 +48,7 @@
{
Dt_MessageInfo dt_MessageInfo = null;
if (groupByEnum == MessageGroupByEnum.InventoryExceedAlarm)
- {
dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageRemark == messageRemark);
- if (dt_MessageInfo != null && dt_MessageInfo.MessageInfo == messageInfo) return content;
- }
else
dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageInfo == messageInfo);
if (groupByEnum != MessageGroupByEnum.InventoryExceedAlarm && dt_MessageInfo != null) return content;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
index 686f7e5..07e73f2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/Extensions/WebSocketHostedService.cs"
@@ -57,28 +57,28 @@
public async Task StartAsync(CancellationToken cancellationToken)
{
- WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(App.User.UserName));
- string MessageInfo = _cacheService.Get("MessageInfo");
- if (!string.IsNullOrEmpty(MessageInfo))
- {
- List<Message>? messages = JsonConvert.DeserializeObject<List<Message>>(MessageInfo);
- if (messages != null && messages.Count > 0)
- {
- foreach (var item in messages)
- {
- object obj = new
- {
- title = item.MessageGroupBy,
- name = item.MessageName,
- message = item.MessageInfo,
- date = item.Date,
- };
- //_webSocketServer.PublishAllClientPayload(obj.Serialize());
- if (webSocketSession != null)
- _webSocketServer.SendClientPayload(webSocketSession, obj.Serialize());
- }
- }
- }
+ //WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(App.User.UserName));
+ //string MessageInfo = _cacheService.Get("MessageInfo");
+ //if (!string.IsNullOrEmpty(MessageInfo))
+ //{
+ // List<Message>? messages = JsonConvert.DeserializeObject<List<Message>>(MessageInfo);
+ // if (messages != null && messages.Count > 0)
+ // {
+ // foreach (var item in messages)
+ // {
+ // object obj = new
+ // {
+ // title = item.MessageGroupBy,
+ // name = item.MessageName,
+ // message = item.MessageInfo,
+ // date = item.Date,
+ // };
+ // //_webSocketServer.PublishAllClientPayload(obj.Serialize());
+ // if (webSocketSession != null)
+ // _webSocketServer.SendClientPayload(webSocketSession, obj.Serialize());
+ // }
+ // }
+ //}
await Task.CompletedTask;
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 1c40815..6a764ee 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -476,18 +476,25 @@
}
//_materielInfoService.UpdateData(materielInfo);
}
- _unitOfWorkManage.BeginTran();
- if (materielInfosUp.Count > 0) _materielInfoService.UpdateData(materielInfosUp);
- if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
- if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
- if (dt_CabinOrders.Count > 0) BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ if (materielInfosUp.Count > 0) _materielInfoService.UpdateData(materielInfosUp);
+ if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
+ if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
+ if (dt_CabinOrders.Count > 0) BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception)
+ {
+ _unitOfWorkManage.RollbackTran();
+ }
//webResponseContent.OK(data: dt_CabinOrders);
}
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, (order.order_type == "2" ? "鍑哄簱閫�璐�" : "姝ｅ父鍏ュ簱") + $"锛氬崟鍙枫�恵order.order_no}銆�", ex.Message);
webResponseContent.Error(ex.Message);
}
return webResponseContent;
@@ -831,6 +838,7 @@
else
{
var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ if (cabinOrder.Order_type == "2") url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
var requestDate = new
{
order_no = cabinOrder.Order_no
@@ -838,7 +846,7 @@
var result = HttpHelper.Post(url, requestDate.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
- if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ if (response.resultCode != "0" && response.resultMsg != "鏈壘鍒板悎娉曞崟鎹�") throw new Exception(response.resultMsg);
_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index c28476c..44d2925 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -464,22 +464,29 @@
//_supplyTaskService.AddData(supplyTasks);
}
}
- _unitOfWorkManage.BeginTran();
- _supplyTaskService.AddData(supplyTasks);
- _inventory_BatchServices.UpdateData(batchesUp);
- _inventoryInfoService.UpdateData(inventoryInfosUp);
- if (entityOrder.Details.Count > 0)
- BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
- if (entityOrderLK.Details.Count > 0)
- BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskService.AddData(supplyTasks);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ _inventoryInfoService.UpdateData(inventoryInfosUp);
+ if (entityOrder.Details.Count > 0)
+ BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ if (entityOrderLK.Details.Count > 0)
+ BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ }
#endregion
}
webResponseContent.OK();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "鍏ュ簱閫�璐�" : "姝ｅ父鍑哄簱") + $"锛氬崟鍙枫�恵outorder.order_no}銆�", ex.Message);
webResponseContent.Error(ex.Message);
}
return webResponseContent;
@@ -1146,6 +1153,7 @@
else
{
var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ if (deliveryOrder.Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
var requestDate = new
{
order_no = deliveryOrder.Out_no
@@ -1153,7 +1161,7 @@
var result = HttpHelper.Post(url, requestDate.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
- if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ if (response.resultCode != "0" && response.resultMsg != "鏈壘鍒板悎娉曞崟鎹�") throw new Exception(response.resultMsg);
_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
index aade1a5..5d52cad 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
@@ -612,7 +612,8 @@
}
}
- createSocket("ws://172.16.1.4:9296/" + _userInfo.userName);
+ //createSocket("ws://127.0.0.1:9296/" + _userInfo.userName);
+ createSocket("ws://172.16.1.4:9296/" + _userInfo.userName);
Object.assign(_config.$tabs, { open: open, close: close });
--
Gitblit v1.9.3