| HTML/views/SOSetting/PalletNoOut.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/SOSetting/PalletNoOut.html
@@ -84,14 +84,17 @@ </div> </div> <div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;"> <label class="layui-form-label">出库口</label> <label class="layui-form-label">出库位置</label> <div class="layui-input-inline"> <select name="PickingArea" id="PickingArea" lay-search> <option value=""></option> <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> <option value="4">4</option> <option value="B020101">一楼-1</option> <option value="B020102">一楼-2</option> <option value="B020103">一楼-3</option> <option value="B020104">一楼-4</option> <option value="B050101">二楼-1</option> <option value="B050102">二楼-2</option> <option value="B050103">二楼-3</option> </select> </div> </div> Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1164,7 +1164,7 @@ } //判断托盘是否在库外 var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo); if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo)) if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo) && stockDetail.WareHouseNo != "W04") { throw new Exception("该托盘已有储位信息，请核实！"); } @@ -4287,10 +4287,18 @@ try { string strMsg = ""; var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.Status == "0" && w.WareHouseNo == "W04"); var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.WareHouseNo == "W04"); if (storageLocat == null) { throw new Exception("-1:地码(储位信息)不存在或非空闲状态，请核查!"); throw new Exception("-1:地码(储位信息)不存在，请核查!"); } if (storageLocat.Status != "0") { var detailInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo); if (detailInfo != null) { throw new Exception("-1:地码(储位信息)非空闲，请核查!"); } } return strMsg; @@ -6087,10 +6095,18 @@ #endregion #region 地码信息(储位信息) var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0"); var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo); if (storageLocat == null) { throw new Exception("储位信息不存在或非空闲状态，请核查!"); throw new Exception("储位信息不存，请核查!"); } if (storageLocat.Status != "0") { var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo); if (detailInfo != null) { throw new Exception("储位不是空闲状态，请核查!"); } } #endregion @@ -6556,10 +6572,10 @@ foreach (var item in stockDetailList) { if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09") { throw new Exception("该托盘非线边回库托盘!"); } //if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09") //{ // throw new Exception("该托盘非线边回库托盘!"); //} //库存总表 var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo); if (stock == null) Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1998,7 +1998,7 @@ .AndIF(!string.IsNullOrWhiteSpace(model.BitPalletMark), m => m.BitPalletMark == model.BitPalletMark) .And(m => !string.IsNullOrWhiteSpace(m.WareHouseNo)) .And(a => a.Status == "0") .And(a => a.WareHouseNo == "W01") .And(a => a.WareHouseNo == "W02") .ToExpression(); var data = await Db.Queryable<DataStockDetail>().Where(item).OrderBy(m => m.LocatNo).ToPageListAsync(model.Page, model.Limit, count); //data.Select(m => m.Status == "0" && m.IsDel == "0"); @@ -2038,6 +2038,12 @@ if (detailGroup.Count > 1) { throw new Exception($"未在库内查询到该托盘信息"); } var locatStart = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == outMode && w.Status == "0"); if (locatStart == null) { throw new Exception($"目标储位不存在或非空闲，请检查"); } @@ -2151,14 +2157,16 @@ outDtoList.Add(new OutCommandDto() { TaskNo = exTask.TaskNo, // 任务号 TaskType = "1",// 任务类型 (出库) PalletNo = palletNo,//托盘号 StartLocate = locate.LocatNo, // 起始位置 StartRoadway = locate.RoadwayNo, EndLocate = outMode, // 目标位置 TaskNo = exTask.TaskNo, // 任务号 TaskType = "1",// 任务类型 (出库) OutMode = outMode, //目标地址 Order = 1 Order = 999, Type = PLCTypeEnum.AGV }); #endregion @@ -2179,6 +2187,8 @@ Db.Updateable(locate).ExecuteCommand(); locatStart.Status = "2";//要入库的储位改变状态 正在入库 Db.Updateable(locate).ExecuteCommand(); #endregion //添加操作日志记录
