| HTML/views/ASNSetting/PalletBind.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Pda/View/AsnSetting/productEnterQuantity.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/ASNSetting/PalletBind.html
@@ -62,22 +62,40 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">所属仓库</label> <div class="layui-input-inline"> <select name="WareHouseNo" id="WareHouseNo" lay-filter="ImportExecuteFlag" lay-search> <option value=""></option> <option value="W01">力诺立体库</option> <option value="W02">力诺平库</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">所属巷道</label> <div class="layui-input-inline"> <select name="RoadwayNo" id="RoadwayNo" lay-filter="ImportExecuteFlag" lay-search> <option value=""></option> <option value="R01">01巷道</option> <option value="R02">02巷道</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">所属仓库</label> <div class="layui-input-inline"> <select name="WareHouseNo" id="WareHouseNo" lay-filter="ImportExecuteFlag" lay-search> <option value=""></option> <option value="W01">09仓库</option> <option value="W02">09零箱库</option> <option value="R03">03巷道</option> <option value="R04">04巷道</option> <option value="R05">05巷道</option> <option value="R06">06巷道</option> <option value="R07">07巷道</option> <option value="R08">08巷道</option> <option value="R09">09巷道</option> <option value="R10">10巷道</option> <option value="R11">11巷道</option> <option value="R12">12巷道</option> <option value="R13">13巷道</option> <option value="R14">14巷道</option> <option value="R15">15巷道</option> <option value="R16">16巷道</option> <option value="R17">17巷道</option> <option value="R18">18巷道</option> <option value="R19">19巷道</option> <option value="R20">20巷道</option> </select> </div> </div> @@ -340,6 +358,24 @@ switch (d.RoadwayNo) { case "R01": return '01巷道'; case "R02": return '02巷道'; case "R03": return '03巷道'; case "R04": return '04巷道'; case "R05": return '05巷道'; case "R06": return '06巷道'; case "R07": return '07巷道'; case "R08": return '08巷道'; case "R09": return '09巷道'; case "R10": return '10巷道'; case "R11": return '11巷道'; case "R12": return '12巷道'; case "R13": return '13巷道'; case "R14": return '14巷道'; case "R15": return '15巷道'; case "R16": return '16巷道'; case "R17": return '17巷道'; case "R18": return '18巷道'; case "R19": return '19巷道'; case "R20": return '20巷道'; default: return ""; }
@@ -311,6 +311,7 @@ </div> </div> </td> <td></td> </tr> <tr> <td> @@ -921,17 +922,29 @@ if (res.code == 0) { //成功 asnDetails = res.data; for (var i = 0; i < res.data.length; i++) { if (i == 0) { $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i] .SkuName); } else { $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i] .SkuName); } if (res.data[i].LotNo != null) { $("#goodSelect1").append("-" + res.data[i].LotNo + if(skuNo!='' && skuNo==res.data[i].SkuNo){ if (i == 0) { $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i] .SkuName); } else { $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i] .SkuName); } if (res.data[i].LotNo != null) { $("#goodSelect1").append("-" + res.data[i].LotNo + '</option>'); } }else { if(res.data[i].LotNo=='' || res.data[i].LotNo == null){ $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i] .SkuName + '</option>'); }else{ $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i] .SkuName + "-" + res.data[i].LotNo + '</option>'); } } } Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -249,6 +249,15 @@ throw new Exception("单据类型不可为空!"); } } //判断是否为采购入库单据或车间余料退回入库 // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库 if (model.Type == "1" || model.Type == "4") { if (!string.IsNullOrWhiteSpace(model.LotNo)) { throw new Exception("采购入库或余料退回不可输入批次，不可编辑!"); } } sqlString += "Insert into BllArrivalNotice (ASNNo,Type,Origin,CustomerNo,"; sqlString += "CustomerName,LotNo,LotText,SupplierLot,CreateUser) values ( "; @@ -342,6 +351,16 @@ string sqlDetailStr = string.Empty; try { //判断是否为采购入库单据或车间余料退回入库 // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库 if (model.Type == "1" || model.Type == "4") { if (!string.IsNullOrWhiteSpace(model.LotNo)) { strMessage = "-1:采购入库或余料退回不可输入批次，不可编辑;"; return strMessage; } } if (model.Origin != "录入") { strMessage = "-1:上游系统下发的单据，不可编辑;"; @@ -512,9 +531,9 @@ sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' "; sqlString += $"WHERE ASNNo = '{model.ASNNo}';"; //判断是否为采购入库单据 //判断是否为采购入库单据或车间余料退回入库 // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库 if (model.Type == "1") if (model.Type == "1" || model.Type == "4") { //获取单据生成对应标签 var list = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.Status == "0" && a.BindNo == null); Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
@@ -15,7 +15,7 @@ namespace WMS.BLL.BllAsnServer { public class AuditLogServer: DbHelper<BllAuditLog>, IAuditLogServer public class AuditLogServer : DbHelper<BllAuditLog>, IAuditLogServer { private static readonly SqlSugarScope Db = DataContext.Db; @@ -29,22 +29,22 @@ try { Expression<Func<BllAuditLog, bool>> item = Expressionable.Create<BllAuditLog>() .AndIF(!string.IsNullOrWhiteSpace(model.AsnNo),it=>it.OrderNo.Contains(model.AsnNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.Status),it=>it.Status == model.Status) .AndIF(!string.IsNullOrWhiteSpace(model.StartTime),it=> it.CreateTime >= Convert.ToDateTime(model.StartTime)) .AndIF(!string.IsNullOrWhiteSpace(model.EndTime),it=> it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1)) .And(it=>it.IsDel=="0") .AndIF(!string.IsNullOrWhiteSpace(model.AsnNo), it => it.OrderNo.Contains(model.AsnNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status) .AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime)) .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1)) .And(it => it.IsDel == "0") .ToExpression(); var total = 0; var data = GetAllWhereAsync(item) .LeftJoin<SysUserInfor>((a, b ) => a.CreateUser == b.Id) .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id) .LeftJoin<SysUserInfor>((a, b, c) => a.AuditUser == c.Id) .Select((a, b, c) => new AuditLogDto() { Id = a.Id, OrderNo = a.OrderNo, PalletNo = a.PalletNo, Msg = a.Msg, Status = a.Status, Reason = a.Reason, @@ -68,11 +68,11 @@ } //编辑审核 public void EditAudit(int id, string status,string opinion,int userId) public void EditAudit(int id, string status, string opinion, int userId) { try { var log = Db.Queryable<BllAuditLog>().First(m => m.Id == id && m.IsDel =="0"); var log = Db.Queryable<BllAuditLog>().First(m => m.Id == id && m.IsDel == "0"); if (log == null) { throw new Exception("未查询到审核信息，请核实"); @@ -156,7 +156,7 @@ .First(m => m.IsDel == "0" && m.LocatNo == item.LocatNo); if (item.Qty != null) { if (item.LockQty>0) if (item.LockQty > 0) { throw new Exception("当前物料批次已被分配，无法撤销"); } @@ -197,9 +197,12 @@ { if (demo2.Origin != "WMS") { demo2.ASNNo = null; demo2.ASNDetailNo = null; } if (notice.Type != "1" || notice.Type != "4") { demo2.ASNNo = null; demo2.ASNDetailNo = null; } } demo2.BindNo = null; demo2.PalletNo = null; demo2.Status = "0"; @@ -246,7 +249,7 @@ { Db.Updateable(stock).ExecuteCommand(); } } Db.Deleteable(item).ExecuteCommand(); @@ -404,7 +407,7 @@ if (stockDetail.Qty != null) { stock.Qty -= (int)stockDetail.Qty; } if (stock.Qty == 0) @@ -415,7 +418,7 @@ { Db.Updateable(stock).ExecuteCommand(); } Db.Deleteable(stockDetail).ExecuteCommand(); Db.Deleteable(stockInfo).ExecuteCommand(); if (locate != null) @@ -435,14 +438,14 @@ bind.TaskNo = ""; bind.CompleteTime = null; Db.Updateable(bind).ExecuteCommand(); } else { throw new Exception("记录的功能编号异常"); } } log.Status = status; log.Opinion = opinion; log.AuditTime = DateTime.Now; Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -48,7 +48,7 @@ .AndIF(!string.IsNullOrWhiteSpace(model.PalletNo), it => it.PalletNo.Contains(model.PalletNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.LocatNo), it => it.LocatNo.Contains(model.LocatNo.Trim())) .AndIF(!string.IsNullOrEmpty(model.RoadwayNo), a => a.RoadwayNo == model.RoadwayNo) .AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.RoadwayNo == model.WareHouseNo) .AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.WareHouseNo == model.WareHouseNo) .AndIF(strList.Count>0, it => strList.Contains((int)it.ASNDetailNo)) .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim())) @@ -1150,7 +1150,7 @@ #region 库存明细 var sd = new DataStockDetail() { LotNo = noticeDetail.LotNo, LotNo = item.LotNo, LotText = noticeDetail.LotText, SupplierLot = noticeDetail.SupplierLot, SkuNo = noticeDetail.SkuNo, @@ -1263,7 +1263,7 @@ SkuNo = noticeDetail.SkuNo, SkuName = noticeDetail.SkuName, Standard = noticeDetail.Standard, LotNo = noticeDetail.LotNo, LotNo = item.LotNo, LotText = noticeDetail.LotText, Qty = item.Qty, LockQty = 0,
