From f54b7815d8451f362554e3d2d09b4991ce13d4ff Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 12 十一月 2025 09:01:16 +0800
Subject: [PATCH] 前端优化，PDA更新，分配库存优化
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 5b2858a..4a07cb9 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"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -65,7 +66,7 @@
return outStockLockInfo;
}
/// <summary>
- /// 鐢熸垚鍑哄簱璇︽儏
+ /// 鐢熸垚MES鍑哄簱璇︽儏
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
@@ -77,9 +78,10 @@
BatchNo = ouMESOrder.MaterialLot,
LocationCode = outStock.LocationCode,
MaterielName = outStock.MaterielName,
- OrderDetailId = ouMESOrder.Id,
+ OrderDetailId = ouMESOrder.OutDetailId,
OrderNo = ouMESOrder.OutMESOrderNo,
MakeCode = ouMESOrder.MakeCode,
+ MachineName=ouMESOrder.MakeArea.ToString(),
MaterielId = outStock.MaterielId,
OriginalQuantity = outStock.StockLength,
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
@@ -92,7 +94,7 @@
return outStockLockInfo;
}
/// <summary>
- /// 鐢熸垚鍑哄簱璇︽儏
+ /// 鐢熸垚鐢熺鍑哄簱璇︽儏
/// </summary>
public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutSGOrder outSGOrder, Dt_OutSGOrderDetail outSGOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
{
@@ -100,12 +102,13 @@
{
PalletCode = outStock.PalletCode,
AssignQuantity = assignQuantity,
+ OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
MaterielCode = outSGOrderDetail.MaterialNo,
- BatchNo = "",
+ BatchNo = outSGOrderDetail.BoardFluteNo, //妤炲埆鎵规
LocationCode = outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = outSGOrderDetail.Id,
- OrderNo = outSGOrder.OutSGOrderNo,
+ OrderNo = outSGOrder.OrderId,
MaterielId = outStock.MaterielId,
OriginalQuantity = outStock.StockLength,
Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
@@ -113,7 +116,7 @@
TaskNum = taskNum,
OrderQuantity = outSGOrderDetail.XqLen,
Unit = outStock.Unit,
- MachineName=outSGOrderDetail.MachineName
+ MachineName=outSGOrderDetail.MachineName,
};
return outStockLockInfo;
--
Gitblit v1.9.3