提交

pan

10 天以前 8ed3d74f6c937f6b6661674132eb9fe0b154a563

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs

@@ -246,8 +246,8 @@
        {
            try
            {             // 1. ã€å†…存锁抢占】
                if (MemoryLockManager.TryAcquireLock(orderNos[0]))
                {
                //if (MemoryLockManager.TryAcquireLock(orderNos[0]))
                //{
                   
                        if (inout == 1)
                        {
@@ -386,13 +386,13 @@

                        }
                     
                }
                else
                {
                    // æŠ¢é”å¤±è´¥ï¼šè¯´æ˜Žæœ‰å¦ä¸€ä¸ªçº¿ç¨‹ï¼ˆWCS回调或人工操作）正在处理
                //}
                //else
                //{
                //    // æŠ¢é”å¤±è´¥ï¼šè¯´æ˜Žæœ‰å¦ä¸€ä¸ªçº¿ç¨‹ï¼ˆWCS回调或人工操作）正在处理

                    return WebResponseContent.Instance.Error("WMS正在处理此回传任务，请勿重复操作。");
                }
                //    return WebResponseContent.Instance.Error("WMS正在处理此回传任务，请勿重复操作。");
                //}
            }
            catch(Exception ex)
            {
@@ -401,7 +401,7 @@
            finally
            {
                // 2. ã€é‡Šæ”¾å†…存锁】无论成功失败，必须释放
                MemoryLockManager.ReleaseLock(orderNos[0]);
               // MemoryLockManager.ReleaseLock(orderNos[0]);
            }
            return WebResponseContent.Instance.OK();
        }
@@ -414,10 +414,10 @@
            try
            {
                // æ ¡éªŒï¼šå·²å›žä¼ ç›´æŽ¥è¿”回错误
                if (outboundOrder.ReturnToMESStatus == 1)
                {
                    return WebResponseContent.Instance.Error("该单已经回传！");
                }
                //if (outboundOrder.ReturnToMESStatus == 1)
                //{
                //    return WebResponseContent.Instance.Error("该单已经回传！");
                //}

                // æŸ¥è¯¢è®¢å•æ˜Žç»†ï¼ˆä»…查询未回传成功的）
                var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()