.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/71a55ff9-7db4-4aa9-9789-25ab0233a3db.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b024e27a-9190-40bd-b5fa-a582e167513a.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/cb0eed0a-5128-4296-811d-7549d46790a5.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f744ef35-4f64-4a61-abee-af81aa222790.vsidxBinary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidxBinary files differ
HH.WCS.Mobox3.DSZSH.csproj
@@ -244,7 +244,7 @@ <Compile Include="models\TN_Spot_Check.cs" /> <Compile Include="process\TaskProcess.cs" /> <Compile Include="util\SqlHelper.cs" /> <Compile Include="models\TN_Container_Item.cs" /> <Compile Include="models\TN_Container_ItemType.cs" /> <Compile Include="models\TN_Outbound_Order.cs" /> <Compile Include="models\TN_Outbound_Detail.cs" /> <Compile Include="device\ProductionLineDevice.cs" /> Models/TN_CG_Detail.cs
@@ -10,12 +10,12 @@ /// <summary> /// 料箱商品标识 /// </summary> public string S_CG_ID { get; set; } = string.Empty; // 暂时用不到，默认为空 public string S_CG_ID { get; set; } = string.Empty; /// <summary> /// 物料编码 /// </summary> public string S_ITEM_CODE { get; set; } public string S_ITEM_CODE { get; set; } = string.Empty; /// <summary> /// 物料名称 @@ -25,7 +25,7 @@ /// <summary> /// 容器编码 /// </summary> public string S_CNTR_CODE { get; set; } public string S_CNTR_CODE { get; set; } = string.Empty; /// <summary> /// 货品状态：0合格 1待检 2不合格 3抽检中；下线即待检 @@ -40,7 +40,7 @@ /// <summary> /// 批次号 /// </summary> public string S_BATCH_NO { get; set; } public string S_BATCH_NO { get; set; } = string.Empty; /// <summary> /// 货品数量 Models/TN_Container_Item.cs
File was deleted Models/TN_Outbound_Order.cs
@@ -13,6 +13,10 @@ /// </summary> public string S_NO { get; set; } public string S_BS_TYPE { get; set; } = string.Empty; // ERP public string S_BS_NO { get; set; } = string.Empty; // ERP 单号（来源单号） /// <summary> /// 业务状态：0待执行 1已下发 2执行中 3已完成 /// </summary> Models/TN_Task.cs
@@ -84,6 +84,9 @@ public int N_END_LAYER { get; internal set; } public int N_CNTR_COUNT { get; internal set; } public string S_BS_NO { get; set; } = string.Empty; public string S_BS_TYPE { get; set; } = string.Empty; ///// <summary> ///// 是否强制出库：0不强制 1强制 ///// </summary> api/ApiHelper.cs
@@ -19,29 +19,33 @@ using static HH.WCS.Mobox3.DSZSH.api.OtherModel; using static HH.WCS.Mobox3.DSZSH.Config; namespace HH.WCS.Mobox3.DSZSH.api { public class ApiHelper { /// <summary> /// 好运箱-满托下线入库(PDA) /// 好运箱-满箱下线入库(PDA) /// </summary> /// <param name="model"></param> /// <returns></returns> public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) { var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息 var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.H好运箱_满箱下线入库; // 用于生成任务类型、打印日志信息 var startAreaName = AreaName.M满箱操作区; var endAreaName = AreaName.M满箱货架区; try { // 将PDA提供的物料编码与贴标机的信息比对 var cgDetail = db.Queryable<TN_CG_Detail>() .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 指定：物料编码、批次号 .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检") // 新增物料，故物料状态应该为 1待检 // TODO model 中 数量、规格是否也参与比对 待后续要求 .First(); if (cgDetail == null) { info = $"PDA扫码物料信息与贴标机传递的信息不一致：" + JsonConvert.SerializeObject(model); LogHelper.Info(info); return NewSimpleResult(1, info); return NewSimpleResult(2, info); } // 起点货位绑定后，可以不立即设置N_CURRENT_NUM为1 @@ -50,11 +54,11 @@ .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位号 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器 .Where(l => Settings.AreaMap[AreaName.M满箱操作区].Contains(l.S_AREA_CODE)) .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .First(); if (startLoc == null) { info = $"在'{AreaName.M满箱操作区}'中没有找到起点货位'{model.StartLoc}'，或不具备取货要求：未上锁、绑定前无货物"; info = $"在'{startAreaName}'中没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、绑定前无货物"; LogHelper.Info(info); return NewSimpleResult(3, info); } @@ -68,14 +72,14 @@ // TODO 满箱入库算法待优化 var endLoc = db.Queryable<TN_Location>() .Where(l => Settings.AreaMap[AreaName.M满箱货架区].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求 .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) // 筛选：空货位 .OrderBy(l => l.N_LAYER) .OrderBy(l => l.N_LAYER) // 按货架最低排序 .First(); if (endLoc == null) { info = "满箱入库暂时没有合适的货位可以入库"; info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -86,27 +90,12 @@ LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁 LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁 // TODO var record = new TN_Record_Table { S_ITEM_CODE = cgDetail.S_ITEM_CODE, S_BATCH_NO= cgDetail.S_BATCH_NO, S_ITEM_NAME= cgDetail.S_ITEM_NAME, S_START_LOC = startLoc.S_CODE, S_END_LOC = endLoc.S_CODE, S_CNTR_CODE = cntId, S_ITEM_SPEC = cgDetail.S_ITEM_SPEC, S_NET_WEIGHT= cgDetail.S_NET_WEIGHT, S_QUALITY_GRADE= cgDetail.S_QUALITY_GRADE, S_STANDARD = cgDetail.S_STANDARD, S_TASK_NO = task.S_CODE, }; using (var tran = db.Ado.UseTran()) { if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel); tran.RollbackTran(); LogHelper.Info(info); return NewSimpleResult(4, info); return NewSimpleResult(5, info); } if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { @@ -118,7 +107,7 @@ tran.RollbackTran(); info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败"; LogHelper.Info(info); return NewSimpleResult(4, info); return NewSimpleResult(5, info); } if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { @@ -130,14 +119,14 @@ tran.RollbackTran(); info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败"; LogHelper.Info(info); return NewSimpleResult(4, info); return NewSimpleResult(5, info); } if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}"; LogHelper.Info(info); return NewSimpleResult(4, info); return NewSimpleResult(5, info); } tran.CommitTran(); @@ -153,122 +142,26 @@ } } ///// <summary> ///// 空托盘绑定(PDA) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //public static SimpleResult EmptyBindPallet(EmptyBindInfo model) { // var db = DbHelper.GetDbClient(); // try { // var loc = db.Queryable<TN_Location>() // .Where(ExprHelper.LocCode(model.LocCode)) // .Where(ExprHelper.LocBelongsToArea(AreaName.空托盘接驳区)) // .Where(ExprHelper.LocIsFree) // .Where(ExprHelper.LocIsEmpty).First(); // if (loc == null) { // return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器"); // } // var locCntrRel = db.Queryable<TN_Loc_Container>() // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First(); // if (locCntrRel != null) { // return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定"); // } // //loc.N_CURRENT_NUM = model.PalletCount; // locCntrRel = new TN_Loc_Container { // S_LOC_CODE = model.LocCode, // S_CNTR_CODE = model.CntrCode // }; // using (var tran = db.Ado.UseTran()) { // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) { // tran.CommitTran(); // return BuildSimpleResult(0, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 成功"); // } // else { // tran.RollbackTran(); // return BuildSimpleResult(4, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 失败"); // } // } // } // catch (Exception ex) { // return BuildSimpleEx(ex); // } //} ///// <summary> ///// 空箱绑定(PDA) ///// </summary> ///// <param name="model"></param> ///// <returns></returns> //public static SimpleResult EmptyBindGoodpack(EmptyBindInfo model) { // var db = DbHelper.GetDbClient(); // try { // var loc = db.Queryable<TN_Location>() // .Where(ExprHelper.LocCode(model.LocCode)) // .Where(ExprHelper.LocBelongsToArea(AreaName.空箱接驳区)) // .Where(ExprHelper.LocIsFree) // .Where(ExprHelper.LocIsEmpty).First(); // if (loc == null) { // return BuildSimpleResult(2, $"当前货位 '{model.LocCode}' 无法再绑定容器"); // } // var locCntrRel = db.Queryable<TN_Loc_Container>() // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First(); // if (locCntrRel != null) { // return BuildSimpleResult(3, $"当前容器 '{model.CntrCode}' 已经与 '{locCntrRel.S_LOC_CODE}' 绑定"); // } // loc.N_CURRENT_NUM = 1; // 空箱绑定时容器数必然为 1 // locCntrRel = new TN_Loc_Container { // S_LOC_CODE = model.LocCode, // S_CNTR_CODE = model.CntrCode // }; // using (var tran = db.Ado.UseTran()) { // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) { // tran.CommitTran(); // return BuildSimpleResult(0, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 成功"); // } // else { // tran.RollbackTran(); // return BuildSimpleResult(4, $"绑定容器 '{model.CntrCode}' 与货位 '{model.LocCode}' 失败"); // } // } // } // catch (Exception ex) { // return BuildSimpleEx(ex); // } //} /// <summary> /// 托盘-空托入库(PDA) /// </summary> /// <param name="model"></param> /// <returns></returns> public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) { var taskName = TaskName.T托盘_空托入库; var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.T托盘_空托入库; var startAreaName = AreaName.K空托入库接驳区; var endAreaName = AreaName.K空托存放区; try { // 现在PDA没有单独的绑定流程，绑定在入库时完成 var startLoc = db.Queryable<TN_Location>() .Where(l => l.S_CODE == model.StartLoc) // 指定：起点货位 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空 .Where(l => Settings.AreaMap[AreaName.K空托入库接驳区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .First(); if (startLoc == null) { @@ -276,17 +169,6 @@ LogHelper.Info(info); return NewSimpleResult(2, info); } // 查看容器与起点货位是否绑定 //var locCntrRel = db.Queryable<TN_Loc_Container>() // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode) // .First(); //if (locCntrRel == null) { // info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}"; // LogHelper.Info(info); // return NewSimpleResult(3, info); //} // 绑定货位和容器号 var locCntrRel = new TN_Loc_Container { @@ -297,14 +179,14 @@ // TODO 暂定选择最低层按区位顺序入库，后面待修改 var endLoc = db.Queryable<TN_Location>() .Where(l => Settings.AreaMap[AreaName.K空托存放区].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求 .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) .OrderBy(l => new { l.N_LAYER, row=SqlFunc.Desc(l.S_AREA_CODE) }) .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) .First(); if (endLoc == null) { info = $"暂时没有符合条件的终点放货位"; info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物"; LogHelper.Info(info); return NewSimpleResult(4, info); } @@ -372,15 +254,19 @@ /// </summary> /// <returns></returns> public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) { var taskName = TaskName.H好运箱_空箱入库; var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.H好运箱_空箱入库; var startAreaName = AreaName.K空箱入库接驳区; var endAreaName = AreaName.K空箱货架区; try { var startLoc = db.Queryable<TN_Location>() .Where(l => l.S_CODE == model.StartLoc) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) // 绑定前货位为空 .Where(l => Settings.AreaMap[AreaName.K空箱入库接驳区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .First(); if (startLoc == null) { @@ -388,17 +274,6 @@ LogHelper.Info(info); return NewSimpleResult(2, info); } // 查看容器与起点货位是否绑定 //var locCntrRel = db.Queryable<TN_Loc_Container>() // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode) // .First(); //if (locCntrRel == null) { // info = $"起点位置{model.StartLoc}没有绑定容器{model.CntrCode}"; // LogHelper.Info(info); // return NewSimpleResult(3, info); //} // 绑定货位和容器号 var locCntrRel = new TN_Loc_Container { @@ -409,14 +284,16 @@ // TODO 暂定选择最低层顺序入库，后面待修改 var endLoc = db.Queryable<TN_Location>() .Where(l => Settings.AreaMap[AreaName.K空箱货架区].Contains(l.S_AREA_CODE)) .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 0) .OrderBy(l => new { l.N_LAYER }) .First(); if (endLoc == null) { return NewSimpleResult(4, $"暂时没有符合条件的终点放货位"); info = $"在'{endAreaName}'中没有找到合适的终点货位，需要满足：未上锁、无货物"; LogHelper.Info(info); return NewSimpleResult(4, info); } var cntId = locCntrRel.S_CNTR_CODE; @@ -483,51 +360,31 @@ /// <param name="model"></param> /// <returns></returns> public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) { var taskName = TaskName.T托盘_空托上线; var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.T托盘_空托上线; var startAreaName = AreaName.K空托存放区; try { // 找符合物料信息的货位 //var startLoc = db.Queryable<TN_Location>() // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 联表：货位容器关系表 // .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 联表：容器与物料类型绑定表 // .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位 // .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：没有锁状态 // .Where(l => l.N_CURRENT_NUM == 1) // 筛选：有货货位 // .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 找指定容器号 // .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 确保容器编码绑定的物料编码与所需一致 // .First(); //if (startLoc == null) { // info = $"在空托存放区中，找不到符合{model.ItemCode}物料，且编码为{model.CntId}的空托盘"; // LogHelper.Info(info); // return NewSimpleResult(2, info); //} //var locCntrRel = db.Queryable<TN_Loc_Container>().First( // a => a.S_LOC_CODE == startLoc.S_CODE // && a.S_CNTR_CODE == model.CntId); //if (locCntrRel == null) { // return NewSimpleResult(3, $"起点位置 '{startLoc.S_CODE}' 没有绑定容器 '{model.CntId}'"); //} var cntrItemRel = db.Queryable<TN_Container_Item>() .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode) // 查容器-物料类型表 var cntrItemRel = db.Queryable<TN_Container_ItemType>() .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘") .First(); if (cntrItemRel == null) { info = $"容器{model.CntId}不符合物料{model.ItemCode}：没有在容器物料类型登记表中找到"; // 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错 // 如果不存在，不作限制（视作第一次上线） if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) { info = $"容器{model.CntId}已经与物料类型{cntrItemRel.S_ITEM_CODE}绑定，无法用于装载物料{model.ItemCode}"; LogHelper.Info(info); return NewSimpleResult(2, info); } var startLoc = db.Queryable<TN_Location>() .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 联表：货位容器关系表 .Where(l => Settings.AreaMap[AreaName.K空托存放区].Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位 .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 找指定容器号 .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 限定在空托存放区中找容器货位 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：没有锁状态 .Where(l => l.N_CURRENT_NUM == 1) // 筛选：有货货位 .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 找指定容器号 .First(); if (startLoc == null) { @@ -605,40 +462,37 @@ /// <param name="model"></param> /// <returns></returns> public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) { var taskName = TaskName.H好运箱_空箱上线; var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.H好运箱_空箱上线; var startAreaName = AreaName.K空托存放区; try { var startLoc = db.Queryable<TN_Location>() .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) .Where(l => Settings.AreaMap[AreaName.K空箱货架区].Contains(l.S_AREA_CODE)) .Where((l, c) => c.S_CNTR_CODE == model.CntId) .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") .Where(l => l.N_CURRENT_NUM == 1) .Where((l, c) => c.S_CNTR_CODE == model.CntId) .First(); if (startLoc == null) { info = $"在空箱存放区中，找不到编码为{model.CntId}的空好运箱"; info = $"在'{startAreaName}'中，找不到编码为{model.CntId}的空好运箱"; LogHelper.Info(info); return NewSimpleResult(2, info); } //var locCntrRel = db.Queryable<TN_Loc_Container>().First( // a => a.S_LOC_CODE == startLoc.S_CODE // && a.S_CNTR_CODE == model.CntId); //if (locCntrRel == null) { // return NewSimpleResult(3, $"起点位置 '{startLoc.S_CODE}' 没有绑定容器 '{model.CntId}'"); //} var endLoc = db.Queryable<TN_Location>() .Where(l => Settings.AreaMap[AreaName.B包装区].Contains(l.S_AREA_CODE)) //.Where(l => Settings.AreaMap[AreaName.B包装区].Contains(l.S_AREA_CODE)) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) .First(); if (endLoc == null) { return NewSimpleResult(4, $"终点位置 不存在或不具备放货要求"); info = $"终点位置 不存在或不具备放货要求"; LogHelper.Info(info); return NewSimpleResult(4, info); } var cntId = model.CntId; @@ -699,9 +553,12 @@ /// <param name="model"></param> /// <returns></returns> public static SimpleResult QualifiedBack(QualifiedBackInfo model) { var taskName = TaskName.C抽检_合格回库; var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.C抽检_合格回库; var startAreaName = AreaName.C抽检区; try { var cgDetail = db.Queryable<TN_CG_Detail>() .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode) @@ -715,21 +572,15 @@ .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE) .First(); //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 == cgDetail.S_CNTR_CODE) // 指定容器号 // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁 // .First(); var startLoc = db.Queryable<TN_Location>() .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE) .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 1) .Where(l => Settings.AreaMap[AreaName.C抽检区].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .First(); if (startLoc == null) { info = "没有找到合适的起点货位"; info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物"; LogHelper.Info(info); return NewSimpleResult(0, info); } @@ -753,9 +604,10 @@ return NewSimpleResult(2, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}"); } if (endLoc == null) { return NewSimpleResult(3, "查询：没有找到合适的终点货位"); info = "查询：没有找到合适的终点货位"; LogHelper.Info(info); return NewSimpleResult(3, info); } cgDetail.N_ITEM_STATE = 0; @@ -951,7 +803,9 @@ .First(); if (locCntrRel == null) { return NewSimpleResult(2, $"起点货位 {model.StartLoc}"); info = $"没有找到起点货位{model.StartLoc}，或不具备取货要求：未上锁、有货物"; LogHelper.Info(info); return NewSimpleResult(3, info); } var endLoc = new TN_Location(); @@ -973,14 +827,10 @@ endLoc = null; } //var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE) // .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 // .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器 // .First(); if (endLoc == null) { return NewSimpleResult(3, $"不存在合适的终点货位可以回库"); info = "查询：没有找到合适的终点货位"; LogHelper.Info(info); return NewSimpleResult(3, info); } var cntId = locCntrRel.S_CNTR_CODE; var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName); @@ -1178,9 +1028,10 @@ var targetNum = model.Qty; var info = ""; try { var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode && a.N_ITEM_NUM > targetNum). OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First(); var targetCg = db.Queryable<TN_CG_Detail>() .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo) .Where(a => a.N_ITEM_NUM > targetNum) .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First(); if (targetCg != null) //刚好有一行满足条件 { result.Add(targetCg); @@ -1300,10 +1151,74 @@ public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) { var db = new SqlHelper<object>().GetInstance(); var orderNo = GenerateOrderNo("出库单号", "ON"); var info = ""; try { // TODO return NewErpResult(0, info); if (string.IsNullOrEmpty(orderNo)) { info = "出库单号不能为空"; LogHelper.Info(info); return NewErpResult(2, info); } var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo { BatchNo = model.BatchNo, CntrType= model.CntrType, ItemCode= model.ItemCode, EndArea= model.EndArea, ForcedOut= model.ForcedOut, Qty= model.Qty, Spe = model.Spe }); if (cgDetailList.Count == 0) { info = "没有合适的物料可以出库"; LogHelper.Info(info); return NewErpResult(3, info); } var order = new TN_Outbound_Order { S_NO = orderNo, S_ITEM_CODE = model.ItemCode, S_BATCH = model.BatchNo, N_END_NUM = model.Qty, //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY), S_END_AREA = model.EndArea, S_BS_NO = model.ErpNo, S_BS_TYPE = "ERP", }; var detailList = new List<TN_Outbound_Detail>(); foreach (var cgDetail in cgDetailList) { var detail = new TN_Outbound_Detail { S_OO_NO = orderNo, S_ITEM_CODE = cgDetail.S_ITEM_CODE, S_BATCH_NO = cgDetail.S_BATCH_NO, S_CNTR_CODE = cgDetail.S_CNTR_CODE, N_COUNT = cgDetail.N_ITEM_NUM, S_END_AREA = model.EndArea }; detailList.Add(detail); } using (var tran = db.Ado.UseTran()) { if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) { tran.RollbackTran(); info = "生成出库单失败：" + JsonConvert.SerializeObject(order); LogHelper.Info(info); return NewErpResult(2, info); } if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) { tran.RollbackTran(); info = "生成出库单明细失败"; LogHelper.Info(info); return NewErpResult(4, info); } tran.CommitTran(); } return NewErpResult(0, "生成出库单成功"); } catch (Exception ex) { info = $"发生了异常：{ex.Message}"; api/ApiModel.cs
@@ -175,12 +175,12 @@ /// 物料规格 /// </summary> [JsonProperty("s_spec")] public string s_spec { get; set; } public string Spec { get; set; } /// <summary> /// 数量 /// </summary> [JsonProperty("n_num")] public int n_num { get; set; } public int Num { get; set; } /// <summary> /// 起点货位信息 /// </summary> @@ -273,54 +273,20 @@ public string StartLoc { get; set; } } public class EmptyInboundDetailInfo { } //public class EmptyOnlineInfo { // public string ItemCode { get; set; } // public string ItemName { get; set; } // public string PatchNo { get; set; } // public string EndLoc { get; set; } //} public class EmptyOnlinePalletInfo { /// <summary> /// 物料编码 /// </summary> [JsonProperty("item_code")] public string ItemCode { get; set; } ///// <summary> ///// 物料名称 ///// </summary> // //[JsonProperty("item_name")] //public string ItemName { get; set; } /// <summary> /// 批次号 /// </summary> [JsonProperty("batch_no")] public string BatchNo { get; set; } /// <summary> /// 物料规格 /// </summary> [JsonProperty("spe")] public string Spe { get; set; } /// <summary> /// 容器编码 /// </summary> public string Spec { get; set; } // 物料规格 [JsonProperty("cnt_id")] public string CntId { get; set; } // 容器类型 = 托盘 public string CntId { get; set; } // 容器类型 = 托盘 } public class EmptyOnlineGoodpackInfo { // 容器类型 = 好运箱 /// <summary> /// 容器编码 /// </summary> [JsonProperty("cnt_id")] public string CntId { get; set; } public string CntId { get; set; } // 容器类型 = 好运箱 } /// <summary> @@ -333,12 +299,6 @@ [JsonProperty("item_code")] public string ItemCode { get; set; } ///// <summary> ///// 物料名称 ///// </summary> // //[JsonProperty("item_name")] //public string ItemName { get; set; } /// <summary> /// 物料规格 /// </summary> @@ -490,21 +450,10 @@ /// 物料信息下发同步 数据类 /// </summary> public class CgInfoSyncInfo { /// <summary> /// 物料名称 /// </summary> [JsonProperty("itemName")] public string ItemName { get; set; } /// <summary> /// 产品牌号 /// </summary> [JsonProperty("itemCode")] public string ItemCode { get; set; } /// <summary> /// 批次号 /// </summary> [JsonProperty("batchNo")] public string BatchNo { get; set; } @@ -577,11 +526,52 @@ /// </summary> public class ErpSendOutboundOrderInfo { public string ErpNo { get; set; } // ERP 单号 /// <summary> /// 物料编码 /// </summary> [JsonProperty("item_code")] public string ItemCode { get; set; } ///// <summary> ///// 物料名称 ///// </summary> //[JsonProperty("item_name")] //public string ItemName { get; set; } /// <summary> /// 物料规格 /// </summary> [JsonProperty("spe")] public string Spe { get; set; } /// <summary> /// 批次号 /// </summary> [JsonProperty("batch_no")] public string BatchNo { get; set; } /// <summary> /// 需出库数量 /// </summary> [JsonProperty("qty")] public int Qty { get; set; } /// <summary> /// 容器类型 /// </summary> [JsonProperty("cntr_type")] public string CntrType { get; set; } /// <summary> /// 出库终点货区 /// </summary> [JsonProperty("end_area")] public string EndArea { get; set; } /// <summary> /// 是否强制出库 /// </summary> [JsonProperty("force_out")] public bool ForcedOut { get; set; } } public class PickUpReturnErpInfo { public string LocCode { get; set; } } } } api/DebugController.cs
@@ -4,12 +4,15 @@ using System.Web.Http; using HH.WCS.Mobox3.DSZSH.core; using HH.WCS.Mobox3.DSZSH.device; using HH.WCS.Mobox3.DSZSH.models; using HH.WCS.Mobox3.DSZSH.util; using HH.WCS.Mobox3.DSZSH.wms; using Newtonsoft.Json; using static HH.WCS.Mobox3.DSZSH.api.ApiModel; using static HH.WCS.Mobox3.DSZSH.core.Monitor; namespace HH.WCS.Mobox3.DSZSH.api { /// <summary> @@ -267,19 +270,19 @@ var db = new SqlHelper<object>().GetInstance(); try { var cgDetailList = db.Queryable<TN_CG_Detail>().ToList(); var cntrItemList = new List<TN_Container_Item>(); var cntrItemList = new List<TN_Container_ItemType>(); foreach (var cgDetail in cgDetailList) { if (db.Queryable<TN_Container_Item>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) { if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) { continue; } cntrItemList.Add(new TN_Container_Item { cntrItemList.Add(new TN_Container_ItemType { S_CNTR_CODE = cgDetail.S_CNTR_CODE, S_ITEM_CODE = cgDetail.S_ITEM_CODE, }); } if (db.Insertable<TN_Container_Item>(cntrItemList).ExecuteCommand() <= 0) { if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) { return "插入失败"; } @@ -301,12 +304,12 @@ public string InsertContainerItem(InsertCntrItemInfo cgDetail) { var db = new SqlHelper<object>().GetInstance(); try { var cntrItem = new TN_Container_Item { var cntrItem = new TN_Container_ItemType { S_CNTR_CODE = cgDetail.Cntr, S_ITEM_CODE = cgDetail.Item, }; if (db.Insertable<TN_Container_Item>(cntrItem).ExecuteCommand() <= 0) { if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) { return "插入失败"; } @@ -318,6 +321,169 @@ return ex.Message; } } [HttpPost] [Route("AddInboundTask")] public string AddInboundTask(AddInboundTaskInfo model) { var db = new SqlHelper<object>().GetInstance(); var info = ""; var taskName = TaskName.T托盘_满托下线入库; var startAreaName = AreaName.B包装区; try { var itemCode = model.ItemCode; var batchNo = model.BatchNo; var cntrCode = model.CntrCode; var startLocCode = model.StartLoc; var cgDetail = new TN_CG_Detail { S_ITEM_CODE = itemCode, S_BATCH_NO = batchNo, S_CNTR_CODE = cntrCode, }; // BEG 每次轮询都检查对应容器是否已登记，登记保持不变，未登记则插入 // TODO 可能会采用每次上线都更新的逻辑，后面再看 var cntrItemRel = db.Queryable<TN_Container_ItemType>() .Where(i => i.S_CNTR_CODE == cntrCode).First(); var insertTable = cntrItemRel == null; if (insertTable) { // 暂定在满托下线入库的时候，登记托盘容器-物料号关系（后面可能会改成系统维护） cntrItemRel = new TN_Container_ItemType { S_ITEM_CODE = itemCode, S_CNTR_CODE = cntrCode, S_CNTR_TYPE = "托盘", }; } // END var startLoc = db.Queryable<TN_Location>() .Where(l => l.S_CODE == startLocCode) // 指定：起点货位号 .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁 .Where(l => l.N_CURRENT_NUM == 0) .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 起点货区符合任务要求 .First(); if (startLoc == null) { info = $"起点位置 '{startLocCode}' 不存在或不具备取货要求"; LogHelper.Info(info); return info; } // 绑定货位和容器号 var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLocCode, S_CNTR_CODE = cgDetail.S_CNTR_CODE, S_CNTR_TYPE = "托盘", }; var endLoc = db.Queryable<TN_Location>() .Where(a => Settings.AreaMap[AreaName.K空托存放区].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) // 筛选：空货位 .OrderBy(l => l.N_LAYER) .First(); if (endLoc == null) { info = "空托入库暂时没有合适的货位可以入库"; LogHelper.Info(info); return info; } 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.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"插入容器货品信息表失败：物料编码{cgDetail.S_ITEM_CODE}，容器编码{cgDetail.S_CNTR_CODE}"; LogHelper.Info(info); return info; } // BEG 插入或更新容器与物料类型的绑定表 if (insertTable) { if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}"; LogHelper.Info(info); return info; } } //else { // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) { // tran.RollbackTran(); // info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}"; // LogHelper.Info(info); // return info; // } //} // END if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"插入货位容器关系表失败：货位编码{locCntrRel.S_LOC_CODE}，容器编码{locCntrRel.S_CNTR_CODE}"; LogHelper.Info(info); return info; } 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}'失败：更新起点货位{startLoc.S_CODE}锁状态失败"; LogHelper.Info(info); return info; } 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}'失败：更新终点货位{endLoc.S_CODE}锁状态失败"; LogHelper.Info(info); return info; } if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}"; LogHelper.Info(info); return info; } tran.CommitTran(); info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}"; LogHelper.Info(info); return info; } } catch (Exception ex) { LogHelper.InfoEx(ex); return ex.Message; } } } public class AddInboundTaskInfo { public string ItemCode { get; set; } public string BatchNo { get; set; } public string CntrCode { get; set; } public string StartLoc { get; set; } } /// <summary> api/ErpController.cs
@@ -16,6 +16,8 @@ /// </summary> /// <param name="model"></param> /// <returns></returns> [HttpPost] [Route("ErpSendOutboundOrder")] public ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) { var apiName = "ERP下发出库任务"; LogHelper.InfoApi(apiName, model); api/MoboxController.cs
@@ -14,7 +14,7 @@ [RoutePrefix("api")] public class MoboxController : ApiController { /// <summary> /// 好运箱-满托下线入库(PDA) /// 好运箱-满箱下线入库(PDA) /// </summary> /// <param name="model"></param> /// <returns></returns> core/Monitor.cs
@@ -67,14 +67,14 @@ }; // BEG 每次轮询都检查对应容器是否已登记，登记则更新，未登记则插入 var cntrItemRel = db.Queryable<TN_Container_Item>() var cntrItemRel = db.Queryable<TN_Container_ItemType>() .Where(i => i.S_CNTR_CODE == cntrCode).First(); var insertTable = cntrItemRel == null; if (insertTable) { // 暂定在满托下线入库的时候，登记托盘容器-物料号关系（后面可能会改成系统维护） cntrItemRel = new TN_Container_Item { cntrItemRel = new TN_Container_ItemType { S_ITEM_CODE = itemCode, S_CNTR_CODE = cntrCode, }; @@ -137,7 +137,7 @@ // BEG 插入或更新容器与物料类型的绑定表 if (insertTable) { if (db.Insertable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) { if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}"; LogHelper.Info(info); @@ -145,7 +145,7 @@ } } else { if (db.Updateable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) { if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) { tran.RollbackTran(); info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}"; LogHelper.Info(info); @@ -288,7 +288,7 @@ LogHelper.Info($"轮询--{taskName}：没有找到合适的终点货位！单号'{detail.S_OO_NO}'要求终点库区为'{detail.S_END_AREA}'"); continue; } detail.N_B_STATE = 2; var cntId = detail.S_CNTR_CODE; core/WCSCore.cs
@@ -88,9 +88,9 @@ var nextOutboundTask = Task.Run(() => { UpdateOutboundTaskState(3); }); var pickUpReturnErpTask = Task.Run(() => { PickUpReturnErp(TN_Task); }); //var pickUpReturnErpTask = Task.Run(() => { // PickUpReturnErp(TN_Task); //}); } break; @@ -110,6 +110,10 @@ // }); //} var recordTask = Task.Run(() => { RecordTaskTable(TN_Task); }); break; case 7: // 异常 TaskProcess.OperateStatus(TN_Task, 7); // 异常处理 @@ -124,6 +128,66 @@ return true; } private static void RecordTaskTable(TN_Task task) { var db = new SqlHelper<object>().GetInstance(); var info = ""; try { var cgDetail = new TN_CG_Detail(); var emptyTask = false; if (task.S_TYPE != TaskName.H好运箱_空箱上线 && task.S_TYPE != TaskName.H好运箱_空箱入库 && task.S_TYPE != TaskName.T托盘_空托上线 && task.S_TYPE != TaskName.T托盘_空托入库) { // 非空托任务（空托任务无法在CGDetail查到物料信息） emptyTask= true; cgDetail = db.Queryable<TN_CG_Detail>() .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE) .First(); if (cgDetail == null) { info = $"任务{task.S_CODE}完成，记录出入库失败：无法在容器货品明细表中找到托盘{task.S_CNTR_CODE}对应的物料"; LogHelper.Info(info); } } var isInbound = false; var inboundTasks = new List<string> { TaskName.H好运箱_满箱下线入库, TaskName.H好运箱_空箱入库, TaskName.T托盘_满托下线入库, TaskName.T托盘_空托入库, TaskName.C抽检_合格回库, TaskName.C抽检_不合格移库, TaskName.Y移库 }; if (inboundTasks.Contains(task.S_TYPE)) { isInbound= true; } var record = new TN_Record_Table { S_ITEM_CODE = cgDetail.S_ITEM_CODE, S_BATCH_NO = cgDetail.S_BATCH_NO, S_ITEM_NAME = cgDetail.S_ITEM_NAME, S_LOC_CODE = isInbound ? task.S_END_LOC : task.S_START_LOC, // 入库记录终点货位，出库记录起点货位 S_CNTR_CODE = task.S_CNTR_CODE, S_ITEM_SPEC = cgDetail.S_ITEM_SPEC, S_NET_WEIGHT = cgDetail.S_NET_WEIGHT, S_QUALITY_GRADE = cgDetail.S_QUALITY_GRADE, S_STANDARD = cgDetail.S_STANDARD, S_TASK_NO = task.S_CODE, T_RECORD_TIME = DateTime.Now, S_TYPE = task.S_TYPE, S_BS_CODE = task.S_BS_TYPE, }; if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) { info = "插入出入库记录表失败：" + JsonConvert.SerializeObject(record); LogHelper.Info(info); return; } info = "插入出入库记录表成功"; LogHelper.Info(info); } catch (Exception ex) { LogHelper.InfoEx(ex); } } public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) { var db = new SqlHelper<object>().GetInstance(); var info = ""; models/TN_Container_ItemType.cs
New file @@ -0,0 +1,23 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using SqlSugar; namespace HH.WCS.Mobox3.DSZSH.models { /// <summary> /// 容器-物料类型 关系表（好运箱也记录，防止后续需求变更） /// </summary> /// <remarks> /// 1. 空托上线时，如果关系表中没有托盘信息，不检查；否则，判断托盘是否合适<br/> /// 2. 满托下线时，如果关系表中没有托盘信息，记录进去；否则，不改变原有记录（不更新） /// </remarks> [SugarTable("TN_Container_ItemType")] public class TN_Container_ItemType : BaseModel { public string S_CNTR_CODE { get; set; } public string S_CNTR_TYPE { get; set; } public string S_ITEM_CODE { get; set; } } } models/TN_Record_Table.cs
@@ -11,7 +11,7 @@ /// 出入记录表 /// </summary> [SugarTable("TN_Record_Table")] public class TN_Record_Table { public class TN_Record_Table : BaseModel { /// <summary> /// 任务号 /// </summary> @@ -28,6 +28,11 @@ public string S_ITEM_CODE { get; set; } /// <summary> /// 物料名称 /// </summary> public string S_ITEM_NAME { get; set; } /// <summary> /// 物料规格 /// </summary> public string S_ITEM_SPEC { get; set; } @@ -38,11 +43,6 @@ public string S_BATCH_NO { get; set; } /// <summary> /// 物料名称 /// </summary> public string S_ITEM_NAME { get; set; } /// <summary> /// 记录时间 /// </summary> public DateTime T_RECORD_TIME { get; set; } @@ -50,17 +50,12 @@ /// <summary> /// 数量 /// </summary> public int F_QTY { get; set; } = 0; public int N_QTY { get; set; } = 0; /// <summary> /// 起点货位编码 /// 货位编码（库内货位，入库就是终点，出库就是起点） /// </summary> public string S_START_LOC { get; set; } /// <summary> /// 终点货位编码 /// </summary> public string S_END_LOC { get; set; } public string S_LOC_CODE { get; set; } /// <summary> /// 来源单号 @@ -71,21 +66,6 @@ /// 单据类型 /// </summary> public string S_TYPE { get; set; } /// <summary> /// 托盘初始数量 /// </summary> public float F_INITIAL_QTY { get; set; } = 0; /// <summary> /// 最终数量 /// </summary> public float F_ALL_QTY { get; set; } = 0; /// <summary> /// 物料代码 /// </summary> public string S_ITEM_NO { get; set; } /// <summary> /// 执行标准 util/Settings.cs
@@ -12,7 +12,7 @@ { public static string WebApiUrl { get; set; } public static string NdcApiUrl { get; set; } public static string ErpApiUrl { get; set; } // ERP 反馈接口 public static string ErpApiUrl { get; set; } // ERP 反馈接口URL public static string SqlServer { get; set; } public static string TcpServerIp { get; set; } public static int TcpServerPort { get; set; } @@ -155,14 +155,12 @@ public const string H好运箱_满箱下线入库 = "好运箱-满箱下线入库"; public const string H好运箱_空箱上线 = "好运箱-空箱上线"; public const string H好运箱_空箱入库 = "好运箱-空箱入库"; public const string H好运箱_空箱绑定 = "好运箱-空箱绑定"; public const string C成品胶出库 = "成品胶出库"; public const string T托盘_满托下线入库 = "托盘-满托下线入库"; public const string T托盘_空托上线 = "托盘-空托上线"; public const string T托盘_空托入库 = "托盘-空托入库"; public const string T托盘_空托绑定 = "托盘-空托绑定"; public const string C抽检_不合格移库 = "抽检-不合格移库"; public const string C抽检_出库 = "抽检-出库"; wms/WCSHelper.cs
@@ -55,7 +55,7 @@ S_END_LOC = endLoc.S_CODE, S_TYPE = type, N_PRIORITY = 3, // 初始优先级默认为：3 N_SCHEDULE_TYPE = 3, // 国自 N_SCHEDULE_TYPE = 1, // NDC N_B_STATE = 0, S_CNTR_CODE = cntId, }; @@ -63,6 +63,25 @@ return TN_Task; } public static TN_Task BuildErpTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string erpNo) { TN_Task TN_Task = new TN_Task() { S_CODE = GenerateTaskNo(), S_START_AREA = startLoc.S_AREA_CODE, S_END_AREA = endLoc.S_AREA_CODE, S_START_LOC = startLoc.S_CODE, S_END_LOC = endLoc.S_CODE, S_TYPE = type, N_PRIORITY = 3, // 初始优先级默认为：3 N_SCHEDULE_TYPE = 1, // NDC N_B_STATE = 0, S_CNTR_CODE = cntId, S_BS_NO = erpNo, S_BS_TYPE = "ERP", }; return TN_Task; } public static TN_Task BuildTask(TN_Loc_Container locCntrRel, TN_Location endLoc, string cntId, string type) { var fromLoc = LocationHelper.GetLocation(locCntrRel.S_LOC_CODE);
