From ff7fbe2823021c709e811d58d20b5ef2e5695cff Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 18 十二月 2025 19:01:47 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 4 +
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs | 71 +++++++++++++++++++----------------
2 files changed, 41 insertions(+), 34 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index e2d3085..a1ea0b2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -360,7 +360,7 @@
}).ToList();
allocatefeedmodel.Details = groupedData;
- var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
+ //var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
var response = responseModel(inboundOrder, 3, "http://127.0.0.1:450/api/AldAllocationOperation/AllocationOperation", null, allocatefeedmodel);
if (response != null && response.IsSuccess)
@@ -509,10 +509,12 @@
if (model != null)
{
httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, model.Serialize());
+ requestData = model.Serialize();
}
else
{
httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, allocateDto.Serialize());
+ requestData = allocateDto.Serialize();
}
httpResponseResult.ApiUrl = apiUrl;
bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
index 0a6bc41..9edbe69 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
@@ -13,51 +13,56 @@
public class Task_HtyService : ServiceBase<Dt_Task_Hty, IRepository<Dt_Task_Hty>>, ITask_HtyService
{
private readonly ILogger<Task_HtyService> _logger;
-
+ private readonly IRepository<Dt_Task> _taskRepository;
private readonly IMapper _mapper; // AutoMapper瀹炰緥
- public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal, IMapper mapper, ILogger<Task_HtyService> logger) : base(BaseDal)
+ public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal, IMapper mapper, ILogger<Task_HtyService> logger, IRepository<Dt_Task> taskRepository) : base(BaseDal)
{
_mapper = mapper;
_logger = logger;
+ _taskRepository = taskRepository;
}
public bool DeleteAndMoveIntoHty(Dt_Task task, OperateTypeEnum operateType)
{
// using var transaction = Db.Ado.UseTran();
try
{
- var historyEntity = _mapper.Map<Dt_Task_Hty>(task);
+ _taskRepository.DeleteAndMoveIntoHty(task, operateType);
- // 2. 濉厖鍘嗗彶瀹炰綋鏍稿績瀛楁
- historyEntity.SourceId = task.TaskId;
- historyEntity.OperateType = App.User?.UserName != null ? OperateTypeEnum.鑷姩瀹屾垚.ToString() : OperateTypeEnum.浜哄伐瀹屾垚.ToString();
- historyEntity.Creater = App.User?.UserName != null ? App.User.UserName : "System";
-
- // 瑕嗙洊淇敼浜�/淇敼鏃堕棿锛堜紭鍏堢骇楂樹簬鏄犲皠锛�
- // historyEntity.Modifier = App.User?.UserId > 0 ? App.User?.UserName : "System";
- // historyEntity.ModifyDate = DateTime.Now;
-
- // 3. 鎻掑叆鍘嗗彶琛紙绫诲瀷瀹夊叏锛屾棤鍙嶅皠鎷兼帴琛ㄥ悕锛�
-
- int insertCount = Db.Insertable(historyEntity).ExecuteCommand();
-
- if (insertCount <= 0)
- {
- _logger.LogError($"浠诲姟鍘嗗彶琛―t_Task_Hty [{task.TaskNum}]鎻掑叆澶辫触锛屽奖鍝嶈鏁颁负0");
- // transaction.RollbackTran();
- return false;
- }
-
- // 4. 鍒犻櫎鍘熷疄浣擄紙绫诲瀷瀹夊叏锛�
- int deleteCount = Db.Deleteable(task).ExecuteCommand();
- if (deleteCount <= 0)
- {
- _logger.LogError("浠诲姟涓氬姟瀹炰綋[{0}]鍒犻櫎澶辫触锛屽奖鍝嶈鏁颁负0", task.TaskNum);
- // transaction.RollbackTran();
- return false;
- }
- //transaction.CommitTran();
- _logger.LogInformation("浠诲姟瀹炰綋[{0}]宸叉垚鍔熺Щ鍏ュ巻鍙茶〃[{1}]骞跺垹闄ゅ師鏁版嵁", task.TaskNum);
return true;
+
+ //var historyEntity = _mapper.Map<Dt_Task_Hty>(task);
+
+ // // 2. 濉厖鍘嗗彶瀹炰綋鏍稿績瀛楁
+ // historyEntity.SourceId = task.TaskId;
+ // historyEntity.OperateType = App.User?.UserName != null ? OperateTypeEnum.鑷姩瀹屾垚.ToString() : OperateTypeEnum.浜哄伐瀹屾垚.ToString();
+ // historyEntity.Creater = App.User?.UserName != null ? App.User.UserName : "System";
+
+ // // 瑕嗙洊淇敼浜�/淇敼鏃堕棿锛堜紭鍏堢骇楂樹簬鏄犲皠锛�
+ //// historyEntity.Modifier = App.User?.UserId > 0 ? App.User?.UserName : "System";
+ //// historyEntity.ModifyDate = DateTime.Now;
+
+ // // 3. 鎻掑叆鍘嗗彶琛紙绫诲瀷瀹夊叏锛屾棤鍙嶅皠鎷兼帴琛ㄥ悕锛�
+
+ // int insertCount = Db.Insertable(historyEntity).ExecuteCommand();
+
+ // if (insertCount <= 0)
+ // {
+ // _logger.LogError($"浠诲姟鍘嗗彶琛―t_Task_Hty [{task.TaskNum}]鎻掑叆澶辫触锛屽奖鍝嶈鏁颁负0");
+ // // transaction.RollbackTran();
+ // return false;
+ // }
+
+ // // 4. 鍒犻櫎鍘熷疄浣擄紙绫诲瀷瀹夊叏锛�
+ // int deleteCount = Db.Deleteable(task).ExecuteCommand();
+ // if (deleteCount <= 0)
+ // {
+ // _logger.LogError("浠诲姟涓氬姟瀹炰綋[{0}]鍒犻櫎澶辫触锛屽奖鍝嶈鏁颁负0", task.TaskNum);
+ // // transaction.RollbackTran();
+ // return false;
+ // }
+ // //transaction.CommitTran();
+ // _logger.LogInformation("浠诲姟瀹炰綋[{0}]宸叉垚鍔熺Щ鍏ュ巻鍙茶〃[{1}]骞跺垹闄ゅ師鏁版嵁", task.TaskNum);
+ // return true;
}
catch (Exception ex)
{
--
Gitblit v1.9.3