ÏîÄ¿´úÂë/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");