diff --git a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
index 86ff2ee..d430106 100644
--- a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
+++ b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
@@ -33,6 +33,18 @@ namespace DOAN.Model.MES.mm.Dto
public string Specification { get; set; }
+ ///
+ /// 报工消耗量
+ ///
+
+ public decimal ReportConsume { get; set; }
+
+ ///
+ /// 仓库发货消耗量
+ ///
+
+ public decimal WarehouseDeliveryConsume { get; set; }
+
public decimal LogicQuantity { get; set; }
public decimal ActualQuantity { get; set; }
diff --git a/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
index c6ef563..dd6f9e1 100644
--- a/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
+++ b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
@@ -42,6 +42,19 @@ namespace DOAN.Model.MES.mm
///
public string Specification { get; set; }
+
+ ///
+ /// 报工消耗量
+ ///
+ [SugarColumn(ColumnName = "report_consume")]
+ public decimal ReportConsume { get; set; }
+
+ ///
+ /// 仓库发货消耗量
+ ///
+ [SugarColumn(ColumnName = "warehouse_delivery_consume")]
+ public decimal WarehouseDeliveryConsume { get; set; }
+
///
/// 理论呆滞数量
///
diff --git a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
index 5ca1468..9fbc746 100644
--- a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
+++ b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
@@ -70,6 +70,7 @@ namespace DOAN.Service.MES.mm
mmSlowMoveMaterial.MaterialCode = logicConsumeMaterial[i].MaterialCode;
mmSlowMoveMaterial.MaterialName = logicConsumeMaterial[i].MaterialName;
mmSlowMoveMaterial.Specification = logicConsumeMaterial[i].Specification;
+ mmSlowMoveMaterial.ReportConsume=logicConsumeMaterial[i].Quantity;
mmSlowMoveMaterial.LogicQuantity=logicConsumeMaterial[i].Quantity;
mmSlowMoveMaterial.Unit = logicConsumeMaterial[i].unit;
mmSlowMoveMaterial.CreatedBy = CreatedBy;
@@ -81,6 +82,7 @@ namespace DOAN.Service.MES.mm
{
if (WarehouseSendMaterial[j].MaterialCode == logicConsumeMaterial[i].MaterialCode)
{
+ mmSlowMoveMaterial.WarehouseDeliveryConsume = WarehouseSendMaterial[j].Quantity;
mmSlowMoveMaterial.LogicQuantity= WarehouseSendMaterial[j].Quantity - logicConsumeMaterial[j].Quantity;
}
}