From 37faeb3fd7d8f204298d4d24a8a98110992d6b58 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 19 十一月 2025 08:38:28 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 5 ++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs | 10 ++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 26 ++++++++----
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 4 +-
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs | 8 ++--
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs | 7 +++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 7 ++-
7 files changed, 47 insertions(+), 20 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
index c8ccfc4..0314eb8 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Microsoft.Extensions.Logging;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -28,18 +29,22 @@
public readonly IOutboundService _outboundService;
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
+
+ private readonly ILogger<AllocateService> _logger;
public AllocateService(IRepository<Dt_AllocateOrder> BaseDal,
IUnitOfWorkManage unitOfWorkManage,
IInboundService inboundService,
IOutboundService outboundService,
IRepository<Dt_AllocateOrder> allocateOrderRepository,
- IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository) : base(BaseDal)
+ IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
+ ILogger<AllocateService> logger) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
_outboundService = outboundService;
_allocateOrderRepository = allocateOrderRepository;
_allocateOrderDetailRepository = allocateOrderDetailRepository;
+ _logger = logger;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -51,9 +56,9 @@
{
return operateType switch
{
- 1 => AddInboundOrder(allocateOrder),
- 2 => UpdateInboundOrder(allocateOrder),
- 3 => DeleteInboundOrder(allocateOrder),
+ 1 => AddAllocateOrder(allocateOrder),
+ 2 => UpdateAllocateOrder(allocateOrder),
+ 3 => DeleteAllocateOrder(allocateOrder),
_ => WebResponseContent.Instance.OK(),
};
@@ -64,7 +69,7 @@
}
}
- public WebResponseContent AddInboundOrder(Dt_AllocateOrder allocateOrder)
+ public WebResponseContent AddAllocateOrder(Dt_AllocateOrder allocateOrder)
{
try
{
@@ -96,10 +101,11 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("AllocateService AddAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent UpdateInboundOrder(Dt_AllocateOrder model)
+ public WebResponseContent UpdateAllocateOrder(Dt_AllocateOrder model)
{
try
{
@@ -185,11 +191,12 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation("AllocateService UpdateAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public WebResponseContent DeleteInboundOrder(Dt_AllocateOrder model)
+ public WebResponseContent DeleteAllocateOrder(Dt_AllocateOrder model)
{
try
{
@@ -202,7 +209,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
}
- //Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+ //Db.DeleteNav(Allocate).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.BeginTran();
// BaseDal.DeleteAndMoveIntoHty(allocateOrder, OperateTypeEnum.鑷姩鍒犻櫎);
foreach (var item in allocateOrder.Details)
@@ -217,6 +224,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogInformation("AllocateService DeleteAllocateOrder err: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
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_BasicService/ESSApiService.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_BasicService/ESSApiService.cs"
index 8d1861a..659a98c 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_BasicService/ESSApiService.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_BasicService/ESSApiService.cs"
@@ -31,7 +31,7 @@
try
{
var url = "conveyor/moveContainer";
-
+ _logger.LogInformation("ESSApiService MoveContainerAsync Request: " + JsonConvert.SerializeObject(request));
var result = await PostAsync<MoveContainerRequest, ApiResponse<string>>(url, request);
if (result != null && result.Code == 0)
{
@@ -46,7 +46,7 @@
}
catch (Exception ex)
{
- _logger.LogInformation("瀹瑰櫒娴佸姩澶辫触: " + ex.Message);
+ _logger.LogInformation("ESSApiService 瀹瑰櫒娴佸姩澶辫触: " + ex.Message);
return false;
}
}
@@ -60,7 +60,7 @@
{
try
{
- _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(request));
+ _logger.LogInformation("ESSApiService 鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(request));
var url = "task/create";
var result = await PostAsync<TaskModel, ApiResponse<TasksData>>(url, request);
@@ -72,7 +72,7 @@
}
catch (Exception ex)
{
- _logger.LogInformation("鍒涘缓浠诲姟澶辫触: " + ex.Message);
+ _logger.LogInformation("ESSApiService 鍒涘缓浠诲姟澶辫触: " + ex.Message);
return false;
}
}
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_CheckService/ReCheckOrderService.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_CheckService/ReCheckOrderService.cs"
index 92f1b15..ce33b32 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_CheckService/ReCheckOrderService.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_CheckService/ReCheckOrderService.cs"
@@ -1,4 +1,6 @@
锘縰sing HslCommunication.WebSocket;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -20,11 +22,13 @@
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly WebSocketServer _webSocketServer;
+ private readonly ILogger<ReCheckOrderService> _logger;
public IRepository<Dt_ReCheckOrder> Repository => BaseDal;
- public ReCheckOrderService(IRepository<Dt_ReCheckOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, WebSocketServer webSocketServer) : base(BaseDal)
+ public ReCheckOrderService(IRepository<Dt_ReCheckOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, WebSocketServer webSocketServer, ILogger<ReCheckOrderService> logger) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_webSocketServer = webSocketServer;
+ _logger = logger;
}
public WebResponseContent ReceiveReCheckOrder(Dt_ReCheckOrder models, int operateType)
@@ -42,6 +46,7 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("ReCheckOrderService ReceiveReCheckOrder: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -64,6 +69,7 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("ReCheckOrderService AddReCheckOrder: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -98,6 +104,7 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("ReCheckOrderService UpdateReCheckOrder: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -120,6 +127,7 @@
}
catch (Exception ex)
{
+ _logger.LogInformation("ReCheckOrderService DeleteReCheckOrder: " + ex.Message);
return WebResponseContent.Instance.Error(ex.Message);
}
}
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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
index ef0c0c2..a60f431 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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
@@ -366,7 +366,7 @@
// 妫�鏌ユ墭鐩樹笂鏄惁鏈夊叾浠栭潪鍑哄簱璐х墿锛堝簱瀛樿揣鐗╋級
var palletStockGoods = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(it => it.StockId == stockinfo.Id && (it.Status == StockStatusEmun.鍏ュ簱纭.ObjToInt() || it.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()))
+ .Where(it => it.StockId == stockinfo.Id && (it.Status == StockStatusEmun.鍏ュ簱纭.ObjToInt() || it.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() || it.Status == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()))
.Where(it => it.OutboundQuantity == 0 || it.OutboundQuantity < it.StockQuantity) // 鏈畬鍏ㄥ嚭搴撶殑
.ToListAsync();
@@ -469,7 +469,7 @@
totalReturnQty = palletStockGoods.Sum(x => x.StockQuantity - x.OutboundQuantity);
}
- // 淇濆瓨浠诲姟
+ // 淇濆瓨浠诲姟 缁橢SS涓嬪彂浠诲姟
if (tasks.Any())
{
try
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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index b0fef60..c2a1334 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -9,6 +9,7 @@
using WIDESEA_IAllocateService;
using WIDESEA_IInboundService;
using WIDESEA_Model.Models;
+using WIDESEA_WMSServer.Controllers.Check;
namespace WIDESEA_WMSServer.Controllers.Allocate
@@ -21,8 +22,10 @@
[ApiController]
public class AllocateOrderController : ApiBaseController<IAllocateService, Dt_AllocateOrder>
{
- public AllocateOrderController(IAllocateService service) : base(service)
+ private readonly ILogger<AllocateOrderController> _logger;
+ public AllocateOrderController(IAllocateService service, ILogger<AllocateOrderController> logger) : base(service)
{
+ _logger = logger;
}
[HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
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_WMSServer/Controllers/Check/CheckOrderController.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_WMSServer/Controllers/Check/CheckOrderController.cs"
index 14efa78..12d2bed 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_WMSServer/Controllers/Check/CheckOrderController.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_WMSServer/Controllers/Check/CheckOrderController.cs"
@@ -1,6 +1,7 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
@@ -8,6 +9,7 @@
using WIDESEA_ICheckService;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Check;
+using WIDESEA_WMSServer.Controllers.Outbound;
namespace WIDESEA_WMSServer.Controllers.Check
{
@@ -19,9 +21,11 @@
public class CheckOrderController : ApiBaseController<ICheckOrderService, Dt_CheckOrder>
{
public readonly IReCheckOrderService _recheckOrderService;
- public CheckOrderController(ICheckOrderService service, IReCheckOrderService recheckOrderService) : base(service)
+ private readonly ILogger<CheckOrderController> _logger;
+ public CheckOrderController(ICheckOrderService service, IReCheckOrderService recheckOrderService, ILogger<CheckOrderController> logger) : base(service)
{
_recheckOrderService = recheckOrderService;
+ _logger = logger;
}
/// <summary>
@@ -32,6 +36,7 @@
[HttpPost, Route("ReceiveReCheckOrder"), AllowAnonymous, MethodParamsValidate]
public WebResponseContent ReceiveReCheckOrder([FromBody] ReCheckDto model)
{
+ _logger.LogInformation("CheckOrderController ReceiveReCheckOrder: " + JsonConvert.SerializeObject(model));
var recheckOrder = new Dt_ReCheckOrder
{
OrderNo = model.orderNo,
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_WMSServer/Controllers/ESSController.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_WMSServer/Controllers/ESSController.cs"
index b5f625c..fac8d08 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_WMSServer/Controllers/ESSController.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_WMSServer/Controllers/ESSController.cs"
@@ -92,9 +92,12 @@
direction = "100"
}
};
- if (result.Status)
+ if (result != null && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
{
-
+ return Ok(response);
+ }
+ if (result.Status)
+ {
return Ok(response);
}
else
--
Gitblit v1.9.3