diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
index 9a6ed56..1cece38 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
@@ -110,6 +110,11 @@ namespace DOAN.Model.BZFM.Dto
[ExcelColumn(Name = "入库类型")]
public string TransactionTypeLabel { get; set; }
+ ///
+ /// 工单号(一旦确定,不可更改)
+ ///
+ public string Workorder { get; set; }
+
// 1-蓝单正向 2-红单逆向
public int ReceiptType { get; set; } = 1;
}
diff --git a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
index c77d57e..56ef3d8 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
@@ -104,6 +104,11 @@ namespace DOAN.Model.BZFM.Dto
[ExcelColumn(Name = "出库类型")]
public string TransactionTypeLabel { get; set; }
+ ///
+ /// 工单号(一旦确定,不可更改)
+ ///
+ public string Workorder { get; set; }
+
// 1-蓝单正向 2-红单逆向
public int ReceiptType { get; set; } = 1;
}
diff --git a/DOAN.Model/MES/Material/MmRecordInbound.cs b/DOAN.Model/MES/Material/MmRecordInbound.cs
index 59b041f..fcdb9f3 100644
--- a/DOAN.Model/MES/Material/MmRecordInbound.cs
+++ b/DOAN.Model/MES/Material/MmRecordInbound.cs
@@ -123,5 +123,9 @@ namespace DOAN.Model.BZFM
[SugarColumn(ColumnName = "inbound_no")]
public string InboundNo { get; set; }
+ ///
+ /// 工单号(一旦确定,不可更改)
+ ///
+ public string Workorder { get; set; }
}
}
\ No newline at end of file
diff --git a/DOAN.Model/MES/Material/MmRecordOutbound.cs b/DOAN.Model/MES/Material/MmRecordOutbound.cs
index 9a4610e..5462f9d 100644
--- a/DOAN.Model/MES/Material/MmRecordOutbound.cs
+++ b/DOAN.Model/MES/Material/MmRecordOutbound.cs
@@ -99,5 +99,10 @@ namespace DOAN.Model.BZFM
[SugarColumn(ColumnName = "created_time")]
public DateTime? CreatedTime { get; set; }
+ ///
+ /// 工单号(一旦确定,不可更改)
+ ///
+ public string Workorder { get; set; }
+
}
}
\ No newline at end of file
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index d07b2cb..2b085a5 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -175,6 +175,7 @@ namespace DOAN.Service.BZFM
}
}
+ // 入库单
public string CreateInboundReceipt(InboundReceiptDto parm)
{
try
@@ -269,6 +270,7 @@ namespace DOAN.Service.BZFM
Quantity = delta,
Unit = parm.Unit,
ProductionDate = parm.ProductionDate,
+ Workorder = parm.Workorder,
ExpiryDate = parm.ExpiryDate,
CreatedTime = nowDate,
TransactionType = parm.TransactionType,
@@ -365,11 +367,13 @@ namespace DOAN.Service.BZFM
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,
WarehouseName = mmLocation.WarehouseName,
+
//TODO 待调整(可能涉及记录汇总)
Quantity = -delta,
Unit = parm.Unit,
CreatedTime = nowDate,
TransactionType = parm.TransactionType,
+ Workorder = parm.Workorder,
Remarks = parm.Remarks,
};
Context.Insertable(newRecord).ExecuteCommand();