647556386
2026-01-29 986a501770965682cd7e03e6f5c181de47dfb2e0
回调问题修复
已修改4个文件
29 ■■■■ 文件已修改
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationSetup.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/index.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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)
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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;
                     },
                 };
             });
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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 = "";
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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");