From e354b5938f49ac90b237289923dcde923d22daf5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 20 十一月 2025 09:08:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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_OutboundService/OutStockLockInfoService.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/OutStockLockInfoService.cs"
index e93585a..0e84c80 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/OutStockLockInfoService.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/OutStockLockInfoService.cs"
@@ -34,9 +34,9 @@
_recordService = recordService;
}
-
+
/// <summary>
- /// 鍒涘缓鍑哄簱閿佸畾淇℃伅 - 淇鐗堟湰
+ /// 鍒涘缓鍑哄簱閿佸畾
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(
Dt_OutboundOrder outboundOrder,
@@ -72,7 +72,7 @@
// 浣跨敤绗竴涓彲鐢ㄦ潯鐮�
var firstAvailableDetail = stockDetails
.Where(x => x.StockQuantity > x.OutboundQuantity)
- .OrderBy(x => x.ProductionDate)
+ .OrderBy(x => x.CreateDate)
.FirstOrDefault();
if (firstAvailableDetail == null)
@@ -84,6 +84,8 @@
return new Dt_OutStockLockInfo()
{
+ lineNo= outboundOrderDetail.lineNo,
+
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
MaterielCode = outboundOrderDetail.MaterielCode,
@@ -99,8 +101,9 @@
Status = (int)OutLockStockStatusEnum.宸插垎閰�,
StockId = outStock.Id,
Unit = outboundOrderDetail.Unit,
-
- SupplyCode = outboundOrderDetail.SupplyCode,
+ FactoryArea = outboundOrder.FactoryArea,
+ OrderType=outboundOrder.OrderType,
+ SupplyCode = outboundOrderDetail.SupplyCode,
WarehouseCode = outboundOrderDetail.WarehouseCode,
// 鏂板瀛楁
CurrentBarcode = targetBarcode,
@@ -141,7 +144,7 @@
Status = lockInfo.Status,
IsSplitted = lockInfo.IsSplitted,
ParentLockId = lockInfo.ParentLockId,
-
+
MaterielName = detail.MaterielName,
Unit = detail.Unit
})
@@ -214,7 +217,10 @@
}
}
-
+ public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
+ {
+ return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
+ }
}
}
--
Gitblit v1.9.3