From 9753fb2756f6b4e30ff79d901a7bb86145517c8b Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 18 十二月 2025 11:29:13 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 ab718be..a24c5a0 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"
@@ -43,7 +43,7 @@
Dt_OutboundOrderDetail outboundOrderDetail,
Dt_StockInfo outStock,
decimal assignQuantity,
- string barcode = null)
+ string barcode = null,string outboundBatchNo = "")
{
// 鑾峰彇搴撳瓨鏄庣粏淇℃伅
var stockDetails = outStock.Details
@@ -74,7 +74,7 @@
// 浣跨敤绗竴涓彲鐢ㄦ潯鐮�
firstAvailableDetail = stockDetails
.Where(x => x.StockQuantity > x.OutboundQuantity)
- .OrderBy(x => x.CreateDate)
+ .OrderByDescending(x => x.CreateDate)
.FirstOrDefault();
if (firstAvailableDetail == null)
@@ -108,8 +108,11 @@
MaterielCode = outboundOrderDetail.MaterielCode,
BatchNo = firstAvailableDetail.BatchNo,
Unit = firstAvailableDetail.Unit,
+ BarcodeQty = firstAvailableDetail.BarcodeQty,
+ BarcodeUnit = firstAvailableDetail.BarcodeUnit,
FactoryArea = firstAvailableDetail.FactoryArea,
- lineNo = firstAvailableDetail.InboundOrderRowNo,
+ lineNo = outboundOrderDetail.lineNo,
+ OutboundBatchNo= outboundBatchNo
};
}
@@ -150,7 +153,7 @@
public async Task<List<Dt_OutStockLockInfo>> GetByOrderDetailId(int orderDetailId)
{
return await Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderDetailId == orderDetailId)
+ .Where(x => x.OrderDetailIds.Contains(orderDetailId.ToString()))
.OrderBy(x => x.Id)
.ToListAsync();
}
@@ -252,7 +255,7 @@
public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
{
- return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
+ return BaseDal.QueryData(x => x.OrderDetailIds.Contains(orderDetailId.ToString()));
}
}
--
Gitblit v1.9.3