diff --git a/src/Khd.Core.Domain/Models/MesSaleOrderRelate.cs b/src/Khd.Core.Domain/Models/MesSaleOrderRelate.cs index 9f6dc73..729f4a6 100644 --- a/src/Khd.Core.Domain/Models/MesSaleOrderRelate.cs +++ b/src/Khd.Core.Domain/Models/MesSaleOrderRelate.cs @@ -32,6 +32,10 @@ namespace Khd.Core.Domain.Models [Column("relate_sale_order_amout")] public decimal RelateSaleOrderAmount { get; set; } + + [Column("material_id")] + public long MaterialId { get; set; } + } } diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index 1544c6a..fe1b7be 100644 --- a/src/Khd.Core.Wcs/MainCentralControl.cs +++ b/src/Khd.Core.Wcs/MainCentralControl.cs @@ -67,56 +67,56 @@ namespace Khd.Core.Wcs } //创建定时器 - SystemTimer systemTimer = new SystemTimer(_host); - systemTimer.Start(); + //SystemTimer systemTimer = new SystemTimer(_host); + //systemTimer.Start(); - //创建任务 - CreateTaskByRecord createTaskByRecord = new(_host); - createTaskByRecord.StartPoint(); + ////创建任务 + //CreateTaskByRecord createTaskByRecord = new(_host); + //createTaskByRecord.StartPoint(); //一楼提升机以及接驳位 - FirstFloor firstFloor = new(_host); - firstFloor.StartPoint(); + //FirstFloor firstFloor = new(_host); + //firstFloor.StartPoint(); //二层接驳位 SecondFloorPoint secondFloorPoint = new(_host, 2); secondFloorPoint.StartPoint(); - ////二层AGV - SecondFloorAGV secondFloorAGV = new(_host, 2); - secondFloorAGV.StartPoint(); + //////二层AGV + //SecondFloorAGV secondFloorAGV = new(_host, 2); + //secondFloorAGV.StartPoint(); - //二楼线体 - SecondFloorLine secondFloorLine = new(_host, 2); - secondFloorLine.StartPoint(); + ////二楼线体 + //SecondFloorLine secondFloorLine = new(_host, 2); + //secondFloorLine.StartPoint(); - //三层接驳位 - ThirdFloorPoint thirdFloorPoint = new(_host, 3); - thirdFloorPoint.StartPoint(); + ////三层接驳位 + //ThirdFloorPoint thirdFloorPoint = new(_host, 3); + //thirdFloorPoint.StartPoint(); // 三层AGV - ThirdFloorAGV thirdFloorAGV = new(_host, 3); - thirdFloorAGV.StartPoint(); + //ThirdFloorAGV thirdFloorAGV = new(_host, 3); + //thirdFloorAGV.StartPoint(); - //四楼接驳位 - FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); - fourthFloorPoint.StartPoint(); + ////四楼接驳位 + //FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); + //fourthFloorPoint.StartPoint(); - //五层接驳位 - FiveFloorPoint fifthFloorPoint = new(_host, 5); - fifthFloorPoint.StartPoint(); + ////五层接驳位 + //FiveFloorPoint fifthFloorPoint = new(_host, 5); + //fifthFloorPoint.StartPoint(); - //五层CTU - FiveFloorCTU fiveFloorCTU = new(_host, 5); - fiveFloorCTU.StartPoint(); + ////五层CTU + //FiveFloorCTU fiveFloorCTU = new(_host, 5); + //fiveFloorCTU.StartPoint(); - //五层AGV - FiveFloorAGV fifthFloorAGV = new(_host, 5); - fifthFloorAGV.StartPoint(); + ////五层AGV + //FiveFloorAGV fifthFloorAGV = new(_host, 5); + //fifthFloorAGV.StartPoint(); - ////背负式Agv - FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5); - fiveFloorBearAgv.StartPoint(); + //////背负式Agv + //FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5); + //fiveFloorBearAgv.StartPoint(); } catch (Exception ex) { diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs index f316da0..189df8a 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs @@ -830,7 +830,7 @@ namespace Khd.Core.Wcs.Wcs instockAmount = mesSaleOrderRelate.RelateSaleOrderAmount, instockType = "1", - materialId = mesBaseBarcodeInfo.materialId, + materialId = mesSaleOrderRelate.MaterialId, operationType = "3", palletInfoCode = mesBaseBarcodeInfo.palletInfoCode, poNo = mesBaseBarcodeInfo.poNo,