From b6a40a2d8fdcffb3accfc7e424c0726a87a59ddf Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 05 十二月 2025 21:20:59 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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/InvokeMESService.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/InvokeMESService.cs"
index 96dcaf8..81b25b0 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/InvokeMESService.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/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>()
@@ -622,7 +622,7 @@
// 鏇存柊璁㈠崟鐘舵��
int newStatus = allCompleted ? (int)OutOrderStatusEnum.鍑哄簱瀹屾垚 : (int)OutOrderStatusEnum.鍑哄簱涓�;
- if (outboundOrder.OrderStatus != newStatus)
+ if (allCompleted && outboundOrder.OrderStatus != newStatus)
{
int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
--
Gitblit v1.9.3