diff --git a/DOAN.Model/MES/Product/ProWorkorder.cs b/DOAN.Model/MES/Product/ProWorkorder.cs
index c9e177d..7d46a6e 100644
--- a/DOAN.Model/MES/Product/ProWorkorder.cs
+++ b/DOAN.Model/MES/Product/ProWorkorder.cs
@@ -41,6 +41,13 @@ namespace DOAN.Model.MES.product
[SugarColumn(ColumnName = "plan_num")]
public int? PlanNum { get; set; }
+
+ ///
+ /// 出货数量
+ ///
+ [SugarColumn(ColumnName = "shipment_num")]
+ public int? ShipmentNum { get; set; }
+
///
/// 序号
///
diff --git a/DOAN.Service/MES/Order/DeliveryScheduleService.cs b/DOAN.Service/MES/Order/DeliveryScheduleService.cs
index c15bd39..df59a09 100644
--- a/DOAN.Service/MES/Order/DeliveryScheduleService.cs
+++ b/DOAN.Service/MES/Order/DeliveryScheduleService.cs
@@ -46,7 +46,8 @@ namespace DOAN.Service.MES.Order
MaterialCode = o.MaterialCode,
DemandQuantity = o.DemandQuantity,
DeliveryDate = o.DeliveryDate,
- DeliveryQuantity = o.DeliveryQuantity,
+ DeliveryQuantity = SqlFunc.Subqueryable()
+ .Where(w => w.FeedOrder == o.OrderNoMes).Sum(it=>it.ShipmentNum),
StartDate = o.StartDate,
EndDate = o.EndDate,
Orderindicator = o.Orderindicator,
diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index 936d870..b322736 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -73,6 +73,14 @@ public class ProReportworkService : BaseService, IProReportwork
///
public ProReportwork01 AddProReportwork(ProReportwork01 model)
{
+ //出货工序
+ if(model.ProcessId== 90&& !string.IsNullOrEmpty(model.Workorder))
+ {
+ Context.Updateable()
+ .SetColumns(it => it.ShipmentNum == model.FinishNum)
+ .Where(it => it.Workorder == model.Workorder).ExecuteCommand();
+ }
+
return Insertable(model).ExecuteReturnEntity();
}
@@ -83,6 +91,13 @@ public class ProReportworkService : BaseService, IProReportwork
///
public int UpdateProReportwork(ProReportwork01 model)
{
+ //出货工序
+ if (model.ProcessId == 90 && !string.IsNullOrEmpty(model.Workorder))
+ {
+ Context.Updateable()
+ .SetColumns(it => it.ShipmentNum == model.FinishNum)
+ .Where(it => it.Workorder == model.Workorder).ExecuteCommand();
+ }
return Update(model, true);
}