baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-wms_raw_instock表添加插入字段

Browse Source
master
liuwf 1 year ago
parent 94613bb7c9
commit 637922f568
5 changed files with 99 additions and 53 deletions
Show Stats Download Patch File Download Diff File

32
src/Khd.Core.Domain/Models/WmsRawInstock.cs
Unescape Escape View File

@ -64,6 +64,12 @@ namespace Khd.Core.Domain.Models
[Column("material_id")]
public long? materialId { get; set; }
/// <summary>
/// 物料条码信息
/// </summary>
[Column("material_barcode")]
public string materialBarCode { get; set; }
/// <summary>
/// 物料批次信息
/// </summary>
@ -106,17 +112,17 @@ namespace Khd.Core.Domain.Models
[Column("execute_status")]
public string executeStatus { get; set; }
///// <summary>
///// 申请人
///// </summary>
//[Column("apply_by")]
//public string applyBy { get; set; }
/// <summary>
/// 申请人
/// </summary>
[Column("apply_by")]
public string applyBy { get; set; }
///// <summary>
///// 申请时间
///// </summary>
//[Column("apply_date")]
//public DateTime? applyDate { get; set; }
/// <summary>
/// 申请时间
/// </summary>
[Column("apply_date")]
public DateTime? applyDate { get; set; }
///// <summary>
///// 审核人
@ -159,6 +165,12 @@ namespace Khd.Core.Domain.Models
/// </summary>
[Column("return_flag")]
public string? returnFlag { get; set; }
/// <summary>
/// 请求返回标识(1是)，execute_status改为2时此return_flag改为null
/// </summary>
[Column("purchase_order_id")]
public long? purchaseOrderId { get; set; }
}
}

70
src/Khd.Core.Wcs/MainCentralControl.cs
Unescape Escape View File

@ -51,7 +51,7 @@ namespace Khd.Core.Wcs
plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
try
{
plc.Open();
// plc.Open();
Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP);
}
catch
@ -62,56 +62,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();
////二层接驳位
//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();
//// 三层AGV
//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
FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5);
fiveFloorBearAgv.StartPoint();
////背负式Agv
//FiveFloorBearAgv fiveFloorBearAgv = new(_host, 5);
//fiveFloorBearAgv.StartPoint();
}
catch (Exception ex)
{

19
src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
Unescape Escape View File

@ -690,13 +690,20 @@ namespace Khd.Core.Wcs.Wcs
};
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
taskCode = item.taskCode,
materialBarCode = mesBaseBarcodeInfo.barcodeInfo,
materialBatchCode = mesBaseBarcodeInfo.batchCode,
applyBy = "wcs",
applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = wmsBaseLocation.locationCode,
executeStatus = "2",
instockAmount = 1,
instockType = "2",
materialBatchCode = mesBaseBarcodeInfo.barcodeInfo,
materialId = mesBaseBarcodeInfo.materialId,
operationType = "3",
palletInfoCode = mesBaseBarcodeInfo.palletInfoCode,
@ -757,13 +764,21 @@ namespace Khd.Core.Wcs.Wcs
};
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
taskCode = item.taskCode,
materialBarCode = mesBaseBarcodeInfo.barcodeInfo,
materialBatchCode = mesBaseBarcodeInfo.batchCode,
applyBy = "wcs",
applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = DateTime.Now,
endTime = DateTime.Now,
locationCode = wmsBaseLocation.locationCode,
executeStatus = "2",
instockAmount = 1,
instockType = "1",
materialBatchCode = mesBaseBarcodeInfo.barcodeInfo,
materialId = mesBaseBarcodeInfo.materialId,
operationType = "3",
palletInfoCode = mesBaseBarcodeInfo.palletInfoCode,

9
src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
Unescape Escape View File

@ -654,13 +654,20 @@ namespace Khd.Core.Wcs.Wcs
};
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
taskCode = item.taskCode,
materialBarCode = mesBaseBarcodeInfo.barcodeInfo,
materialBatchCode = mesBaseBarcodeInfo.batchCode,
applyBy = "wcs",
applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = wmsBaseLocation.locationCode,
executeStatus = "2",
instockAmount = 1,
instockType = item.fromFloorNo == 1 ? "1" : "3",
materialBatchCode = mesBaseBarcodeInfo.barcodeInfo,
materialId = mesBaseBarcodeInfo.materialId,
operationType = "3",
palletInfoCode = mesBaseBarcodeInfo.palletInfoCode,

22
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -1890,15 +1890,21 @@ namespace Khd.Core.Wpf.Form
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text);
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
taskCode = Global.SnowId.NextId().ToString(),
materialBarCode = mesBaseBarcodeInfo.barcodeInfo,
materialBatchCode = mesBaseBarcodeInfo.batchCode,
applyBy = "WPF",
applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = container.locationCode,
executeStatus = "2",
instockAmount = amount,
instockType = "1",
materialBatchCode = txtInBarCode.Text,
instockType = "1",
materialId = material.materialId,
operationType = "2",
operationType = "1",
palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512
@ -1938,15 +1944,21 @@ namespace Khd.Core.Wpf.Form
var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text);
WmsRawInstock wmsRawInstock = new WmsRawInstock()
{
taskCode = Global.SnowId.NextId().ToString(),
materialBarCode = mesBaseBarcodeInfo.barcodeInfo,
materialBatchCode = mesBaseBarcodeInfo.batchCode,
applyBy = "WPF",
applyDate = System.DateTime.Now,
purchaseOrderId = mesBaseBarcodeInfo.PurchaseOrderId,
beginTime = System.DateTime.Now,
endTime = DateTime.Now,
locationCode = container.locationCode,
executeStatus = "2",
instockAmount = amount,
instockType = "1",
materialBatchCode = txtInBarCode.Text,
materialId = material.materialId,
operationType = "2",
operationType = "1",
palletInfoCode = container.containerCode,
poNo = mesBaseBarcodeInfo.poNo,
warehouseId = 512

Write Preview
Loading…
Cancel
Save