.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/26cb7641-a9ff-4b60-93af-e7b9228fb03d.vsidxBinary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/45cd14e7-f5f2-43ad-8265-90a4e2beef30.vsidxBinary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/487b627d-37f2-4def-b2fe-acf99cac927a.vsidxBinary files differ
.vs/HH.WCS.Mobox3.AnGang/FileContentIndex/b46d38b7-1876-42b3-81c8-ac8f930ac5f8.vsidxBinary files differ
HH.WCS.Mobox3.AnGang.csproj
@@ -266,10 +266,6 @@ <Compile Include="App_Start\SwaggerControllerDescProvider.cs" /> <Compile Include="device\SnapDevice.cs" /> <Compile Include="device\SnapManager.cs" /> <Compile Include="models\TN_Count_CG_Detail.cs" /> <Compile Include="models\TN_Count_Diff.cs" /> <Compile Include="models\TN_Count_Order.cs" /> <Compile Include="models\TN_Count_Plan.cs" /> <Compile Include="models\TN_Inbound_DataRecord.cs" /> <Compile Include="models\TN_Outbound_DataRecord.cs" /> <Compile Include="core\WMSCore.cs" /> api/AgvController.cs
@@ -20,19 +20,6 @@ [RoutePrefix("agv")] public class AgvController : ApiController { ///// <summary> ///// NDC HostToAGV 任务状态回报 ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("AGVCallbackState")] //public ReturnResult AGVCallbackState(AgvTaskState model) //{ // LogHelper.Info("NDC HostToAGV任务状态回报:" + JsonConvert.SerializeObject(model), "HosttoagvTask"); // return AgvService.OperateAgvTaskStatus(model); //} /// <summary> /// RCS国自AGV任务状态回报 /// </summary> api/ApiHelper.cs
@@ -28,12 +28,23 @@ var startLoc = db.Queryable<TN_Location>() .Where(a => a.S_CODE == model.StartLoc) .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") .Where(a => a.N_CURRENT_NUM == 0) //.Where(a => a.N_CURRENT_NUM == 0) .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE)) // 收发区 .First(); if (startLoc == null) { return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求:需要(1)没有锁状态(2)当前无容器(3)属于取放货区"); return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求:(1)没有锁状态 (2)属于取放货区"); } var locCntrRelOld = db.Queryable<TN_Loc_Container>() .Where(c => c.S_LOC_CODE == model.StartLoc).First(); // 产品入库:假定用户不会将新入库物料,放到已有物料的收发货区入库 // 新产品入库时,如果存在旧的货位绑定数据(出库遗留项目)直接删除 TN_CG_Detail cgDetailOld = null; if (locCntrRelOld != null) { cgDetailOld = db.Queryable<TN_CG_Detail>() .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First(); } // 容器 ID 和 物料 ID 未指定,由系统直接生成 @@ -42,7 +53,7 @@ var cntId = GenerateNo("容器号", "CN"); var cgId = GenerateNo("物料号", "CG"); // 初始是没有绑定信息的,先将起点位置与容器绑定,容器与物料绑定 // 首次入库:没有绑定信息,先将起点位置与容器绑定,容器与物料绑定 var locCntrRel = new TN_Loc_Container() { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntId, @@ -52,6 +63,8 @@ S_ITEM_CODE = cgId, S_CNTR_CODE = cntId, }; startLoc.N_CURRENT_NUM = 1; var endLocCode = "0"; // 假的默认终点地址 @@ -72,6 +85,21 @@ // 无论是否选择终点货架,都等到称重之后再计算终点货位 using (var tran = db.Ado.UseTran()) { if (locCntrRelOld != null) { if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"删除货位容器关系表失败:货位{locCntrRelOld.S_LOC_CODE},容器{locCntrRelOld.S_CNTR_CODE}"); } } if (cgDetailOld != null) { if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"删除旧容器货品明细表失败:容器{cgDetailOld.S_CNTR_CODE},物料{cgDetailOld.S_ITEM_CODE}"); } } if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, @@ -85,7 +113,7 @@ } if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"更新起点货位锁状态失败:起点货位{startLoc.S_CODE}"); @@ -112,6 +140,117 @@ var date = DateTime.Now.ToString("yyMMdd"); return $"{prefix}{date}-{id.ToString().PadLeft(5, '0')}"; // 形如:CN250525-00011 } /// <summary> /// 兼容Inbound和PartInbound的功能,备用(问题:出库后无法自动清数据,导致入库后回库) /// </summary> /// <param name="model"></param> /// <returns></returns> public static SimpleResult InboundTwoWays(InboundInfo model) { var taskName = TaskName.产品入库; var db = new SqlHelper<object>().GetInstance(); try { // 起点位置必须:为空、无锁、启用、属于收发区域 var startLoc = db.Queryable<TN_Location>() .Where(a => a.S_CODE == model.StartLoc) .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") //.Where(a => a.N_CURRENT_NUM == 0) .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE)) // 收发区 .First(); if (startLoc == null) { return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求:(1)没有锁状态 (2)属于取放货区"); } // 容器 ID 和 物料 ID 未指定,由系统直接生成 //var cntId = Guid.NewGuid().ToString("D"); //var CgId = Guid.NewGuid().ToString("D"); var cntId = GenerateNo("容器号", "CN"); var cgId = GenerateNo("物料号", "CG"); var locCntrRel = db.Queryable<TN_Loc_Container>() .Where(c => c.S_LOC_CODE == model.StartLoc).First(); // 只有首次入库(当前托盘未绑定在起点货位)时cgDetail设置值,并插入 // 否则,cgDetail为空,代表是回库作业(此前有绑定过起点) TN_CG_Detail cgDetail = null; if (locCntrRel == null) { // 首次入库:没有绑定信息,先将起点位置与容器绑定,容器与物料绑定 locCntrRel = new TN_Loc_Container() { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntId, }; cgDetail = new TN_CG_Detail() { S_ITEM_CODE = cgId, S_CNTR_CODE = cntId, }; } startLoc.N_CURRENT_NUM = 1; var endLocCode = "0"; // 假的默认终点地址 // 指定货位排号(不能为空、空字符串或空格) if (model.Row != null && model.Row.Trim() != "") { endLocCode = model.Row; // 用排号字符串当做假地址 if (!int.TryParse(model.Row.Trim(), out int row)) { return BuildSimpleResult(2, $"{model.Row} 不合法:无法转成整数类型"); } // 货架排号只能是 0 - 8 if (row <= 0 || row > 8) { return BuildSimpleResult(2, $"货架号 {model.Row} 必须是1-8之间的整数"); } } var task = WCSHelper.BuildInboundTask(startLoc, endLocCode, cntId); LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁 // 无论是否选择终点货架,都等到称重之后再计算终点货位 using (var tran = db.Ado.UseTran()) { if (cgDetail != null) { if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"插入货位容器关系表失败:货位{locCntrRel.S_LOC_CODE},容器{locCntrRel.S_CNTR_CODE}"); } if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"插入容器货品明细表失败:容器{cgDetail.S_CNTR_CODE},物料{cgDetail.S_ITEM_CODE}"); } } if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"更新起点货位锁状态失败:起点货位{startLoc.S_CODE}"); } if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { tran.RollbackTran(); return BuildSimpleResult(500, $"生成任务 {taskName} 失败:容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货架 {endLocCode} ,终点货位未指定"); } tran.CommitTran(); return BuildSimpleResult(0, $"生成任务 {taskName} 成功:容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货架 {endLocCode} ,终点货位未指定"); } } catch (Exception ex) { return BuildSimpleResult(1, $"发生了异常:{ex.Message}"); } } /// <summary> /// PDA选择终点货位 @@ -152,10 +291,10 @@ interaction_info_id = int.Parse(task.S_EQ_TASK_CODE), info_status = "error", })) { LogHelper.Info($"国自AGV接受超重取消信息成功", "API"); LogHelper.Info($"国自AGV接受超重取消信息成功", "HosttoagvTask"); } else { LogHelper.Info($"国自AGV接受超重取消信息失败", "API"); LogHelper.Info($"国自AGV接受超重取消信息失败", "HosttoagvTask"); } return BuildSimpleResult(8, $"物料重量{cgDetail.F_QTY}超过2t"); @@ -199,10 +338,10 @@ info_status = "invalid", return_value = LocationHelper.GetAgvSite(task.S_END_LOC), // 目前使用agvsite })) { LogHelper.Info($"国自AGV接受终点信息成功", "API"); LogHelper.Info($"国自AGV接受终点信息成功", "HosttoagvTask"); } else { LogHelper.Info($"国自AGV接受终点信息失败", "API"); LogHelper.Info($"国自AGV接受终点信息失败", "HosttoagvTask"); } @@ -228,7 +367,7 @@ } /// <summary> /// 产品部分出库(WMS) /// 产品部分出库 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -299,7 +438,7 @@ } /// <summary> /// 产品部分回库(WMS) /// 产品部分回库 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -373,11 +512,10 @@ return BuildSimpleResult(2, $"任务号{model.TaskNo}不存在"); } if (task.N_B_STATE == 0 && task.S_B_STATE == TN_Task.GetStateStr(0) || task.N_B_STATE == 1 && task.S_B_STATE == TN_Task.GetStateStr(1)) { task.N_B_STATE = 4; task.S_B_STATE = "取消"; // 等待 或 已推送 时,可以取消任务 //if (task.N_B_STATE == 0 && task.S_B_STATE == TN_Task.GetStateStr(0) // || task.N_B_STATE == 1 && task.S_B_STATE == TN_Task.GetStateStr(1)) { if (task.N_B_STATE == 0 || task.N_B_STATE == 1) { var startloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_START_LOC); var endloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_END_LOC); @@ -398,16 +536,23 @@ endloc.T_MODIFY = System.DateTime.Now; } if (task.N_B_STATE == 1) { if (!int.TryParse(task.S_EQ_TASK_CODE, out var code)) { return BuildSimpleResult(1, $"当前任务{task.S_CODE}没有找到对应的国自AGV orderId!"); } var res = GZRobot.CancelGZOrder(code); if (!res) { LogHelper.Info($"国自AGV取消任务失败!", "API"); LogHelper.Info($"当前任务{task.S_CODE}没有找到对应的国自AGV orderId!"); } else { LogHelper.Info($"国自AGV取消任务成功!", "API"); var res = GZRobot.CancelGZOrder(code); if (!res) { LogHelper.Info($"国自AGV取消任务失败!", "HosttoagvTask"); } else { LogHelper.Info($"国自AGV取消任务成功!", "HosttoagvTask"); } } } task.N_B_STATE = 4; task.S_B_STATE = "取消"; using (var tran = db.Ado.UseTran()) { if (db.Updateable<TN_Location>(startloc).ExecuteCommand() <= 0) { @@ -452,264 +597,7 @@ return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消"); } //public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) { // var db = new SqlHelper<object>().GetInstance(); // try { // var countPlan = new TN_Count_Plan() { // S_CP_NO = GenerateNo("盘点计划", "CP"), // S_TYPE = model.countType, // }; // if (model.countType == "货位") { // countPlan.S_LOC_CODE = model.targetId; // } // else if (model.countType == "物料") { // countPlan.S_ITEM_CODE = model.targetId; // } // else { // return BuildSimpleResult(2, $"创建盘点计划失败:不合法的盘点类型 '{model.countType}'"); // } // if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) { // return BuildSimpleResult(2, "创建盘点计划失败"); // } // return BuildSimpleResult(0, "创建盘点计划成功"); // } // catch (Exception ex) { // return BuildSimpleResult(1, ex.Message); // } //} //public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) { // var db = new SqlHelper<object>().GetInstance(); // var info = ""; // try { // var countPlan = db.Queryable<TN_Count_Plan>() // .Where(a => a.S_CP_NO == model.planId).First(); // if (countPlan == null) { // return BuildSimpleResult(2, $"盘点计划单号 '{model.planId}' 不存在"); // } // var countOrder = new TN_Count_Order() { // S_CP_NO = model.planId, // S_COUNT_NO = GenerateNo("盘点单", "CN"), // }; // var countDetailList = new List<TN_Count_CG_Detail>(); // if (countPlan.S_TYPE == "货位") { // var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail> // ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE) // .Where(l => l.S_CODE == countPlan.S_LOC_CODE) // .Select((l, c, d) => d).First(); // var countDetail = new TN_Count_CG_Detail { // S_COUNT_NO = countOrder.S_COUNT_NO, // S_CNTR_CODE = cgDetail.S_CNTR_CODE, // S_ITEM_CODE = cgDetail.S_ITEM_CODE, // }; // countDetailList.Add(countDetail); // } // else if (countPlan.S_TYPE == "物料") { // var cgDetailList = db.Queryable<TN_CG_Detail>() // .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).ToList(); // foreach (var cgDetail in cgDetailList) { // var countDetail = new TN_Count_CG_Detail { // S_COUNT_NO = countOrder.S_COUNT_NO, // S_CNTR_CODE = cgDetail.S_CNTR_CODE, // S_ITEM_CODE = cgDetail.S_ITEM_CODE, // }; // countDetailList.Add(countDetail); // } // } // else { // return BuildSimpleResult(3, $"计划单'{model.planId}'的类型{countPlan.S_TYPE}不合法"); // } // using (var tran = db.Ado.UseTran()) { // if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = "创建盘点单失败"; // return BuildSimpleResult(2, info); // } // if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = "创建盘点单明细失败"; // return BuildSimpleResult(3, info); // } // tran.CommitTran(); // } // return BuildSimpleResult(0, "创建盘点单成功"); // } // catch (Exception ex) { // return BuildSimpleResult(1, $"发生了异常:{ex.Message}"); // } //} //public static SimpleResult CountProduct(CountProductInfo model) { // var db = new SqlHelper<object>().GetInstance(); // try { // var cgDetail = db.Queryable<TN_CG_Detail>() // .Where(d => d.S_CNTR_CODE == model.cntrCode).First(); // if (cgDetail == null) { // return BuildSimpleResult(2, $"找不到容器号'{model.cntrCode}'对应的物料"); // } // var countDiff = new TN_Count_Diff { // S_CNTR_CODE = cgDetail.S_CNTR_CODE, // F_QTY = cgDetail.F_QTY, // F_ACTUAL_QTY = model.qty // }; // if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) { // return BuildSimpleResult(3, $"插入盘点差异表失败"); // } // return BuildSimpleResult(0, "盘点差异完成"); // } // catch (Exception ex) { // return BuildSimpleResult(1, $"发生了异常:{ex.Message}"); // } //} ///// <summary> ///// 盘点理货出库(WMS) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //internal static SimpleResult CheckOutbound(CheckOutboundInfo model) { // var taskName = TaskName.盘点理货出库; // var db = new SqlHelper<object>().GetInstance(); // try { // // 起点位置:取放货区(有货物、没有锁、已启用) // var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE)); // if (startLoc == null) { // return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不符合出库条件"); // } // var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc); // if (locCntrRel == null) { // return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器,无可回库的物料"); // } // // 终点位置:货架(没有货物,没有锁) // var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y"); // if (endLoc == null) { // return BuildSimpleResult(4, $"终点位置 {model.endLoc} 不具备放货条件"); // } // var cntID = locCntrRel.S_CNTR_CODE; // var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName); // LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁 // LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁 // using (var tran = db.Ado.UseTran()) { // if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货位 {endLoc.S_CODE}"); // } // if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // tran.CommitTran(); // return BuildSimpleResult(0, // $"生成 {taskName} 成功,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // } // catch (Exception ex) { // return BuildSimpleResult(1, $"发生了异常:{ex.Message}"); // } //} ///// <summary> ///// 盘点理货回库(WMS) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //internal static SimpleResult CheckInbound(CheckInboundInfo model) { // var taskName = TaskName.盘点理货回库; // var db = new SqlHelper<object>().GetInstance(); // try { // // 起点位置:取放货区(有货物、没有锁、已启用) // var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE)); // if (startLoc == null) { // return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不符合回库条件"); // } // var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc); // if (locCntrRel == null) { // return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器,无可回库的物料"); // } // // 终点位置:货架(没有货物,没有锁) // var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y"); // if (endLoc == null) { // return BuildSimpleResult(4, $"终点位置 {model.endLoc} 不具备放货条件"); // } // var cntID = locCntrRel.S_CNTR_CODE; // var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName); // LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁 // LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁 // using (var tran = db.Ado.UseTran()) { // if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货位 {endLoc.S_CODE}"); // } // if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { // tran.RollbackTran(); // return BuildSimpleResult(500, // $"生成 {taskName} 失败,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // tran.CommitTran(); // return BuildSimpleResult(0, // $"生成 {taskName} 成功,容器号 {cntID} ,起点 {startLoc.S_CODE} ,终点货架 {endLoc.S_CODE}"); // } // } // catch (Exception ex) { // return BuildSimpleResult(1, $"发生了异常:{ex.Message}"); // } //} public static ErpResult InboundDataSync(InboundDataSyncInfo model) { //return BuildErpResult(1, "测试"); @@ -728,8 +616,8 @@ S_ITEM_CODE = transaction.itemCode, S_ITEM_NAME = transaction.itemName, S_ITEM_SHORT_DESC = transaction.itemShortDesc, S_STOCK_QUANTITY = transaction.stockQuantity, S_IN_QUANTITY = transaction.inQuantity, S_STOCK_QUANTITY = transaction.stockQuantity, // 库存数量 S_IN_QUANTITY = transaction.inQuantity, // 入库数量 S_TOTAL_PRICE = transaction.totalPrice, S_STOCK_IN_TIME = transaction.stockInTime, S_STORE_KEEPER = transaction.storeKeeper, @@ -799,7 +687,7 @@ S_ITEM_CODE = issue.itemCode, S_ITEM_NAME = issue.itemName, S_SHORT_DESC = issue.itemShortDesc, S_ACTUAL_QTY = issue.actualIssuedQty, S_ACTUAL_QTY = issue.actualIssuedQty, // 实发数量 S_ISSUED_AMOUNT = issue.issuedAmount, S_SUPPLIER_NAME = issue.supplierName, S_ISSUER = issue.issuer, api/DebugController.cs
@@ -101,6 +101,27 @@ } /// <summary> /// 初始化数据库 /// </summary> /// <returns></returns> [HttpPost] [Route("CreateDatabase")] public string CreateDatabase() { try { var db = new SqlHelper<object>().GetInstance(); var entityTypes = new Type[] { }; //db.CodeFirst.InitTables(entityTypes); } catch (Exception ex) { LogHelper.Info($"发生了异常"); return "初始化数据库错误" + ex.Message; } return "成功"; } /// <summary> /// DEBUG:根据任务号设置物料重量 /// </summary> /// <param name="model"></param> @@ -159,14 +180,6 @@ public List<GzResult> GzResultList { set; get; } } public class LocCntrCg { public string LocCode { get; set; } public string LocArea { get; set; } public string CntrCode { get; set; } public string ItemCode { get; set; } public string BatchNo { get; set; } } /// <summary> /// 模拟 AGV 传递信号,用于更改任务状态 /// </summary> @@ -183,10 +196,6 @@ /// AGV 下一个状态 /// </summary> public int NextState { set; get; } } public class CoverInfo { public bool IsCover { set; get; } = true; } public class SetTaskWeightInfo { api/MoboxController.cs
@@ -38,7 +38,7 @@ } /// <summary> /// 产品部分出库(WMS) /// 产品部分出库 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -50,7 +50,7 @@ } /// <summary> /// 产品部分回库(WMS) /// 产品部分回库 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -72,65 +72,5 @@ LogHelper.Info("触发API:取消任务" + JsonConvert.SerializeObject(model), "API"); return ApiHelper.CancelTask(model); } ///// <summary> ///// 创建盘点计划单(WMS) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("CreateCountPlan")] //public SimpleResult CreateCountPlan(CreateCountPlanInfo model) { // LogHelper.Info("触发API:创建盘点计划单(WMS)" + JsonConvert.SerializeObject(model), "API"); // return ApiHelper.CreateCountPlan(model); //} ///// <summary> ///// 创建盘点单(PDA) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("CreateCountOrder")] //public SimpleResult CreateCountOrder(CreateCountOrderInfo model) { // LogHelper.Info("触发API:创建盘点单(PDA)" + JsonConvert.SerializeObject(model), "API"); // return ApiHelper.CreateCountOrder(model); //} ///// <summary> ///// 盘点理货(PDA) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("CountProduct")] //public SimpleResult CountProduct(CountProductInfo model) { // LogHelper.Info("触发API:盘点理货(PDA)" + JsonConvert.SerializeObject(model), "API"); // return ApiHelper.CountProduct(model); //} ///// <summary> ///// 盘点理货出库(WMS) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("CheckOutbound")] //public SimpleResult CheckOutbound(CheckOutboundInfo model) { // LogHelper.Info("触发API:盘点理货出库(WMS)" + JsonConvert.SerializeObject(model), "API"); // return ApiHelper.CheckOutbound(model); //} ///// <summary> ///// 盘点理货回库(WMS) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //[HttpPost] //[Route("CheckInbound")] //public SimpleResult CheckInbound(CheckInboundInfo model) { // LogHelper.Info("触发API:盘点理货回库(WMS)" + JsonConvert.SerializeObject(model), "API"); // return ApiHelper.CheckInbound(model); //} } } config/config.json
@@ -1,6 +1,6 @@ { "WebApiUrl": "http://127.0.0.1:8901", "RCSApiUrl": "http://127.0.0.1:6001", "RCSApiUrl": "http://127.0.0.1:6001/", "NDCApiUrl": "http://127.0.0.1:5201/api/order/", "SqlServer": "Data Source=192.168.1.144;Initial Catalog=YinKouAnGan;User ID=hhuser;Password=Hh123321&&", "TCPServerIP": "127.0.0.1", core/Monitor.cs
@@ -15,131 +15,7 @@ /// </summary> public class Monitor { //public static void CheckCountOrder() { // var taskName = TaskName.盘点理货出库; // var db = new SqlHelper<object>().GetInstance(); // var info = ""; // try { // var orderList = db.Queryable<TN_Count_Order>() // .Where(c => c.N_B_STATE == 1) // .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc) // .ToList(); // if (orderList.Count == 0) { // LogHelper.Info($"轮询--{taskName}--暂无待执行的{taskName}单"); // return; // } // var detailList = new List<TN_Count_CG_Detail>(); // foreach (var order in orderList) { // var doingCount = db.Queryable<TN_Count_CG_Detail>() // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 执行中 // var allCount = db.Queryable<TN_Count_CG_Detail>() // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO); // LogHelper.Info($"轮询--{taskName}--统计{taskName}单'{order.S_COUNT_NO}'任务已下发:{doingCount}/{allCount}"); // if (doingCount == allCount) { // order.N_B_STATE = 2; // 所有任务都已执行 // db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand(); // continue; // } // var countCgDetailList = db.Queryable<TN_Count_CG_Detail>() // .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 已下发 // .ToList(); // if (countCgDetailList.Count == 0) { // LogHelper.Info($"轮询--{taskName}--{taskName}单明细状态异常"); // continue; // } // detailList.AddRange(countCgDetailList); // } // if (detailList.Count == 0) { // return; // } // foreach (var detail in detailList) { // var startLoc = db.Queryable<TN_Location>() // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE) // .First(); // if (startLoc == null) { // LogHelper.Info($"轮询--{taskName}:没有找到合适的起点货位!"); // continue; // } // var endLoc = db.Queryable<TN_Location>() // .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE)) // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // .Where(a => a.N_CURRENT_NUM == 0).First(); // if (endLoc == null) { // LogHelper.Info($"轮询--{taskName}:没有找到合适的终点货位!单号为 '{detail.S_COUNT_NO}'"); // continue; // } // detail.N_B_STATE = 2; // var cntId = detail.S_CNTR_CODE; // var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName); // LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁 // LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁 // using (var tran = db.Ado.UseTran()) { // if (db.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) { // tran.RollbackTran(); // LogHelper.Info($"轮询--{taskName}--修改明细表状态为完成失败!"); // } // if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, // it.S_LOCK_STATE, // it.S_LOCK_OP, // it.T_MODIFY // }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = $"生成任务'{taskName}'失败,容器号{cntId},起点{startLoc.S_CODE},终点货位{endLoc.S_CODE}"; // LogHelper.Info(info); // continue; // } // if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { // it.N_LOCK_STATE, // it.S_LOCK_STATE, // it.S_LOCK_OP, // it.T_MODIFY // }).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = $"生成'{taskName}'失败,容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货位 {endLoc.S_CODE}"; // LogHelper.Info(info); // continue; // } // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = $"生成 {taskName} 失败,容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货位 {endLoc.S_CODE}"; // LogHelper.Info(info); // continue; // } // tran.CommitTran(); // info = $"生成 {taskName} 成功,容器号 {cntId} ,起点 {startLoc.S_CODE} ,终点货位 {endLoc.S_CODE}"; // LogHelper.Info(info); // //continue; // } // } // } // catch (Exception ex) { // info = $"发生了异常:{ex.Message}"; // LogHelper.Info(info); // } //} } } core/WCSCore.cs
@@ -164,7 +164,7 @@ if (data.Count == 0) { LogHelper.Info("设置终点货位失败:没有接受到来自国自AGV的重量信息"); //return; // TODO 正式运行有国自AGV的时候恢复 //cgDetail.F_QTY = 0; // 不设置为空,便于测试时预先设置一个正常值 } else { var weight = float.Parse(data[0].parameter_varchar200_up); @@ -209,6 +209,19 @@ // 重量超过 2t endLoc = null; LogHelper.Info("重量超过2t,不允许入库"); // 传递给国自AGV if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo { type_name = "GET_DST", interaction_info_id = int.Parse(tn_task.S_EQ_TASK_CODE), info_status = "error", })) { LogHelper.Info($"国自AGV接受超重取消信息成功", "HosttoagvTask"); } else { LogHelper.Info($"国自AGV接受超重取消信息失败", "HosttoagvTask"); } return; } else if (cgDetail.F_QTY > 1500) { @@ -236,14 +249,13 @@ tn_task.S_END_LOC = "0"; // 不需要再给GZ AGV传空值,一开始就没给具体货位,只给了Area //var request = new UpdateInteractInfo { // interaction_info_id = 3, // 更改终点信息 // info_status = "active", // return_value = "", //}; //GZRobot.UpdateInteractInfo(request); if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC }) .ExecuteCommand() > 0) { //LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁 @@ -258,6 +270,19 @@ tn_task.S_END_LOC = endLoc.S_CODE; LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁 // 传递给国自AGV if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo { type_name = "GET_DST", interaction_info_id = int.Parse(tn_task.S_EQ_TASK_CODE), info_status = "invalid", return_value = LocationHelper.GetAgvSite(tn_task.S_END_LOC), // 目前使用agvsite })) { LogHelper.Info($"国自AGV接受终点信息成功", "HosttoagvTask"); } else { LogHelper.Info($"国自AGV接受终点信息失败", "HosttoagvTask"); } using (var tran = db.Ado.UseTran()) { if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC }) @@ -337,8 +362,6 @@ { //使用自定义任务推送 TaskProcess.SendTask(task);//调度NDC或杭奥或国自设备 //TaskProcess.SendGZTask(task);///调度国自设备 }); } else dispatch/GZRobot.cs
@@ -431,7 +431,7 @@ public int interaction_info_id { get; set; } public string type_name { get; set; } = "GET_DST"; public string info_status { get; set; } public string return_value { get; set; } public string return_value { get; set; } = ""; } public class interaction_state { models/TN_Count_CG_Detail.cs
File was deleted models/TN_Count_Diff.cs
File was deleted models/TN_Count_Order.cs
File was deleted models/TN_Count_Plan.cs
File was deleted process/TaskProcess.cs
@@ -123,6 +123,7 @@ if (code > 0) { //更新任务状态 mst.N_B_STATE = 1; mst.S_B_STATE = TN_Task.GetStateStr(1); mst.S_EQ_TASK_CODE = code.ToString(); WCSHelper.UpdateStatus(mst); WCSHelper.UpdateEQNo(mst); @@ -131,83 +132,6 @@ else { LogHelper.Info($"国自推送任务失败 {mst.S_CODE};" + JsonConvert.SerializeObject(mst)); } //if (mst.N_SCHEDULE_TYPE == 1)//通过NDC,hosttoagv调度设备 //{ // start = LocationHelper.GetAgvSite(mst.S_START_LOC); // end = LocationHelper.GetAgvSite(mst.S_END_LOC); // //if (mst.S_TYPE == "空托下线堆叠") { // // end = LocationHelper.GetAgvSite(mst.S_END_LOC, true); // //} // LogHelper.Info($"NDC推送任务 {mst.S_CODE};" + "start=" + start + "end= " + end); // var startLoc = LocationHelper.GetLoc(mst.S_START_LOC); // var endLoc = LocationHelper.GetLoc(mst.S_END_LOC); // var dic = new List<param>(); // dic.Add(new param() { name = "IKey", value = "IKey" }); // dic.Add(new param() { name = "From", value = start.ToString() }); // dic.Add(new param() { name = "To", value = end.ToString() }); // dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() }); // dic.Add(new param() { name = "Ctype", value = "0" }); // //if (mst.S_TYPE == "余料下线入库" || mst.S_TYPE == "人工拆盘入库") { // // dic.Add(new param() { name = "DATA", value = "1024" }); // //} // //else { // // dic.Add(new param() { name = "DATA", value = "0" }); // //} // var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//添加新命令 // if (res != null && (res.err_code == 0 || res.err_code == 50009)) { // //推送成功,修改任务优先级 // mst.N_B_STATE = 1; // mst.S_B_STATE = TN_Task.GetStateStr(1); // WCSHelper.UpdateStatus(mst);//更新任务状态 // result = true; // LogHelper.Info($"NDC推送任务成功 {mst.S_CODE}start= {mst.S_START_LOC} + end = {mst.S_END_LOC}"); // } // else { // LogHelper.Info($"NDC推送任务失败 {mst.S_CODE};Res:" + JsonConvert.SerializeObject(res)); // } //} //else if (mst.N_SCHEDULE_TYPE == 5)//通过杭奥调度设备 //{ // //调第三方接口 // var model = new HanAo.TaskInfoModel { // requestPk = mst.S_CODE, // frmPos = mst.S_START_LOC, // toPos = mst.S_END_LOC, // trkType = mst.S_OP_NAME == "入库" ? "1" : "2", // contNo = mst.S_CNTR_CODE // }; // if (HanAo.CreateOrder(model)) { // mst.N_B_STATE = 1; // WCSHelper.UpdateStatus(mst); // LogHelper.Info($"杭奥推送任务成功 {mst.S_CODE};" + "start=" + model.frmPos + "end= " + model.toPos); // } // else { // LogHelper.Info($"杭奥推送任务失败 {mst.S_CODE};" + JsonConvert.SerializeObject(model)); // } //} //else if (mst.N_SCHEDULE_TYPE == 3) //通过国自调度设备 //{ // var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2p"); // if (code > 0) { // //更新任务状态 // mst.N_B_STATE = 1; // mst.S_EQ_TASK_CODE = code.ToString(); // WCSHelper.UpdateStatus(mst); // WCSHelper.UpdateEQNo(mst); // LogHelper.Info($"国自推送任务成功 {mst.S_CODE};" + "start=" + mst.S_START_LOC + "end= " + mst.S_END_LOC); // } // else { // LogHelper.Info($"国自推送任务失败 {mst.S_CODE};" + JsonConvert.SerializeObject(mst)); // } //} } return result; } wms/WMSHelper.cs
@@ -19,74 +19,6 @@ /// </summary> internal class WMSHelper { /// <summary> /// 人工手动PDA取消任务:1=发给AGV取消任务 /// </summary> /// <param name="model"></param> /// <returns></returns> internal static SimpleResult PDACancleTask(CancleTaskInfo model) { SimpleResult simpleResult = new SimpleResult(); var db = new SqlHelper<object>().GetInstance(); try { if (model.taskNO.Length > 0) { var task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.taskNO); if (task != null && task.S_B_STATE != "完成") { if (NDCApi.CancelOrder(model.taskNO).err_code == 0) { task.S_B_STATE = "错误"; task.N_B_STATE = 4; if (db.Updateable<TN_Task>(task).ExecuteCommand() > 0) { simpleResult.resultCode = 0; simpleResult.resultMsg = $"通知AGV取消该任务号,成功,{model.taskNO}"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } else { simpleResult.resultCode = 4; simpleResult.resultMsg = $"更新任务状态信息失败{model.taskNO}"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } } else { simpleResult.resultCode = 1; simpleResult.resultMsg = $"通知AGV取消该任务号,失败,{model.taskNO}"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } } else { simpleResult.resultCode = 2; simpleResult.resultMsg = $"未找到该任务号或该任务号已完成,无需通知AGV取消"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } } else { simpleResult.resultCode = 3; simpleResult.resultMsg = $"人工手动PDA取消任务:1=发给AGV取消任务,参数无效"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } } catch (Exception ex) { simpleResult.resultCode = -1; simpleResult.resultMsg = $"发生了异常{ex.Message}"; LogHelper.Info(simpleResult.resultMsg); return simpleResult; } } } }