From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 129 +++++++++----------------------------------
1 files changed, 27 insertions(+), 102 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index cde09cd..55b5326 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -32,139 +32,64 @@
_unitOfWorkManage = unitOfWorkManage;
}
- public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, List<Dt_StockInfo> outStocks, int? taskNum = null)
+
+ public List<Dt_OutStockLockInfo> GetByOrderDetailId(string orderNo, int orderDetailId, OutLockStockStatusEnum? outStockStatus)
{
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
-
- foreach (var item in outStocks)
- {
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
- {
- PalletCode = item.PalletCode,
- AssignQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
- MaterielCode = outboundOrderDetail.MaterielCode,
- BatchNo = outboundOrderDetail.BatchNo,
- LocationCode = item.LocationCode,
- MaterielName = outboundOrderDetail.MaterielName,
- OrderDetailId = outboundOrderDetail.Id,
- OrderNo = outboundOrder.OrderNo,
- OrderType = outboundOrder.OrderType,
- OriginalQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = item.Id,
- TaskNum = taskNum,
- ProductionDate = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
-
- };
- outStockLockInfos.Add(outStockLockInfo);
- }
-
- return outStockLockInfos;
+ return BaseDal.QueryData(x =>x.OrderNo== orderNo && x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
}
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ /// <summary>
+ /// 鐢熸垚鍑哄簱璇︽儏
+ /// </summary>
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutBSTOrder outBSTOrder, Dt_OutBSTOrderDetail outboundOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
-
Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
{
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
- MaterielCode = outboundOrderDetail.MaterielCode,
- BatchNo = outboundOrderDetail.BatchNo ?? outStock.Details.FirstOrDefault()?.BatchNo,
+ MaterielCode = outboundOrderDetail.MaterialNo,
+ BatchNo = "",
LocationCode = outStock.LocationCode,
- MaterielName = outboundOrderDetail.MaterielName,
+ MaterielName = outStock.MaterielName,
OrderDetailId = outboundOrderDetail.Id,
- OrderNo = outboundOrder.OrderNo,
- OrderType = outboundOrder.OrderType,
- OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
+ OrderNo = outBSTOrder.OutBSTOrderNo,
+ MaterielId = outStock.MaterielId,
+ OriginalQuantity = outStock.StockLength,
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
StockId = outStock.Id,
TaskNum = taskNum,
- OrderQuantity = outboundOrderDetail.OrderQuantity,
- Unit = outboundOrderDetail.Unit,
- ProductionDate = outStock.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = outStock.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
+ OrderQuantity = outboundOrderDetail.XqLen,
+ Unit = outStock.Unit
};
return outStockLockInfo;
}
/// <summary>
- /// PP澶у嵎鍑哄簱
+ /// 鐢熸垚鍑哄簱璇︽儏
/// </summary>
- /// <param name="mesOutboundOrder"></param>
- /// <param name="outStock"></param>
- /// <param name="assignQuantity"></param>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesOutboundOrder mesOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
+ public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutSGOrder outSGOrder, Dt_OutSGOrderDetail outSGOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
-
Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
{
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
- MaterielCode = mesOutboundOrder.MaterialCode,
- BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
+ MaterielCode = outSGOrderDetail.MaterialNo,
+ BatchNo = "",
LocationCode = outStock.LocationCode,
- MaterielName = mesOutboundOrder.MaterialName,
- OrderDetailId = mesOutboundOrder.Id,
- OrderNo = mesOutboundOrder.OrderNo,
- OrderType = mesOutboundOrder.OrderType,
- OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesOutboundOrder.MaterialCode).Sum(x => x.StockQuantity),
+ MaterielName = outStock.MaterielName,
+ OrderDetailId = outSGOrderDetail.Id,
+ OrderNo = outSGOrder.OutSGOrderNo,
+ MaterielId = outStock.MaterielId,
+ OriginalQuantity = outStock.StockLength,
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
StockId = outStock.Id,
TaskNum = taskNum,
- OrderQuantity = mesOutboundOrder.OrderQuantity,
- Unit = mesOutboundOrder.Unit,
- ProductionDate = outStock.Details.Where(x => x.MaterielCode == mesOutboundOrder.MaterialCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = outStock.Details.Where(x => x.MaterielCode == mesOutboundOrder.MaterialCode).FirstOrDefault()?.EffectiveDate
-
+ OrderQuantity = outSGOrderDetail.XqLen,
+ Unit = outStock.Unit,
+ MachineName=outSGOrderDetail.MachineName
};
return outStockLockInfo;
- }
- public List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo)
- {
- return BaseDal.QueryData(x => x.OrderNo == OrderNo);
- }
-
- public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
- {
- return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
- }
- public List<Dt_OutStockLockInfo> GetByMesOrderDetail(string taskNo)
- {
- return BaseDal.QueryData(x => x.OrderNo == taskNo);
- }
-
- public List<Dt_OutStockLockInfo> GetStockOutboundOrder(SaveModel saveModel)
- {
- try
- {
- var palletCode = saveModel.MainData["barcode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode && x.WarehouseId == warehouseId).Includes(x => x.Details).First();
- if (stockInfo.StockStatus != StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
- {
- throw new Exception($"璇ユ墭鐩樿繕鏈嚭搴撳畬鎴�");
- }
- if (stockInfo == null)
- {
- throw new Exception($"鏈壘鍒板簱瀛樹俊鎭�");
- }
- Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
- if (stockInfoDetail == null)
- {
- throw new Exception($"鏈壘鍒板簱瀛樿鎯�");
- }
- List<Dt_OutStockLockInfo> stockLockInfos = BaseDal.QueryData(x => x.StockId == stockInfo.Id && x.Status == OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt());
- return stockLockInfos;
- }
- catch (Exception ex)
- {
- return null;
- }
}
}
}
--
Gitblit v1.9.3