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_WMSServer/Controllers/WMSInfo/MessageInfoHtyController.cs | 17 ++
新建文件夹/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoService.cs | 28 ++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_Common/MessageEnum.cs | 65 ++++++++++
新建文件夹/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoHtyService.cs | 15 ++
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoHtyService.cs | 19 +++
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 8
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoController.cs | 17 ++
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MessageInfo.cs | 20 ++
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs | 71 +++++++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 80 ++++++-------
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 5
11 files changed, 293 insertions(+), 52 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoHtyService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoHtyService.cs"
new file mode 100644
index 0000000..49ac4d9
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoHtyService.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IWMsInfoServices
+{
+ public interface IMessageInfoHtyService : IService<Dt_MessageInfo_Hty>
+ {
+
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoService.cs"
new file mode 100644
index 0000000..48ec75f
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary1/IMessageInfoService.cs"
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IWMsInfoServices
+{
+ public interface IMessageInfoService : IService<Dt_MessageInfo>
+ {
+ IRepository<Dt_MessageInfo> Repository { get; }
+ /// <summary>
+ /// 娣诲姞閫氱煡淇℃伅
+ /// </summary>
+ /// <param name="groupByEnum"></param>
+ /// <param name="messageName"></param>
+ /// <param name="messageInfo"></param>
+ /// <param name="statusEnum"></param>
+ /// <param name="messageRemark"></param>
+ /// <returns></returns>
+ WebResponseContent AddMessageInfo(MessageGroupByEnum groupByEnum, string messageName, string messageInfo, MessageStatusEnum statusEnum = MessageStatusEnum.Undisposed, string messageRemark = "");
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoHtyService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoHtyService.cs"
new file mode 100644
index 0000000..9966660
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoHtyService.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IWMsInfoServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMsInfoServices
+{
+ public class MessageInfoHtyService : ServiceBase<Dt_MessageInfo_Hty, IRepository<Dt_MessageInfo_Hty>>, IMessageInfoHtyService
+ {
+ public MessageInfoHtyService(IRepository<Dt_MessageInfo_Hty> BaseDal) : base(BaseDal)
+ {
+ }
+ }
+}
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"
new file mode 100644
index 0000000..0eafba3
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MessageInfoService.cs"
@@ -0,0 +1,71 @@
+锘縰sing SqlSugar.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IWMsInfoServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMsInfoServices
+{
+ public class MessageInfoService : ServiceBase<Dt_MessageInfo, IRepository<Dt_MessageInfo>>, IMessageInfoService
+ {
+ public MessageInfoService(IRepository<Dt_MessageInfo> BaseDal) : base(BaseDal)
+ {
+ }
+
+ public IRepository<Dt_MessageInfo> Repository => BaseDal;
+ /// <summary>
+ /// 娣诲姞閫氱煡淇℃伅
+ /// </summary>
+ /// <param name="groupByEnum"></param>
+ /// <param name="messageName"></param>
+ /// <param name="messageInfo"></param>
+ /// <param name="statusEnum"></param>
+ /// <param name="messageRemark"></param>
+ /// <returns></returns>
+ public WebResponseContent AddMessageInfo(MessageGroupByEnum groupByEnum, string messageName, string messageInfo, MessageStatusEnum statusEnum = MessageStatusEnum.Undisposed, string messageRemark = "")
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_MessageInfo dt_MessageInfo = null;
+ if (groupByEnum == MessageGroupByEnum.InventoryExceedAlarm)
+ dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageRemark == messageRemark);
+ else
+ dt_MessageInfo = BaseDal.QueryFirst(x => x.MessageName == messageName && x.MessageInfo == messageInfo);
+ if (dt_MessageInfo == null)
+ {
+ dt_MessageInfo = new Dt_MessageInfo();
+ dt_MessageInfo.MessageGroupBy = groupByEnum.ObjToInt();
+ dt_MessageInfo.MessageStatus = statusEnum.ObjToInt();
+ dt_MessageInfo.MessageName = messageName;
+ dt_MessageInfo.MessageInfo = messageInfo;
+ dt_MessageInfo.MessageRemark = messageRemark;
+ BaseDal.AddData(dt_MessageInfo);
+ }
+ else
+ {
+ if (dt_MessageInfo.MessageGroupBy == MessageGroupByEnum.InventoryExceedAlarm.ObjToInt())
+ {
+ dt_MessageInfo.MessageStatus = statusEnum.ObjToInt();
+ dt_MessageInfo.MessageName = messageName;
+ dt_MessageInfo.MessageInfo = messageInfo;
+ dt_MessageInfo.MessageRemark = messageRemark;
+ BaseDal.UpdateData(dt_MessageInfo);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MessageEnum.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MessageEnum.cs"
new file mode 100644
index 0000000..edfef0a
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MessageEnum.cs"
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common
+{
+ /// <summary>
+ /// 寮傚父淇℃伅鍒嗙粍
+ /// </summary>
+ public enum MessageGroupByEnum
+ {
+ /// <summary>
+ /// 璁惧鎶ヨ
+ /// </summary>
+ [Description("璁惧鎶ヨ")]
+ EquipmentAlarm,
+ /// <summary>
+ /// 搴撳瓨杩囨湡棰勮
+ /// </summary>
+ [Description("搴撳瓨杩囨湡棰勮")]
+ InventoryExceedAlarm,
+ /// <summary>
+ /// 浣庡簱瀛橀璀�
+ /// </summary>
+ [Description("浣庡簱瀛橀璀�")]
+ InventoryLowAlarm,
+ /// <summary>
+ /// 鐗╂枡寰呯淮鎶ゆ姤璀�
+ /// </summary>
+ [Description("鐗╂枡寰呯淮鎶ゆ姤璀�")]
+ MaterielAlarm,
+ /// <summary>
+ /// 鍏ュ簱鍗曟姤璀�
+ /// </summary>
+ [Description("鍏ュ簱鍗曟姤璀�")]
+ InOrderAlarm,
+ /// <summary>
+ /// 鍑哄簱鍗曟姤璀�
+ /// </summary>
+ [Description("鍑哄簱鍗曟姤璀�")]
+ OutOrderAlarm,
+ }
+
+ public enum MessageStatusEnum
+ {
+ /// <summary>
+ /// 寰呭鐞�
+ /// </summary>
+ [Description("寰呭鐞�")]
+ Undisposed,
+ /// <summary>
+ /// 鎬ュ鐞�
+ /// </summary>
+ [Description("鎬ュ鐞�")]
+ Emergency,
+ /// <summary>
+ /// 宸插鐞�
+ /// </summary>
+ [Description("宸插鐞�")]
+ Processed,
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MessageInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MessageInfo.cs"
index d70ec73..82b7c6e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MessageInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MessageInfo.cs"
@@ -21,7 +21,19 @@
public int Id { get; set; }
/// <summary>
- /// 寮傚父淇℃伅鍚嶇О
+ /// 寮傚父淇℃伅鍒嗙粍(璁惧鎶ヨ锛屽簱瀛樿繃鏈熸姤璀︼紝鐗╂枡缁存姢鎶ヨ锛屼綆搴撳瓨鎶ヨ锛屽垱寤哄嚭鍏ュ簱鍗曟姤璀�)
+ /// </summary>
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "寮傚父淇℃伅鍒嗙粍")]
+ public int MessageGroupBy { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鐘舵��")]
+ public int MessageStatus { get; set; }
+
+ /// <summary>
+ /// 寮傚父淇℃伅鍚嶇О(鑾峰彇涓婃父鍏ュ簱鍗曞紓甯搞�傘�傘��)
/// </summary>
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "寮傚父淇℃伅鍚嶇О")]
public string MessageName { get; set; }
@@ -33,9 +45,9 @@
public string MessageInfo { get; set; }
/// <summary>
- /// 鐘舵��
+ /// 澶囨敞(搴撳瓨杩囨湡棰勮鏃朵紶鍏ョ墿鏂欑紪鍙峰拰鎵规鍙�)
/// </summary>
- [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鐘舵��")]
- public int MessageStatus { get; set; }
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
+ public string MessageRemark { get; set; }
}
}
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)
{
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 c274e66..f13c371 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"
@@ -43,9 +43,10 @@
private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
private readonly ISupplyTaskHtyService _supplyTaskHtyService;
+ private readonly IMessageInfoService _messageInfoService;
public IRepository<Dt_CabinOrder> Repository => BaseDal;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)
{
_basicService = basicService;
_medicineGoodsServices = medicineGoodsServices;
@@ -55,6 +56,7 @@
_cabinOrderDetailServices = cabinOrderDetailServices;
_supplyTaskService = supplyTaskService;
_supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
}
@@ -724,6 +726,7 @@
}
catch (Exception ex)
{
+ //_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, "鍒涘缓鐩樼泩鍏ュ簱鍗�", ex.Message);
content.Error(ex.Message);
}
return content;
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 5c62803..6fa2fbf 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"
@@ -43,8 +43,9 @@
private readonly ISupplyTaskService _supplyTaskService;
private readonly ISupplyTaskHtyService _supplyTaskHtyService;
private readonly ITacticsService _tacticsService;
+ private readonly IMessageInfoService _messageInfoService;
public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
- public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
+ public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)
{
_basicService = basicService;
_unitOfWorkManage = unitOfWorkManage;
@@ -55,6 +56,7 @@
_cabinOrderServices = cabinOrderServices;
_tacticsService = tacticsService;
_supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
}
#region 鍒涘缓鍑哄簱鍗�
/// <summary>
@@ -720,9 +722,9 @@
}
}
}
- catch (Exception e)
+ catch (Exception ex)
{
- content.Error(e.Message);
+ content.Error(ex.Message);
}
return content;
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoController.cs"
new file mode 100644
index 0000000..1812b00
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoController.cs"
@@ -0,0 +1,17 @@
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IWMsInfoServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.WMSInfo
+{
+ [Route("api/[controller]")]
+ [ApiController]
+ public class MessageInfoController : ApiBaseController<IMessageInfoService, Dt_MessageInfo>
+ {
+ public MessageInfoController(IMessageInfoService service) : base(service)
+ {
+ }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoHtyController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoHtyController.cs"
new file mode 100644
index 0000000..f7cc162
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WMSInfo/MessageInfoHtyController.cs"
@@ -0,0 +1,17 @@
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IWMsInfoServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.WMSInfo
+{
+ [Route("api/[controller]")]
+ [ApiController]
+ public class MessageInfoHtyController : ApiBaseController<IMessageInfoHtyService, Dt_MessageInfo_Hty>
+ {
+ public MessageInfoHtyController(IMessageInfoHtyService service) : base(service)
+ {
+ }
+ }
+}
--
Gitblit v1.9.3