| HTML/views/QualityControl/QualityInformation.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/QualityControl/QualityInformationFrom.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/Wms/appsettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/QualityControl/QualityInformation.html
@@ -347,7 +347,7 @@ title: '添加物料信息', content: 'QualityInformationFrom.html', maxmin: true, area: ['500px', '350px'], area: ['500px', '450px'], btn: ['确定', '取消'], yes: function(index, layero) { var iframeWindow = window['layui-layer-iframe' + index], @@ -360,7 +360,9 @@ //提交 Ajax 成功后，静态更新表格中的数据 var param = { InspectNo: field.InspectNo, ASNNo: field.ASNNo, LotNo: field.LotNo, SkuNo: field.SkuNo, IsQualified: field.IsQualified, }; if(doing) HTML/views/QualityControl/QualityInformationFrom.html
@@ -17,16 +17,28 @@ </div> </div> <div class="layui-form-item"> <label class="layui-form-label">入库单号</label> <div class="layui-input-block" style="width: 70%;"> <input type="text" name="ASNNo" placeholder="请输入入库单号" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">批次号</label> <div class="layui-input-block" style="width: 70%;"> <input type="text" name="LotNo" placeholder="请输入批次号" lay-verify="required" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">物料号</label> <div class="layui-input-block" style="width: 70%;"> <input type="text" name="SkuNo" placeholder="请输入物料号" lay-verify="required" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">审核状态</label> <div class="layui-input-block" style="width: 70%;"> <select name="IsQualified" id="IsQualified" lay-verify=""> <option value=""></option> <!-- <option value=""></option> --> <option value="0">不合格</option> <option value="1" selected>合格</option> </select> Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -120,7 +120,7 @@ .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim())) .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim())) .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())),it=>it.BindNo == model.BindNo) .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())), it => it.BindNo == model.BindNo) .And(m => m.IsDel == "0") .ToExpression(); @@ -591,7 +591,7 @@ .And(m => m.AreaNo.Contains(categoryAreaNo)) .ToExpression();//注意 这一句 不能少 var total = 0; var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a=>a.Depth).OrderBy(a=>a.Column) var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column) .Select(a => new LocatDto() { Id = a.Id, @@ -640,7 +640,7 @@ throw new Exception("该储位状态不是空储位或标志不是正常的"); } //判断当前托盘是否存在绑定信息 if (!string.IsNullOrWhiteSpace(bind.LocatNo)) @@ -1632,7 +1632,7 @@ } //获取该批次最终质检结果 var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First(); var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First(); #region 库存明细 var sd = new DataStockDetail() { @@ -1679,8 +1679,8 @@ sd.OwnerName = notice.CustomerName;//货主名称 } else if (notice.Type == "1" || notice.Type == "5")//1:采购入库,2:其它入库 { sd.SupplierNo= notice.CustomerNo;//供应商编码 { sd.SupplierNo = notice.CustomerNo;//供应商编码 sd.SupplierName = notice.CustomerName;//供应商名称 }
@@ -1,5 +1,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; using Model.ModelDto.BllQualityDto; using Model.ModelVm; @@ -9,6 +10,7 @@ using WMS.Entity.BllQualityEntity; using WMS.Entity.Context; using WMS.Entity.DataEntity; using WMS.Entity.SysEntity; using WMS.IBLL.IBllQualityServer; namespace WMS.BLL.BllQualityServer @@ -87,41 +89,69 @@ { throw new Exception("质检号不可为空，请核查！"); } //验证入库单号是否为空 if (string.IsNullOrEmpty(model.ASNNo)) { throw new Exception("入库单号不可为空，请核查！"); } //验证物料号是否为空 if (string.IsNullOrEmpty(model.SkuNo)) { throw new Exception("物料号不可为空，请核查！"); } //获取物料信息 var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == model.SkuNo); if (sku == null) { throw new Exception("物料信息为空，请核查！"); } //验证批次号是否为空 if (string.IsNullOrEmpty(model.LotNo)) { throw new Exception("批次号不可为空，请核查！"); } int isTui = 0; //验证入库单号是否为空 if (!string.IsNullOrEmpty(model.ASNNo)) { //查询是否为退货入库单据 var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3"); if (Arrival == null) { throw new Exception("只有入库单据为退货入库单可输入 入库单号，请核查！"); } //获取入库单明细 var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo); if (ArrivalDetail == null) { throw new Exception("输入的批次或物料信息与入库单据不符，请核查！"); } isTui = 1; } //查找质检信息中是否存在同批次质检录入记录 BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo); BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo); if (quality != null) { //判断是否为退货入库单 if (isTui == 1) { if (quality.ASNNo == model.ASNNo) { throw new Exception("当前退货入库单已创建质检信息，请勿重复创建！"); } } throw new Exception("当前批次已进行质检，请核查！"); } //查找同批次 同单据 入库单信息、 BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo); ////查找同批次 同单据 入库单信息、 //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo); model.Origin = "WMS"; //来源 model.CreateTime = Db.GetDate(); //创建日期 model.SkuNo = arrivalDetail.SkuNo; //物料号 model.SkuName = arrivalDetail.SkuName; //物料名称 model.SkuNo = sku.SkuNo; //物料号 model.SkuName = sku.SkuName; //物料名称 model.PassQty = 0; //合格数量 model.FailQty = 0; //不合格数量 model.Standard = arrivalDetail.Standard; //规格 model.SupplierLot = arrivalDetail.SupplierLot; //供货批次 model.Standard = sku.Standard; //规格 //model.SupplierLot = arrivalDetail.SupplierLot; //供货批次 //查找库存明细信息 List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo).ToList(); Wms/Wms/appsettings.json
@@ -11,8 +11,7 @@ //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;", //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;", //"ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;", //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;" "ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;" "ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;" //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;" //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;" },
