From c2cdf0b95d4c9214646c860609b8c838d6ffa779 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 15 八月 2025 13:42:10 +0800
Subject: [PATCH] AGV，成品库代码更新上传
---
项目代码/WMS/WMSServices/WIDESEA_ApprovalService/ApprovalTaskService.cs | 183 ---------------------------------------------
1 files changed, 1 insertions(+), 182 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ApprovalService/ApprovalTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ApprovalService/ApprovalTaskService.cs"
index 797cf26..1208d8e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ApprovalService/ApprovalTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ApprovalService/ApprovalTaskService.cs"
@@ -13,7 +13,6 @@
using WIDESEA_Core.Helper;
using WIDESEA_IApprovalRepository;
using WIDESEA_IApprovalService;
-using WIDESEA_ICheckRepository;
using WIDESEA_ISystemRepository;
using WIDESEA_Model.Models;
@@ -24,199 +23,19 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IApprovalFlowRepository _approvalFlowRepository;
private readonly IApprovalNodeRepository _approvalNodeRepository;
- private readonly ICheckOrderRepository _checkOrderRepository;
private readonly WebSocketServer _webSocketServer;
private readonly ISys_UserRepository _userRepository;
public IApprovalTaskRepository Repository => BaseDal;
- public ApprovalTaskService(IApprovalTaskRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IApprovalFlowRepository approvalFlowRepository, IApprovalNodeRepository approvalNodeRepository, ICheckOrderRepository checkOrderRepository, WebSocketServer webSocketServer, ISys_UserRepository userRepository) : base(BaseDal)
+ public ApprovalTaskService(IApprovalTaskRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IApprovalFlowRepository approvalFlowRepository, IApprovalNodeRepository approvalNodeRepository, WebSocketServer webSocketServer, ISys_UserRepository userRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_approvalFlowRepository = approvalFlowRepository;
_approvalNodeRepository = approvalNodeRepository;
- _checkOrderRepository = checkOrderRepository;
_webSocketServer = webSocketServer;
_userRepository = userRepository;
}
- /// <summary>
- /// 瀹℃壒鍚屾剰
- /// </summary>
- /// <param name="sourceKey">婧愪富閿�</param>
- /// <returns></returns>
- public WebResponseContent AuditAgree(int sourceKey)
- {
- try
- {
- Dt_ApprovalFlow approvalFlow = _approvalFlowRepository.QueryFirst(x => x.FlowCode == "IQC");
- if (approvalFlow == null)
- {
- return WebResponseContent.Instance.Error($"鏈畾涔夎瀹℃壒娴�");
- }
- List<Dt_ApprovalNode> approvalNodes = _approvalNodeRepository.QueryData(x => x.FlowId == approvalFlow.Id);
- if (approvalNodes == null || approvalNodes.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈畾涔夎瀹℃壒娴佺▼鑺傜偣");
- }
-
- Dt_ApprovalNode? currentNode = approvalNodes.FirstOrDefault(x => x.ApproverRole == App.User.RoleId);
- if (currentNode == null)
- {
- return WebResponseContent.Instance.OK($"鏈壘鍒板綋鍓嶈鑹插鎵硅妭鐐�");
- }
-
- Dt_ApprovalTask approvalTask = BaseDal.QueryFirst(x => x.SourceKey == sourceKey && x.NodeId == currentNode.Id);
- if (approvalTask == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌瀹℃壒鏁版嵁");
- }
-
- if (approvalTask.Status != AuditStatusEnum.Auditing.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ュ鎵瑰凡瀹屾垚");
- }
-
- Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == sourceKey);
- if (checkOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒版潵婧愭暟鎹�(璐ㄦ鍗�)");
- }
-
- Dt_ApprovalNode? nextNode = approvalNodes.Where(x => x.NodeSequence > currentNode.NodeSequence).OrderBy(x => x.NodeSequence).FirstOrDefault();
- if (nextNode == null)//瀹℃壒娴佺▼缁撴潫
- {
- approvalTask.Status = AuditStatusEnum.Agree.ObjToInt();
-
- checkOrder.AuditStatus = AuditStatusEnum.Agree.ObjToInt();
- _unitOfWorkManage.BeginTran();
- _checkOrderRepository.UpdateData(checkOrder);
-
- BaseDal.UpdateData(approvalTask);
- //BaseDal.DeleteAndMoveIntoHty(approvalTask, WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
-
- WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(approvalTask.ApplicantUserName));
- if (webSocketSession != null)
- {
- _webSocketServer.SendClientPayload(webSocketSession, "鍚屾剰");
- }
- _unitOfWorkManage.CommitTran();
- }
- else//杩涘叆涓嬩竴绾у鎵硅妭鐐�
- {
- object obj = new
- {
- title = "IQC璐ㄦ缁撴灉瀹℃壒",
- formData = checkOrder,
- tableData = checkOrder.Details,
- message = "鎺ㄩ�佹祴璇曚俊鎭綋",
- date = DateTime.Now.ToString(),
- };
- List<Dt_ApprovalTask> approvalTasks = new List<Dt_ApprovalTask>();
- List<string> userNames = new List<string>();
- List<Sys_User> users = _userRepository.QueryData(x => x.RoleId == nextNode.ApproverRole);
- foreach (Sys_User user in users)
- {
- Dt_ApprovalTask newApprovalTask = new Dt_ApprovalTask()
- {
- FlowId = approvalFlow.Id,
- NodeId = nextNode.Id,
- ApplicantUserId = App.User.UserId,
- ApplicantUserName = user.UserName,
- Status = AuditStatusEnum.Auditing.ObjToInt(),
- AuditUser = user.UserName,
- SourceKey = approvalTask.SourceKey
- };
- approvalTasks.Add(newApprovalTask);
- userNames.Add(user.UserName);
- }
-
- approvalTask.Status = AuditStatusEnum.Agree.ObjToInt();
- BaseDal.UpdateData(approvalTask);
- BaseDal.AddData(approvalTasks);
- foreach (string userName in userNames)
- {
- WebSocketSession? socketSessions = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(userName));
- if (socketSessions != null)
- {
- _webSocketServer.SendClientPayload(socketSessions, obj.Serialize());
- }
- }
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 瀹℃壒椹冲洖
- /// </summary>
- /// <param name="sourceKey">婧愪富閿�</param>
- /// <returns></returns>
- public WebResponseContent AuditReject(int sourceKey)
- {
- try
- {
- Dt_ApprovalFlow approvalFlow = _approvalFlowRepository.QueryFirst(x => x.FlowCode == "IQC");
- if (approvalFlow == null)
- {
- return WebResponseContent.Instance.Error($"鏈畾涔夎瀹℃壒娴�");
- }
- List<Dt_ApprovalNode> approvalNodes = _approvalNodeRepository.QueryData(x => x.FlowId == approvalFlow.Id);
- if (approvalNodes == null || approvalNodes.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈畾涔夎瀹℃壒娴佺▼鑺傜偣");
- }
-
- Dt_ApprovalNode? currentNode = approvalNodes.FirstOrDefault(x => x.ApproverRole == App.User.RoleId);
- if (currentNode == null)
- {
- return WebResponseContent.Instance.OK($"鏈壘鍒板綋鍓嶈鑹插鎵硅妭鐐�");
- }
-
- Dt_ApprovalTask approvalTask = BaseDal.QueryFirst(x => x.SourceKey == sourceKey);
- if (approvalTask == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌瀹℃壒鏁版嵁");
- }
-
- if (approvalTask.Status != AuditStatusEnum.Auditing.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ュ鎵瑰凡瀹屾垚");
- }
-
- Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == sourceKey);
- if (checkOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒版潵婧愭暟鎹�(璐ㄦ鍗�)");
- }
-
- approvalTask.Status = AuditStatusEnum.Reject.ObjToInt();
-
- checkOrder.AuditStatus = AuditStatusEnum.Reject.ObjToInt();
- _unitOfWorkManage.BeginTran();
- _checkOrderRepository.UpdateData(checkOrder);
-
- BaseDal.UpdateData(approvalTask);
- //BaseDal.DeleteAndMoveIntoHty(approvalTask, WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
-
- WebSocketSession? webSocketSession = _webSocketServer.OnlineSessions.FirstOrDefault(x => x.Url.Contains(approvalTask.ApplicantUserName));
- if (webSocketSession != null)
- {
- _webSocketServer.SendClientPayload(webSocketSession, "椹冲洖");
- }
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
}
}
--
Gitblit v1.9.3