From 986a501770965682cd7e03e6f5c181de47dfb2e0 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 29 一月 2026 19:27:10 +0800
Subject: [PATCH] 回调问题修复
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs | 5 +++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs | 3 +--
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/index.html | 6 +++---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationSetup.cs | 15 ++++++++++++++-
4 files changed, 23 insertions(+), 6 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_BasicService/MESOperation/FeedbackMesService.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/MESOperation/FeedbackMesService.cs"
index 038f964..8bef19b 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/MESOperation/FeedbackMesService.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/MESOperation/FeedbackMesService.cs"
@@ -61,6 +61,11 @@
{
return webResponse = WebResponseContent.Instance.OK($"璇ュ崟鎹睘浜庝笉鍒嗘壒鑷姩鍥炰紶锛屼笉鍙墜鍔ㄥ垎鎵瑰洖浼�");
}
+ Dt_OutStockLockInfo outStockLockInfo = _allocateRepository.Db.Queryable<Dt_OutStockLockInfo>().Where(x => x.OrderNo == outboundOrder.OrderNo).First();
+ if (outStockLockInfo != null)
+ {
+ return WebResponseContent.Instance.Error("璇ュ崟鎹繕瑕佹湭鎷ｉ�夌殑鐗╂枡锛岃鍏堟嫞閫夊畬鎴愬啀鐐瑰嚮鍥炰紶");
+ }
List<Dt_MesReturnRecord> returnRecords = BaseDal.QueryData(x => x.OrderNo == orderNo && x.OrderId == outboundOrder.Id && x.ReturnStatus == 2);
foreach (var item in returnRecords)
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_Core/Authorization/AuthorizationSetup.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_Core/Authorization/AuthorizationSetup.cs"
index 31cff24..7a61517 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_Core/Authorization/AuthorizationSetup.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_Core/Authorization/AuthorizationSetup.cs"
@@ -10,6 +10,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Const;
+using WIDESEA_Core.Extensions;
using WIDESEA_Core.Helper;
namespace WIDESEA_Core.Authorization
@@ -57,7 +58,19 @@
context.Response.StatusCode = 401;
context.Response.WriteAsync(new { message = "鎺堟潈鏈�氳繃", status = false, code = 401 }.Serialize());
return Task.CompletedTask;
- }
+ },
+ OnMessageReceived = context =>
+ {
+ if (context.HttpContext.IsSuccessSwagger() == true)
+ {
+ string token = context.HttpContext.GetSuccessSwaggerJwt();
+ if (token.IsNotEmptyOrNull())
+ {
+ context.Token = token;
+ }
+ }
+ return Task.CompletedTask;
+ },
};
});
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/OutboundService.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/OutboundService.cs"
index ca4f612..c0034f8 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/OutboundService.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/OutboundService.cs"
@@ -2037,13 +2037,12 @@
else if (stock.Details.Count > 0)
{
Dt_OutStockLockInfo lockInfo = _outboundLockInfoRepository.QueryFirst(x =>
- x.OrderNo == OrderNo &&
x.StockId == stock.Id &&
x.PalletCode == palletCode);
if (lockInfo != null && lockInfo.SortedQuantity != lockInfo.AssignQuantity)
{
- return content.Error($"鎵樼洏{palletCode}搴撳瓨鏈嫞閫夊畬涓嶅厑璁稿洖搴�");
+ return content.Error($"鎵樼洏{palletCode}搴撳瓨锛屽湪鍗曟嵁{lockInfo.OrderNo}閲岄潰杩樻湭鎷ｉ�夊畬鎴愶紝涓嶅厑璁稿洖搴�");
}
stock.StockStatus = (int)StockStatusEmun.鍏ュ簱纭;
stock.LocationCode = "";
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/index.html" "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/index.html"
index 97ba152..b7f58ff 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/index.html"
+++ "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/index.html"
@@ -111,7 +111,7 @@
</svg>
<div id="swagger-ui"></div>
<div id="footer" style="text-align: center;margin-bottom: 10px;">
-
+
<br><span id="poweredby"></span>
</div>
@@ -168,7 +168,7 @@
setTimeout(() => {
//浜岀淮鐮�
- $('.info').append("<div class='qqgroup'><div style=\"color: #4990e2;\"><a href=\"../allservices\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">路 鏌ョ湅鎵�鏈変緷璧栨敞鍐岀殑鏈嶅姟</a><br></div></div><div style='clear: both;'></div>");
+ $('.info').append("<div class='qqgroup'><div style=\"color: #4990e2;\"><a href=\"../allservices\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">路 鏌ョ湅鎵�鏈変緷璧栨敞鍐岀殑鏈嶅姟</a><br></div><div style=\"color: #4990e2;\"><a href=\"http.html\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">路 HTTP Test</a><br></div></div><div style='clear: both;'></div>");
//淇敼 token鎺堟潈鎸夐挳涓轰腑鏂�
//$(".auth-wrapper span").empty();
@@ -178,7 +178,7 @@
// $(this).html(myvalue);
// });
//});
-
+
}, 1000)
// 鏂囨。logo
$(".link img").attr("src", "./logo/favicon-32x32.png");
--
Gitblit v1.9.3