| HTML/views/SOSetting/ExportNotice.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Pda/View/AsnSetting/WorkshopIn.html | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Pda/View/SoSetting/WorkshopOut.html | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/HttpServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/Logic/AllotSku.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/Wms/Controllers/DownApiController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/SOSetting/ExportNotice.html
@@ -156,8 +156,8 @@ <div class="layui-input-inline" style="width: 220px;"> <select name="PickingArea" id="PickingArea" lay-search> <option value=""></option> <option value="1">1</option> <option value="2">2</option> <option value="17">17工位</option> <option value="18">18工位</option> </select> </div> </div> Pda/View/AsnSetting/WorkshopIn.html
Pda/View/SoSetting/WorkshopOut.html
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1321,15 +1321,15 @@ { throw new Exception("托盘没有出库单信息"); } var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5"); if (task == null) { throw new Exception("没有查询到托盘任务信息"); } if (task.Status != "5") { throw new Exception("任务状态不是等待确认"); } //var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5"); //if (task == null) //{ // throw new Exception("没有查询到托盘任务信息"); //} //if (task.Status != "5") //{ // throw new Exception("任务状态不是等待确认"); //} return detail; } catch (Exception e) @@ -1349,20 +1349,26 @@ try { Db.BeginTran(); var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5"); if (task == null) //var task = Db.Queryable<LogTask>().First(m => m.PalletNo == palletNo && m.IsDel == "0" && m.Status == "5"); //if (task == null) //{ // throw new Exception("没有查询到托盘任务信息"); //} //if (task.Status != "5") //{ // throw new Exception("任务状态不是等待确认"); //} ////任务状态变更为执行完成 //task.Status = "2"; //Db.Updateable(task).ExecuteCommand(); var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList(); if (stockDetail.Count == 0) { throw new Exception("没有查询到托盘任务信息"); throw new Exception("库存托盘没有信息"); } if (task.Status != "5") { throw new Exception("任务状态不是等待确认"); } //任务状态变更为执行完成 task.Status = "2"; Db.Updateable(task).ExecuteCommand(); var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07") && m.IsDel == "0").ToList(); var locat = locatList.FirstOrDefault(m => m.LocatNo == task.EndLocat); var locate = stockDetail.First().LocatNo; var locatList = Db.Queryable<SysStorageLocat>().Where(m=>m.WareHouseNo == "W04" && (m.AreaNo == "B06" || m.AreaNo == "B07" || m.AreaNo == "B09") && m.IsDel == "0").ToList(); var locat = locatList.FirstOrDefault(m => m.LocatNo == locate); //判断托盘储位是否在车间 if (locat == null) { @@ -1371,7 +1377,7 @@ locat.Status = "0"; Db.Updateable(locat).ExecuteCommand(); //判断托盘信息 var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList(); foreach (var item in stockDetail) { if (item.UDF5 != "1" || string.IsNullOrWhiteSpace(item.SONo)) @@ -1383,7 +1389,7 @@ //item.RoadwayNo = ""; //item.AreaNo = ""; item.LocatNo = ""; item.PalletNo = ""; //item.PalletNo = ""; item.LockQty = 0; // 锁定数量更为0 item.Status = "0"; // 状态变为待分配 var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.StockDetailId == item.Id).ToList(); @@ -1396,15 +1402,15 @@ } Db.Updateable(stockDetail).ExecuteCommand(); //托盘变更状态 var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo); if (pallet == null) { throw new Exception("没有查询到托盘信息"); } pallet.Status = "0"; Db.Updateable(pallet).ExecuteCommand(); //var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo); //if (pallet == null) //{ // throw new Exception("没有查询到托盘信息"); //} //pallet.Status = "0"; //Db.Updateable(pallet).ExecuteCommand(); //添加操作日志 new OperationCrServer().AddLogOperationCr("库内作业", "操作日志", palletNo, "编辑", $"车间收货：{palletNo}托盘收货", userId); new OperationCrServer().AddLogOperationCr("PDA模块", "车间收货", palletNo, "完成", $"车间收货：{palletNo}托盘收货", userId); Db.CommitTran(); } catch (Exception e) Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3376,11 +3376,12 @@ try { List<LogTask> logTaskList = new List<LogTask>();//此次出库任务集合，为应对同托盘不同物料出库 //循环分配的信息生成出库任务 foreach (var item in list) { var taskNoStr = ""; string toLocation = string.Empty;//目标位置 // 储位号 var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo; @@ -3390,11 +3391,11 @@ //判断托盘是否在库内 if (string.IsNullOrWhiteSpace(locateNo)) //库外 { if (notice.Type == "0") { flagList.Add(5); continue; } //if (notice.Type == "0") //{ // flagList.Add(5); // continue; //} //判断托盘是否在入库中 var imBl = com.GetImTask(item.PalletNo); if (imBl != null) @@ -3446,8 +3447,6 @@ } #endregion if (locate.Status == "1") //有物品 { @@ -3515,7 +3514,7 @@ Type = "2",//任务类型 0 入库任务 1 出库任务 2 移库任务 Status = "0",//任务状态0：等待执行1正在执行2执行完成 OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单 Msg = "从" + locate.LocatNo + "到" + toLocation + "的出库任务", //关键信息 Msg = "从" + locate.LocatNo + "到" + moveAddress + "的移库任务", //关键信息 }; Db.Insertable(ykTask).ExecuteCommand(); logTaskList.Add(ykTask); @@ -3563,7 +3562,7 @@ IsSuccess = 0, //是否下发成功 0失败 1成功 StartLocat = locate.LocatNo,//起始位置 EndLocat = toLocation,//outMode,//目标位置 EndLocat = outMode,//outMode,//目标位置 PalletNo = item.PalletNo,//托盘码 IsSend = 1,//是否可再次下发 IsCancel = 1,//是否可取消 @@ -3571,11 +3570,11 @@ Type = "1",//任务类型 0 入库任务 1 出库任务 2 移库任务 Status = "0",//任务状态0：等待执行1正在执行2执行完成 OrderType = "1",//0 入库单 1 出库单 2 盘点单 3 移库单 Msg = "从" + locate.LocatNo + "到" + toLocation + "的出库任务", //关键信息 Msg = "从" + locate.LocatNo + "到" + outMode + "的出库任务", //关键信息 }; Db.Insertable(exTask).ExecuteCommand(); logTaskList.Add(exTask); var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation); var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, outMode); outDto1.Add(new OutCommandDto() { PalletNo = item.PalletNo,//托盘号 @@ -3715,23 +3714,23 @@ try { //var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss") //response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS"); //var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss") var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss") response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS"); var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss") //////解析返回数据 //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response); //if (wcsModel.StatusCode == 0) //{ // //更改任务的发送返回时间// // new TaskServer().EditTaskIssueOk(list2, time1, time2); // str += "下发成功"; //} //if (wcsModel.StatusCode == -1) //{ // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg); // throw new Exception(wcsModel.Msg); //} ////解析返回数据 var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response); if (wcsModel.code == 200) { //更改任务的发送返回时间// new TaskServer().EditTaskIssueOk(list2, time1, time2); str += "下发成功"; } else { new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message); throw new Exception(wcsModel.message); } } catch (Exception ex) { Wms/WMS.BLL/HttpServer.cs
@@ -534,9 +534,9 @@ { areaList.Add(item); } var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList(); //巷道组信息 var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo)) var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo)) .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList(); #endregion @@ -1231,7 +1231,7 @@ else { locate2.Status = "1"; Db.Updateable(locate).ExecuteCommand(); Db.Updateable(locate2).ExecuteCommand(); } Db.Updateable(stockDetail).ExecuteCommand(); Wms/WMS.BLL/Logic/AllotSku.cs
@@ -252,7 +252,7 @@ //密集库内托盘 var detail2 = list.Where(m => m.WareHouseNo == "W01").ToList(); var detail3 = list.GroupBy(m=>m.RoadwayNo).OrderBy(m=>m.Key).ToList(); var detail3 = detail2.GroupBy(m=>m.RoadwayNo).OrderBy(m=>m.Key).ToList(); foreach (var item in detail3) { Wms/Wms/Controllers/DownApiController.cs
@@ -131,7 +131,7 @@ { var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str); return Ok(new { code = 0, msg = "str" }); return Ok(new { code = 0, msg = str }); } else if (house == "W02") {
