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

优化

Browse Source
master
LAPTOP-NLSJV9RB\91647 2 years ago
parent 9bd766bb02
commit bbf2326634
10 changed files with 562 additions and 155 deletions
Show Stats Download Patch File Download Diff File

55
src/Khd.Core.Domain/Dto/webapi/continueTask.cs
Unescape Escape View File

@ -0,0 +1,55 @@
using Khd.Core.Domain.Models;
using System.Collections.Generic;
namespace Khd.Core.Domain.Dto.webapi
{
//RCS调用WCS接口参数
public class continueTaskDto
{
/// <summary>
/// 请求编号，每个请求都要一个唯一编号， 同一个请求重复提交， 使用同一编号。;
/// </summary>
public string reqCode { get; set; }
/// <summary>
/// 请求时间截 格式: “yyyy-MM-dd HH:mm:ss”。
/// </summary>
public string reqTime { get; set; }
/// <summary>
/// 客户端编号，如PDA，HCWMS等。
/// </summary>
public string clientCode { get; set; }
/// <summary>
/// 令牌号, 由调度系统颁发
/// </summary>
public string tokenCode { get; set; }
/// <summary>
/// 工作位，与RCS-2000端配置的位置名称一致。
/// </summary>
public string wbCode { get; set; }
/// <summary>
/// 货架号，采用货架号触发的方式。
/// </summary>
public string podCode { get; set; }
public string agvCode { get; set; }
public string taskCode { get; set; }
public string taskSeq { get; set; }
public string nextPositionCode { get; set; }
}
public class ReponseagvcontinueTaskDto
{
/// <summary>
/// 返回码
/// </summary>
public string code { get; set; }
/// <summary>
/// 返回消息
/// </summary>
public string message { get; set; }
/// <summary>
/// 请求编号
/// </summary>
public string reqCode { get; set; }
}
}

24
src/Khd.Core.Domain/Models/WmsProductInstock.cs
Unescape Escape View File

@ -70,6 +70,30 @@ namespace Khd.Core.Domain.Models
[Column("instock_type")]
public string instockType { get; set; }
/// <summary>
/// 成品ID
/// </summary>
[Column("product_id")]
public long? productId { get; set; }
/// <summary>
/// 成品批次,等于成品条码
/// </summary>
[Column("product_batch")]
public string productBatch { get; set; }
/// <summary>
/// 入库数量
/// </summary>
[Column("instock_amount")]
public decimal? instockAmount { get; set; }
/// <summary>
/// 托盘RFID代码
/// </summary>
[Column("pallet_info_code")]
public string palletInfoCode { get; set; }
/// <summary>
/// 申请原因
/// </summary>

20
src/Khd.Core.Domain/Models/WmsProductOutstock.cs
Unescape Escape View File

@ -70,6 +70,12 @@ namespace Khd.Core.Domain.Models
[Column("plan_detail_code")]
public string planDetailCode { get; set; }
/// <summary>
/// 销售订单ID主键
/// </summary>
[Column("sale_order_id")]
public long? saleOrderId { get; set; }
/// <summary>
/// 销售订单编号
/// </summary>
@ -87,13 +93,25 @@ namespace Khd.Core.Domain.Models
/// </summary>
[Column("product_id")]
public long? productId { get; set; }
/// <summary>
/// 成品批次
/// </summary>
[Column("product_batch")]
public string productBatch { get; set; }
/// <summary>
/// 托盘RFID代码
/// </summary>
[Column("pallet_info_code")]
public string palletInfoCode { get; set; }
/// <summary>
/// 出库目的地
/// </summary>
[Column("end_station_code")]
public long? endStationCode { get; set; }
/// <summary>
/// 申请数量
/// </summary>

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

@ -33,10 +33,6 @@ namespace Khd.Core.Domain.Models
/// </summary>
[Column("warehouse_id")]
public long warehouseId { get; set; }
[Column("pallet_info_code")]
public string palletInfoCode { get; set; }
/// <summary>
/// 库位编码
@ -74,6 +70,18 @@ namespace Khd.Core.Domain.Models
[Column("material_batch_code")]
public string materialBatchCode { get; set; }
/// <summary>
/// 托盘RFID代码
/// </summary>
[Column("pallet_info_code")]
public string palletInfoCode { get; set; }
/// <summary>
/// 入库数量
/// </summary>
[Column("instock_amount")]
public decimal? instockAmount { get; set; }
/// <summary>
/// 申请原因
/// </summary>

36
src/Khd.Core.Domain/Models/WmsRawOutstock.cs
Unescape Escape View File

@ -33,10 +33,6 @@ namespace Khd.Core.Domain.Models
/// </summary>
[Column("warehouse_id")]
public long? warehouseId { get; set; }
/// </summary>
[Column("end_station_code")]
public long? endStationCode { get; set; }
/// <summary>
/// 库位编码
@ -45,25 +41,25 @@ namespace Khd.Core.Domain.Models
public string locationCode { get; set; }
/// <summary>
/// 工单ID,关联pd_base_order_info的order_id
/// 工单ID,关联mes_product_order_info的product_order_id
/// </summary>
[Column("order_id")]
public long? orderId { get; set; }
/// <summary>
/// 计划编号,关联pd_base_plan_info的plan_code
/// 计划编号,关联mes_product_plan_info的plan_code
/// </summary>
[Column("plan_code")]
public string planCode { get; set; }
/// <summary>
/// 计划明细编号,关联pd_base_plan_detail的plan_detail_code
/// 计划明细编号,关联mes_product_plan_detail的plan_detail_code
/// </summary>
[Column("plan_detail_code")]
public string planDetailCode { get; set; }
/// <summary>
/// 所属工位，关联pd_base_station_info的station_id
/// 所属工位，关联mes_base_station_info的station_id
/// </summary>
[Column("station_id")]
public int? stationId { get; set; }
@ -74,6 +70,30 @@ namespace Khd.Core.Domain.Models
[Column("product_id")]
public long? productId { get; set; }
/// <summary>
/// 物料批次
/// </summary>
[Column("material_batch")]
public string materialBatch { get; set; }
/// <summary>
/// 托盘RFID代码
/// </summary>
[Column("pallet_info_code")]
public string palletInfoCode { get; set; }
/// <summary>
/// 出库数量
/// </summary>
[Column("outstock_amount")]
public decimal? outstockAmount { get; set; }
/// <summary>
/// 出库目的地
/// </summary>
[Column("end_station_code")]
public long? endStationCode { get; set; }
/// <summary>
/// 操作类型(0自动,1人工,2强制,3调度)
/// </summary>

5
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

@ -114,6 +114,11 @@ namespace Khd.Core.Wcs.Wcs
}
}
//原料&辅料出库
CreateMaterialTask();
//成品&半成品出库
CreateProductTask();
}
catch (Exception ex)
{

2
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
Unescape Escape View File

@ -75,7 +75,7 @@ namespace Khd.Core.Wcs.Wcs
}
foreach (var item in taskList)
{
SendTask(item);
}
}
catch (Exception ex)

136
src/Khd.Core.Wcs/Wcs/FiveFloorLine.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Z.EntityFramework.Plus;
namespace Khd.Core.Wcs.Wcs
{
@ -72,16 +73,70 @@ namespace Khd.Core.Wcs.Wcs
var rfid = this._plc.Read(LineRFID.plcpointAddress);
var isarrive = this._plc.Read(IsArrive.plcpointAddress);
//获取条码信息
var palletNo = Convert.ToString(rfid);
var wcsTaskList = GetTask( FloorNo, EquipNo);
foreach (var item in wcsTaskList)
{
if (item.taskStatus == 3)
{
if (item.taskType == 7)
{
//更新任务
dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask()
{
currPointId = 7,
currPointNo = "F06",
updateTime = DateTime.Now,
updateBy = "五楼回转输送线",
});
}
else
{
var palletInfo = StaticData.MesBasePalletInfo.Where(t => t.palletInfoCode == item.containerNo).FirstOrDefault();
//自动获取id
Jc.SnowId.JcSnowId id = new Jc.SnowId.JcSnowId(1, 1);
var objid = id.NextId();
WcsTask newTask = new()
{
objid = objid,
taskType =7,
containerNo = item.containerNo,
taskStatus = 0,
materialId = item.materialId,
qty = Convert.ToInt32(palletInfo.bindAmount),
startPointId =7,
startPointNo = "F06",
currPointId = 7,
currPointNo = "F06",
nextPointId=11,
nextPointNo= "AGV04",
endPointId =16,
endPointNo = "WH0502",
createBy="回转输送线",
createTime = DateTime.Now,
};
dbContext.Add(newTask);
dbContext.SaveChanges();
}
}
}
if (rfid != null && isarrive != null)
{
//正常读到输送线信息 有到位信号,并且有托盘,获取条码信息
if (Convert.ToInt32(isarrive) ==1)
{
//获取条码信息
var palletNo = Convert.ToString(rfid);
//获取辅料料箱回库任务
var wcsTask = GetTask(palletNo, FloorNo, EquipNo);
dbContext.WcsTask.Where(t => t.containerNo == palletNo&& t.currPointId==7).Update(t => new WcsTask()
{
nextPointId = 11,
nextPointNo = "AGV04",
updateTime = DateTime.Now,
updateBy = "五楼回转输送线",
});
}
}
@ -97,31 +152,15 @@ namespace Khd.Core.Wcs.Wcs
}
}
public WcsTask GetTask(string containerNo, int floorNo, string equipNo)
public List<WcsTask> GetTask(int floorNo, string equipNo)
{
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
var wcsTask = new WcsTask();
List<WcsTask> wcsTask = new List<WcsTask>();
var wareHouseList = StaticData.WmsBaseWarehouse.ToList();
try
{
var cmd = StaticData.WcsCmd.Where(t => t.containerNo == containerNo).FirstOrDefault();
if (cmd == null) return null;
//获取条码号,如果该条码任务存在就继续任务,如果条码不存在,创建入库任务并调度agv
var task = StaticData.WcsTask.Where(t => t.objid == cmd.taskId).FirstOrDefault();
if (task != null)
{
//下发继续执行任务
//更新任务点位
task.currPointId = cmd.currPointId;
task.currPointNo= cmd.currPointNo;
task.nextPointId= cmd.nextPointId;
task.nextPointNo= cmd.nextPointNo;
}
else
{
wcsTask = StaticData.WcsTask.Where(t => t.currPointNo == equipNo).FirstOrDefault();
}
wcsTask = StaticData.WcsTask.Where(t => t.taskType == 7 && t.floorNo==5).ToList();
}
catch (Exception ex)
{
@ -130,58 +169,5 @@ namespace Khd.Core.Wcs.Wcs
}
return wcsTask;
}
/// <summary>
/// 下发任务
/// </summary>
/// <param name="task"></param>
public void SendTask(WcsTask task)
{
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
//入库类型
List<int> taskInType = new List<int> { 1, 3, 5, 7 };
List<int> taskOutType = new List<int> { 2, 4, 6, 8 };
try
{
//获取
if (task == null) return;
if (taskInType.Contains(task.taskType.GetValueOrDefault()))
{
//首先判断是否已下发指令
var cmd = StaticData.WcsCmd.Where(t => t.taskId == task.objid).FirstOrDefault();
//指令表存在说明已下发
if (cmd != null) return;
//获取下发agv指令
string ip = ""; int port = 0; string url = "";
RequestAGVTaskDto agvtask = new RequestAGVTaskDto();
agvtask.reqCode = task.serialNo.ToString();
var json = JsonConvert.SerializeObject(agvtask);
HttpHelper.SendPostMessage(ip, port, url, json);
//未下发给agv下发指令
WcsCmd taskCmd = new WcsCmd()
{
taskId = task.objid,
cmdType = task.taskType,
serialNo = task.serialNo,
equipmentNo = task.equipmentNo,
cmdStatus = 1,
createBy = "",
createTime = DateTime.Now,
};
dbContext.Add(taskCmd);
dbContext.SaveChanges();
}
else
{
}
}
catch (Exception)
{
throw;
}
}
}
}

377
src/Khd.Core.Wcs/Wcs/SecondThirdFloorAGV.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Z.EntityFramework.Plus;
namespace Khd.Core.Wcs.Wcs
{
@ -31,21 +32,23 @@ namespace Khd.Core.Wcs.Wcs
Thread FlowPointThread;
int FloorNo { get; set; }
string EquipNo = "";
List<int> taskInType = new List<int> { 1, 3, 5, 7 };
List<int> taskOutType = new List<int> { 2, 4, 6, 8 };
public SecondThirdFloorAGV(IHost host, Plc.S7.Plc plc, int floor, string equipNo)
{
this._host = host;
this._plc = plc;
FloorNo = floor;
EquipNo = equipNo;
//this.ScanPoint = StaticData.BasePlcpointList.Where(t => t.floorNo == floor).ToList();//加载当前站点所对应的点位
this.ScanPoint = StaticData.BasePlcpointList.Where(t => t.floorNo == floor).ToList();//加载当前站点所对应的点位
//this.LineRFID = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("RFID"));
//this.LineWcsrun = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("wcsrun"));
//this.LineSignal = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("linesignal"));
//this.LineIsPallet = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("ispallet"));
this.LineIsPallet = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("ispallet"));
//this.LineSerialNO = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("serialno"));
//this.LineFeedSeriaNo = this.ScanPoint.FirstOrDefault(t => t.plcpointNo.Contains("feedserialno"));
//var lineRFID = this._plc.Read(NodeSettingCarNo.plcpointAddress);
//var IsPallet = this._plc.Read(LineIsPallet.plcpointAddress);
try
{
//默认启动,清理plc的上位机写入点位值
@ -71,6 +74,8 @@ namespace Khd.Core.Wcs.Wcs
{
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
List<int> taskInType = new List<int> { 1, 3, 5, 7 };
List<int> taskOutType = new List<int> { 2, 4, 6, 8 };
while (true)
{
try
@ -82,6 +87,154 @@ namespace Khd.Core.Wcs.Wcs
}
foreach (var item in taskList)
{
if (taskInType.Contains(item.taskType.GetValueOrDefault()))//入库
{
var loc = dbContext.WmsBaseLocation.Where(t => t.activeFlag == "1").ToList();
//2楼成品
if (item.taskType == 5)
{
var stock = dbContext.WmsProductStock.Where(t => t.activeFlag == "1").ToList();
//获取有物料的库位
var locStock = from l in loc
join s in stock on l.locationCode equals s.locationCode
select new
{
LocId = l.locationId,
locCode = l.locationCode,
LocDeep = l.locDeep,
productBatch = s.productBatch
};
//获取空库位
var nullLocList = loc.Where(r => !locStock.Select(t => t.locCode).Contains(r.locationCode) && r.warehouseId == 1).ToList();
var location = nullLocList.OrderBy(t => t.locColumn).FirstOrDefault();
item.currPointId = 8;
item.currPointNo = "AGV01";
item.nextPointId = location.locationId;
item.nextPointNo = location.locationCode;
dbContext.Update(item);
}
else
{
//3楼原材料
var stock = dbContext.WmsRawStock.Where(t => t.activeFlag == "1").ToList();
//获取有物料的库位
var locStock = from l in loc
join s in stock on l.locationCode equals s.locationCode
select new
{
LocId = l.locationId,
locCode = l.locationCode,
LocDeep = l.locDeep,
productBatch = s.instockBatch
};
//获取空库位
var nullLocList = loc.Where(r => !locStock.Select(t => t.locCode).Contains(r.locationCode) && r.warehouseId == 2).ToList();
var location = nullLocList.OrderBy(t => t.locColumn).FirstOrDefault();
item.currPointId = 9;
item.currPointNo = "AGV02";
item.nextPointId = location.locationId;
item.nextPointNo = location.locationCode;
dbContext.Update(item);
}
}
else
{
var locList = dbContext.WmsBaseLocation.Where(t => t.activeFlag == "1").ToList();
//出库
if (item.taskType == 6)//成品出库
{
//var outStock = dbContext.WmsProductOutstock.Where(t=>t.productOutstockId==item.orderId).FirstOrDefault();
//获取库存
var proStock = dbContext.WmsProductStock.Where(t => t.activeFlag == "1" && t.stockType == "3" && t.productId == item.materialId).ToList();
var dic = dbContext.BaseDictionary.Where(t => t.dicKey == "OutStockDate").FirstOrDefault();
var DateRange = Convert.ToInt32(dic.dicValue);
var stockList = from t in proStock
join b in locList on t.locationCode equals b.locationCode
into temp
from newStock in temp.DefaultIfEmpty()
select new
{
proID = t.productStockId,
locID = newStock.locationId,
locCode = t.locationCode,
layerNum = newStock.layerNum,
locColumn = newStock.locColumn,
locRow = newStock.locRow,
locDeep = newStock.locDeep,
inStockDate = newStock.createTime,
};
//先查出最早入库时间
var inStockModel = stockList.OrderBy(t => t.inStockDate).FirstOrDefault();
var inStockDate = inStockModel.inStockDate;
//查出符合条件的成品
var outStockList = stockList.Where(t => t.inStockDate >= inStockDate && t.inStockDate <= inStockDate.GetValueOrDefault().AddDays(DateRange)).ToList();
var outModel = outStockList.OrderBy(t => t.locColumn).ThenByDescending(t => t.locDeep).FirstOrDefault();
//锁定库位
dbContext.WmsBaseLocation.Where(t => t.locationCode == outModel.locCode).Update(t => new WmsBaseLocation()
{
locationStatus = "1",
updateTime = DateTime.Now,
updateBy = "agv出库",
});
//更新任务
dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask()
{
currPointId = outModel.locID,
currPointNo = outModel.locCode,
updateTime = DateTime.Now,
updateBy = "agv出库",
});
}
else if (item.taskType == 2)//原材料出库
{ //获取库存
var rawStock = dbContext.WmsRawStock.Where(t => t.activeFlag == "1" && t.stockType == "1" && t.materialId == item.materialId).ToList();
var dic = dbContext.BaseDictionary.Where(t => t.dicKey == "OutStockDate").FirstOrDefault();
var DateRange = Convert.ToInt32(dic.dicValue);
var stockList = from t in rawStock
join b in locList on t.locationCode equals b.locationCode
into temp
from newStock in temp.DefaultIfEmpty()
select new
{
rawID = t.rawStockId,
locID = newStock.locationId,
locCode = t.locationCode,
layerNum = newStock.layerNum,
locColumn = newStock.locColumn,
locRow = newStock.locRow,
locDeep = newStock.locDeep,
inStockDate = newStock.createTime,
};
//先查出最早入库时间
var inStockModel = stockList.OrderBy(t => t.inStockDate).FirstOrDefault();
var inStockDate = inStockModel.inStockDate;
//查出符合条件的成品
var outStockList = stockList.Where(t => t.inStockDate >= inStockDate && t.inStockDate <= inStockDate.GetValueOrDefault().AddDays(DateRange)).ToList();
var outModel = outStockList.OrderBy(t => t.locColumn).ThenByDescending(t => t.locDeep).FirstOrDefault();
//锁定库位
dbContext.WmsBaseLocation.Where(t => t.locationCode == outModel.locCode).Update(t => new WmsBaseLocation()
{
locationStatus = "1",
updateTime = DateTime.Now,
updateBy = "agv出库",
});
//更新任务
dbContext.WcsTask.Where(t => t.objid == item.objid).Update(t => new WcsTask()
{
currPointId = outModel.locID,
currPointNo = outModel.locCode,
updateTime = DateTime.Now,
updateBy = "agv出库",
});
}
}
//下发agv出库指令
SendTask(item);
}
}
@ -102,47 +255,40 @@ namespace Khd.Core.Wcs.Wcs
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
List<WcsTask> wcsTask = new List<WcsTask>();
var wareHouseList = StaticData.WmsBaseWarehouse.ToList();
var equip = StaticData.BaseEquip.Where(t=>t.floorNo==floorNo && t.equipType==4).FirstOrDefault();
var equip = StaticData.BaseEquip.Where(t => t.floorNo == floorNo && t.equipType == 4).FirstOrDefault();
try
{
//获取条码号,如果该条码任务存在就继续任务,如果条码不存在,创建入库任务并调度agv
var taskList = StaticData.WcsTask.Where(t => t.nextPointId == equip.objid).ToList();
var taskList = StaticData.WcsTask.Where(t => t.nextPointId == equip.objid &&　(t.taskType==1|| t.taskType == 2|| t.taskType == 5 || t.taskType == 6)).ToList();
if (taskList.Count() == 0)
{ return null; }
wcsTask = taskList;
}
catch (Exception ex)
{
LogManager.Info(floorNo + "楼AGV异常"+ ex.Message);
LogManager.Info(floorNo + "楼AGV异常" + ex.Message);
throw;
}
return wcsTask;
}
/// <summary>
/// 下发任务
/// </summary>
/// <param name="task"></param>
public void SendTask(WcsTask task)
{
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
//入库类型
List<int> taskInType = new List<int> { 1, 3, 5, 7 };
List<int> taskOutType = new List<int> { 2, 4, 6, 8 };
//获取
if (task == null) return;
if (taskInType.Contains(task.taskType.GetValueOrDefault()))//入库
{
using var scope = _host.Services.CreateScope();
using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
WcsToWms wcsToWms = new WcsToWms();
//首先判断是否已下发指令
var cmd = StaticData.WcsCmd.Where(t => t.taskId == task.objid).FirstOrDefault();
//指令表存在说明已下发
if (cmd != null) return;
//获取下发agv指令
if (cmd == null)
{ //获取下发agv指令
string ip = ""; int port = 0; string url = "";
RequestAGVTaskDto agvtask = new RequestAGVTaskDto();
agvtask.reqCode = task.serialNo.ToString();
var json = JsonConvert.SerializeObject(agvtask);
HttpHelper.SendPostMessage(ip, port, url, json);
//var json = JsonConvert.SerializeObject(agvtask);
//HttpHelper.SendPostMessage(ip, port, url, json);
wcsToWms.genAgvSchedulingTask(agvtask);
//未下发给agv下发指令
WcsCmd taskCmd = new WcsCmd()
{
@ -159,36 +305,181 @@ namespace Khd.Core.Wcs.Wcs
}
else
{
//出库
if (task.taskType == 6)//成品出库
//获取接驳位是否有托盘
var IsPallet = this._plc.Read(this.LineIsPallet.plcpointAddress);
if (cmd.sendFlag == 0)
{
if (taskInType.Contains(task.taskType.GetValueOrDefault()))//入库
{
//入库时有托盘继续任务
if (Convert.ToInt32(IsPallet) == 1)
{
//获取库存
var proStock = dbContext.WmsProductStock.Where(t=>t.activeFlag=="1"&& t.stockType == "3" && t.productId==task.materialId).ToList();
var loc = dbContext.WmsBaseLocation.Where(t => t.activeFlag == "1" ).ToList() ;
var stockList = from t in proStock
join b in loc on t.locationCode equals b.locationCode
into temp
from newStock in temp.DefaultIfEmpty()
select new
continueTaskDto continueTask = new continueTaskDto();
continueTask.taskCode = task.objid.ToString();
wcsToWms.continueTask(continueTask);
//未下发给agv下发指令
WcsCmd taskCmd = new WcsCmd()
{
proID=t.productId,
layerNum = newStock.layerNum,
locColumn= newStock.locColumn,
locRow = newStock.locRow,
locDeep=newStock.locDeep,
create =newStock.createTime,
taskId = task.objid,
sendFlag = 1,
createBy = FloorNo + "楼AGV",
createTime = DateTime.Now,
};
dbContext.Update(taskCmd);
dbContext.SaveChanges();
}
else if (task.taskType == 2)//原材料出库
}
else
{
//出库时没有托盘继续任务
if (Convert.ToInt32(IsPallet) == 0)
{
continueTaskDto continueTask = new continueTaskDto();
continueTask.taskCode = task.objid.ToString();
}
wcsToWms.continueTask(continueTask);
//更新任务
dbContext.WcsCmd.Where(t => t.taskId == task.objid).Update(t => new WcsCmd()
{
sendFlag = 1,
updateTime = DateTime.Now,
updateBy = "agv出库",
});
}
}
}
}
}
///// <summary>
///// 下发任务
///// </summary>
///// <param name="task"></param>
//public void SendTask1(WcsTask task)
//{
// using var scope = _host.Services.CreateScope();
// using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
// //入库类型
// //List<int> taskInType = new List<int> { 1, 3, 5, 7 };
// //List<int> taskOutType = new List<int> { 2, 4, 6, 8 };
// //获取
// if (task == null) return;
// if (taskInType.Contains(task.taskType.GetValueOrDefault()))//入库
// {
// WcsToWms wcsToWms = new WcsToWms();
// //首先判断是否已下发指令
// var cmd = StaticData.WcsCmd.Where(t => t.taskId == task.objid).FirstOrDefault();
// //指令表存在说明已下发
// if (cmd == null)
// { //获取下发agv指令
// string ip = ""; int port = 0; string url = "";
// RequestAGVTaskDto agvtask = new RequestAGVTaskDto();
// agvtask.reqCode = task.serialNo.ToString();
// //var json = JsonConvert.SerializeObject(agvtask);
// //HttpHelper.SendPostMessage(ip, port, url, json);
// wcsToWms.genAgvSchedulingTask(agvtask);
// //未下发给agv下发指令
// WcsCmd taskCmd = new WcsCmd()
// {
// taskId = task.objid,
// cmdType = task.taskType,
// serialNo = task.serialNo,
// equipmentNo = task.equipmentNo,
// cmdStatus = 1,
// createBy = FloorNo + "楼AGV",
// createTime = DateTime.Now,
// };
// dbContext.Add(taskCmd);
// dbContext.SaveChanges();
// }
// else
// {
// var IsPallet = this._plc.Read(this.LineIsPallet.plcpointAddress);
// if (cmd.sendFlag == 0)
// {
// if (Convert.ToInt32(IsPallet) == 1)
// {
// continueTaskDto continueTask = new continueTaskDto();
// continueTask.taskCode = task.objid.ToString();
// wcsToWms.continueTask(continueTask);
// //未下发给agv下发指令
// WcsCmd taskCmd = new WcsCmd()
// {
// taskId = task.objid,
// cmdType = task.taskType,
// serialNo = task.serialNo,
// equipmentNo = task.equipmentNo,
// sendFlag = 1,
// createBy = FloorNo + "楼AGV",
// createTime = DateTime.Now,
// };
// dbContext.Update(taskCmd);
// dbContext.SaveChanges();
// }
// }
// }
// }
// else
// {
// var locList = dbContext.WmsBaseLocation.Where(t => t.activeFlag == "1").ToList();
// //出库
// if (task.taskType == 6)//成品出库
// {
// //获取库存
// var proStock = dbContext.WmsProductStock.Where(t => t.activeFlag == "1" && t.stockType == "3" && t.productId == task.materialId).ToList();
// var dic = dbContext.BaseDictionary.Where(t => t.dicKey == "OutStockDate").FirstOrDefault();
// var DateRange = Convert.ToInt32(dic.dicValue);
// var stockList = from t in proStock
// join b in locList on t.locationCode equals b.locationCode
// into temp
// from newStock in temp.DefaultIfEmpty()
// select new
// {
// proID = t.productStockId,
// locID = newStock.locationId,
// locCode = t.locationCode,
// layerNum = newStock.layerNum,
// locColumn = newStock.locColumn,
// locRow = newStock.locRow,
// locDeep = newStock.locDeep,
// inStockDate = newStock.createTime,
// };
// //先查出最早入库时间
// var inStockModel = stockList.OrderBy(t => t.inStockDate).FirstOrDefault();
// var inStockDate = inStockModel.inStockDate;
// //查出符合条件的成品
// var outStockList = stockList.Where(t => t.inStockDate >= inStockDate && t.inStockDate <= inStockDate.GetValueOrDefault().AddDays(DateRange)).ToList();
// var outModel = outStockList.OrderBy(t => t.locColumn).ThenByDescending(t => t.locDeep).FirstOrDefault();
// dbContext.WmsBaseLocation.Where(t => t.locationCode == outModel.locCode).Update(t => new WmsBaseLocation()
// {
// locationStatus = "1",
// updateTime = DateTime.Now,
// updateBy = "agv出库",
// });
// dbContext.WcsTask.Where(t => t.objid == task.objid).Update(t => new WcsTask()
// {
// currPointId = outModel.locID,
// currPointNo = outModel.locCode,
// updateTime = DateTime.Now,
// updateBy = "agv出库",
// });
// //下发agv出库指令
// }
// else if (task.taskType == 2)//原材料出库
// {
// }
// }
//}
}
}

4
src/Khd.Core.Wcs/Wcs/WcsToWms.cs
Unescape Escape View File

@ -105,12 +105,12 @@ namespace Khd.Core.Wcs.Wcs
/// </summary>
/// <param name="requestCheck"></param>
/// <returns></returns>
public bool continueTask(RequestAGVTaskDto requestAGVTaskDto)
public bool continueTask(continueTaskDto continueTaskDto)
{
//继续执行
var url = "http://IP:PORT/rcms/services/rest/hikRpcService/continueTask";
var concontentType = "application/json";
var result = HttpHelper.HttpPost(url, requestAGVTaskDto.ToJsonString(), concontentType, 60, null);
var result = HttpHelper.HttpPost(url, continueTaskDto.ToJsonString(), concontentType, 60, null);
var model = (ReponseMessage)JsonConvert.DeserializeObject(result.ToString(), typeof(ReponseMessage));
if (model.code == "0")
{

Write Preview
Loading…
Cancel
Save