diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index 7c8199e..565b679 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -210,14 +210,13 @@ namespace DOAN.Service.BZFM // 启用事务 Context.Ado.BeginTran(); - // 获取现有库存(同物料、批次、库位、供应商) + // 获取现有库存(同物料、批次、库位) var mmInventory = Context .Queryable() .Where(it => it.MaterialCode == parm.MaterialCode) .Where(it => it.BatchNo == parm.BatchNo) .Where(it => it.WarehouseCode == parm.WarehouseCode) .Where(it => it.LocationCode == parm.LocationCode) - .Where(it => it.SupplierCode == parm.SupplierCode) .First(); // 若不存在则新增;存在则更新 diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs index 3aa27b4..83f32fb 100644 --- a/DOAN.Service/Mobile/ReportFlowService.cs +++ b/DOAN.Service/Mobile/ReportFlowService.cs @@ -262,6 +262,15 @@ public class ReportFlowService : BaseService, IReportFlowServic .Where(it => it.TransactionType == "生产入库") .Where(it => it.Remarks != "已撤销") .First(); + MmMaterial mmMaterial = Context + .Queryable() + .Where(it => it.MaterialCode == proWorkorder.productionCode) + .First(); + if (mmMaterial == null) + { + Context.Ado.RollbackTran(); + throw new Exception($"物料档案不存在,无法成品入库:{proWorkorder.productionCode}"); + } if (inboundRecord == null) { //做生产入库单 @@ -272,7 +281,7 @@ public class ReportFlowService : BaseService, IReportFlowServic BatchNo = proWorkorder.FeedOrder, LocationCode = "CP001", WarehouseCode = "WH001", - SupplierCode = "", + SupplierCode = mmMaterial.SupplierCode, StoveCode = proWorkorder.StoveCode, Workorder = workorder, Operator = Worker,