diff --git a/Gatedge.NewOrientLandMark.BOS/PlugIn/PUR_PurchaseOrder/ConvertPlugIn/ToStkInStock.cs b/Gatedge.NewOrientLandMark.BOS/PlugIn/PUR_PurchaseOrder/ConvertPlugIn/ToStkInStock.cs index 27a026c..efc1b64 100644 --- a/Gatedge.NewOrientLandMark.BOS/PlugIn/PUR_PurchaseOrder/ConvertPlugIn/ToStkInStock.cs +++ b/Gatedge.NewOrientLandMark.BOS/PlugIn/PUR_PurchaseOrder/ConvertPlugIn/ToStkInStock.cs @@ -105,6 +105,14 @@ namespace Gatedge.NewOrientLandMark.BOS.PlugIn.PUR_PurchaseOrder.ConvertPlugIn var SecRealQty = unitService.GetQtyByUtilConverRate(materialId, unitId, remainInStockUnitId, qty); item["RemainInStockQty"] = SecRealQty; } + + var lotId = CustomParams["FLot_Id"].ToString(); + var lotText = CustomParams["FLot_Text"].ToString(); + // 如果批号不为空,则赋值 + if (!lotText.IsNullOrEmpty()) + { + + } //if (snUnitId != 0) //{ // var snQty = unitService.GetQtyByUtilConverRate(materialId, unitId, snUnitId, qty); diff --git a/Gatedge.ScanCode/Models/K3Request/BaseData/Lot.cs b/Gatedge.ScanCode/Models/K3Request/BaseData/Lot.cs new file mode 100644 index 0000000..264f9c3 --- /dev/null +++ b/Gatedge.ScanCode/Models/K3Request/BaseData/Lot.cs @@ -0,0 +1,8 @@ +namespace Gatedge.ScanCode.Models.K3Request.BaseData +{ + public class Lot + { + public int? FLotId { get; set; } + public string? FNumber { get; set; } + } +} diff --git a/Gatedge.ScanCode/Models/K3Request/SaveModel/BarRecordSave.cs b/Gatedge.ScanCode/Models/K3Request/SaveModel/BarRecordSave.cs index 66055bd..329ae6e 100644 --- a/Gatedge.ScanCode/Models/K3Request/SaveModel/BarRecordSave.cs +++ b/Gatedge.ScanCode/Models/K3Request/SaveModel/BarRecordSave.cs @@ -110,6 +110,10 @@ namespace Gatedge.ScanCode.Models.K3Request.SaveModel /// 源单分录Id /// public string FSrcEntryId { get; set; } + /// + /// 批号 + /// + public Lot? FLot { get; set; } } /// diff --git a/Gatedge.ScanCode/Services/BarRecordService.cs b/Gatedge.ScanCode/Services/BarRecordService.cs index 4684256..5ed9e0b 100644 --- a/Gatedge.ScanCode/Services/BarRecordService.cs +++ b/Gatedge.ScanCode/Services/BarRecordService.cs @@ -156,7 +156,12 @@ namespace Gatedge.ScanCode.Services FBarQty = n.FBarQty, FSrcBillId = n.FSrcBillId, FSrcEntryId = n.FSrcEntryId, - FBarAuxPropId = n.FBarAuxpropId == 0 ? null : n.FBarAuxpropId + FBarAuxPropId = n.FBarAuxpropId == 0 ? null : n.FBarAuxpropId, + FLot = new Lot() + { + FLotId = n.FLot_Id == 0 ? null : n.FLot_Id, + FNumber = n.FLot_Text, + } }), };