From 26dbfbfc18fe54c9f36121111275300a7c102be7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 26 十月 2025 13:58:55 +0800
Subject: [PATCH] 添加报警通知信息
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 80 ++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 44 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
index b534138..02586ea 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
@@ -13,6 +13,8 @@
using static WIDESEA_DTO.SquareCabin.TowcsDto;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_DTO.SquareCabin;
+using WIDESEA_Common;
+using System.Xml.Linq;
namespace WIDESEA_WMSServer
{
@@ -22,24 +24,16 @@
private readonly ICabinOrderDetailServices _cabinDetailServices;
private readonly IDeliveryOrderServices _deliveryOrderServices;
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
- private readonly IBasicService _basicService;
+ private readonly IMessageInfoService _messageInfoService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IInventory_BatchServices _inventory_BatchServices;
- private readonly IInventoryInfoService _inventoryInfoService;
- private readonly ISupplyTaskService _supplyTaskService;
- private readonly ITacticsService _tacticsService;
- public Business(IDeliveryOrderServices deliveryOrderServices, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ICabinOrderDetailServices cabinDetailServices)
+ public Business(IDeliveryOrderServices deliveryOrderServices, IUnitOfWorkManage unitOfWorkManage, IDeliveryOrderDetailServices deliveryOrderDetailServices, ICabinOrderServices cabinOrderServices, ICabinOrderDetailServices cabinDetailServices, IMessageInfoService messageInfoService)
{
_deliveryOrderServices = deliveryOrderServices;
- _basicService = basicService;
_unitOfWorkManage = unitOfWorkManage;
- _inventory_BatchServices = inventory_BatchServices;
- _inventoryInfoService = inventoryInfoService;
_deliveryOrderDetailServices = deliveryOrderDetailServices;
- _supplyTaskService = supplyTaskService;
_cabinOrderServices = cabinOrderServices;
- _tacticsService = tacticsService;
_cabinDetailServices = cabinDetailServices;
+ _messageInfoService = messageInfoService;
}
#region 鑾峰彇ERP鍏ュ簱鍗�
static string SearchInDate = "2025-09-10 00:00:00";
@@ -99,7 +93,9 @@
//瀛樺偍鍏ュ簱鍗曞彿
List<string> orderNos = new List<string>();
-
+ string name = string.Empty;
+ MessageGroupByEnum messageGroupBy = MessageGroupByEnum.InOrderAlarm;
+ MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
foreach (var order in newOrders)
{
try
@@ -107,6 +103,7 @@
_unitOfWorkManage.BeginTran();
if (order.order_type == "1") //姝ｅ父鍏ュ簱
{
+ name = "鍒涘缓姝ｅ父鍏ュ簱鍗�";
responseContent = _cabinOrderServices.CreateInboundOrder(order);
if (!responseContent.Status) throw new Exception(responseContent.Message);
List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
@@ -115,6 +112,8 @@
}
else if (order.order_type == "3")//鍏ュ簱閫�鏂�
{
+ messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
+ name = "鍒涘缓鍏ュ簱閫�璐у崟";
//鍒涘缓鍑哄簱鍗�
#region 杞崲涓哄嚭搴撳崟
UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
@@ -141,6 +140,8 @@
}
else if (order.order_type == "5")//鎶ユ孩鍏ュ簱
{
+ name = "鍒涘缓鐩樼泩鍏ュ簱鍗�";
+ messageStatus = MessageStatusEnum.Undisposed;
var content = _cabinOrderServices.CreateCheckInOrder(order);
if (!content.Status) throw new Exception(content.Message);
}
@@ -149,14 +150,11 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
SendErrorToUpstream(1, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
};
-
- //鍦ㄤ笅鍙戠粰wcs
- //EdiIn(); //鍙戠粰涓嬫父
- //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
}
@@ -218,21 +216,26 @@
return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
}
- _unitOfWorkManage.BeginTran();
- try
+ List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
+ List<string> orderNos = new List<string>();
+ string name = string.Empty;
+ MessageGroupByEnum messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
+ MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
+ foreach (var outorder in newOutOrders)
{
- List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
- List<string> orderNos = new List<string>();
-
- foreach (var outorder in newOutOrders)
+ try
{
+ _unitOfWorkManage.BeginTran();
if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
{
+ name = "鍒涘缓姝ｅ父鍑哄簱鍗�";
var content = _deliveryOrderServices.CreateOutboundOrder(outorder);
if (!content.Status) throw new Exception(content.Message);
}
else if (outorder.order_type == "2")//鍑哄簱閫�璐�
{
+ name = "鍒涘缓鍑哄簱閫�璐у崟";
+ messageGroupBy = MessageGroupByEnum.InOrderAlarm;
// 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
// 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
//continue;
@@ -264,33 +267,22 @@
}
else if (outorder.order_type == "6")//鎶ユ崯鍑哄簱
{
+ name = "鍒涘缓鐩樻崯鍑哄簱鍗�";
+ messageStatus = MessageStatusEnum.Undisposed;
var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
if (!content.Status) throw new Exception(content.Message);
}
+ _unitOfWorkManage.CommitTran();
}
-
- // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
- //if (_DeliveryOrders.Any())
- //{
- // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
- //}
- //涓嬪彂鍑哄簱鍗曚换鍔＄粰wcs
-
-
- _unitOfWorkManage.CommitTran();
- //var tex = CreateSupplyTask(order_no);
- //if (!tex)
- //{
- // return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
- //}
- return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
+ SendErrorToUpstream(3, "", ex.Message, "");
+ return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ }
}
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- }
+ return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
}
catch (Exception ex)
{
--
Gitblit v1.9.3