| HTML/views/ASNSetting/ArrivalNoticeDetail.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/ASNSetting/BoxInfo.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/ASNSetting/PalletBind.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/BaseSetting/MaterialsForm.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -21,6 +21,7 @@ margin-left: -15px; margin-right: -15px; } .layui-table-mend{ position: relative; } @@ -63,7 +64,9 @@ </select> </div> <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">客户</p></label> <label class="layui-form-label" style="width: 70px;"> <p id="CustomerNamep">客户</p> </label> <div class="layui-input-inline"> <select name="CustomerName" id="CustomerName" lay-verify="" lay-search> <option value=""></option> @@ -80,8 +83,10 @@ <div class="layui-form-item" style="margin-bottom: 0;"> <div class="layui-card"> <div class="layui-card-body"> <div class="position-relative" style="width: 100%;right: 0;"><!-- class="position-relative" --><!-- 自定义表头加上 --> <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"></table> <div class="position-relative" style="width: 100%;right: 0;"> <!-- class="position-relative" --><!-- 自定义表头加上 --> <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"> </table> <!-- #region 自定义表头 --> <div class="headerSetIcon"> <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols"> @@ -392,8 +397,8 @@ console.log(res) $("input[name='ASNNo']").val(res.data[0].ASNNo); $("#Type option[value = '" + res.data[0].Type + "']").prop("selected", true); $("#CustomerName option[value = '" + res.data[0].CustomerNo + "']").prop("selected", true); $("#Type").attr("disabled", "disabled"); getCustomerList(res.data[0].CustomerNo); // 根据单据类型加载客户信息 var paramDetail = { ASNNo: id, @@ -413,7 +418,9 @@ curr: 1 } table.render(infoOptions); form.render('select'); } else { //不成功 layer.msg(res.msg, { icon: 2, @@ -607,7 +614,7 @@ } // 绑定下拉信息 function getCustomerList() { function getCustomerList(CustomerNo) { /* 0：客户 退货入库 @@ -623,11 +630,10 @@ if (res.code == 0) { //成功 $("#CustomerName").empty(); $("#CustomerName").append('<option value =""></option>'); for (var i = 0; i < res.data.length; i++) { var TypeNum = 0; switch($("#Type").val()) { // 根据单据类型确认加载是客户or供应商or货主下拉信息 var TypeNum = 0; switch ($("#Type").val()) { case "3": //退货入库 TypeNum = 0; console.log(TypeNum) @@ -646,35 +652,34 @@ console.log(TypeNum) break; } for (var i = 0; i < res.data.length; i++) { //判断单据类型 if (TypeNum == 0) { if (res.data[i].Type == 0) { if (TypeNum == 0) { if (res.data[i].Type == 0) { $("#CustomerNamep").html("客户"); $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' + res.data[i].CustomerName + '</option>'); } } else if (TypeNum == 1) { if (res.data[i].Type == 1) { else if (TypeNum == 1) { if (res.data[i].Type == 1) { $("#CustomerNamep").html("供应商"); $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' + res.data[i].CustomerName + '</option>'); } } else if (TypeNum == 2) { if (res.data[i].Type == 2) { else if (TypeNum == 2) { if (res.data[i].Type == 2) { $("#CustomerNamep").html("货主"); $("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' + res.data[i].CustomerName + '</option>'); } } } // 根据客户名称加载选中值 $("#CustomerName option[value = '" + CustomerNo + "']").prop("selected", true); form.render('select'); } else { //不成功 layer.msg(res.msg, { @@ -793,8 +798,7 @@ //判断是否为对应不需要批次的单据 var TypeNum = 0; switch($("#Type").val()) { switch ($("#Type").val()) { //1：采购入库 2：中间品入库 5：其它入库 6：代储入库 7：寄存入库 case "1" : case "2" : @@ -807,8 +811,7 @@ } console.log(TypeNum) if (TypeNum == 0) { if (TypeNum == 0) { layer.msg("请输入批次！1", { icon: 2, time: 2000 //2秒关闭（如果不配置，默认是3秒） HTML/views/ASNSetting/BoxInfo.html
@@ -549,7 +549,7 @@ ProductionTime: $("#ProductionTime").val(), InspectMark: $("#InspectMark").val(), BitBoxMark: $("#BitBoxMark").val(), // Origin: "录入", Origin: "录入;导入;赋码", }; table.render({ elem: '#Box-list', HTML/views/ASNSetting/PalletBind.html
@@ -171,7 +171,8 @@ <table id="BoxInfo" lay-filter="BoxInfo"></table> <!-- #region 自定义表头 --> <div class="headerSetIcon"> <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2"> <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2"> <i class="layui-icon"></i> </button> </div> @@ -181,7 +182,8 @@ </div> </div> </div> <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;" class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" data-type="add"> <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;" class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" data-type="add"> <i class="layui-icon"></i>添加 </button> </div> @@ -420,8 +422,7 @@ // 查询事件 form.on('select(getWareHouseNo)', function (data) { if($("#WareHouseNo").val() == "W01") { if ($("#WareHouseNo").val() == "W01") { //获取巷道下拉框信息 synData(IP + "/Sys/GetRoadwayList", {}, 'get', function (res) { if (res.code == 0) { //成功 @@ -440,8 +441,7 @@ } }); } else { else { $("#RoadwayNo").html(''); $("#RoadwayNo").append('<option value=""></option>'); form.render('select'); @@ -1042,7 +1042,7 @@ time: 2000 //2秒关闭（如果不配置，默认是3秒） }, function () { bindPalletBind(); bindBoxInfo("0"); bindBoxInfo(quanSkuNo); }); } else { //不成功 layer.msg(res.msg, { @@ -1163,8 +1163,7 @@ var iframeWindow = window['layui-layer-iframe' + index], submitID = 'layuiadmin-app-form-edit', submit = layero.find('iframe').contents().find('#' + submitID); if(doing) { if (doing) { doing = false; layer.close(index); //关闭弹层 HTML/views/BaseSetting/MaterialsForm.html
@@ -1,20 +1,25 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <title>物料编码维护</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all"> </head> <body> <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 0px 0 0;"> <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 0px 0 0;"> <div class="layui-form-item" id="uptshow"> <div class="layui-inline"> <label class="layui-form-label">物料号</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" name="SkuNo" placeholder="请输入物料编号" lay-verify="required" autocomplete="off" class="layui-input"> <input type="text" name="SkuNo" placeholder="请输入物料编号" lay-verify="required" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> @@ -38,7 +43,8 @@ <div class="layui-inline"> <label class="layui-form-label">物料名称</label> <div class="layui-input-block" style="width: 182px;"> <input type="upttext" name="SkuName" placeholder="请输入物料名称" lay-verify="required" autocomplete="off" class="layui-input"> <input type="upttext" name="SkuName" placeholder="请输入物料名称" lay-verify="required" autocomplete="off" class="layui-input"> </div> </div> <!-- 添加不显示 --> @@ -83,15 +89,16 @@ <div class="layui-input-block" style="width: 182px;"> <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search> <!-- <option value=""></option> --> <option value="1">是</option> <option value="0">否</option> <option value="1">是</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label">规格/型号</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" name="Standard" placeholder="请输入规格/型号" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" name="Standard" placeholder="请输入规格/型号" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> </div> @@ -130,7 +137,8 @@ <div class="layui-inline"> <label class="layui-form-label">理论重量</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" name="Weight" placeholder="请输入理论重量" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" name="Weight" placeholder="请输入理论重量" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> </div> @@ -138,13 +146,15 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 70px;">保质期(天)</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="Warranty" placeholder="请输入保质期" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="Warranty" placeholder="请输入保质期" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">理论单价</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="Price" placeholder="请输入理论单价" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="Price" placeholder="请输入理论单价" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> </div> @@ -152,13 +162,15 @@ <div class="layui-inline"> <label class="layui-form-label" style="width: 70px;">临期(天)</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="AdventTime" placeholder="请输入临期" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="AdventTime" placeholder="请输入临期" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">低库存</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="LowInventory" placeholder="请输入低库存" lay-verify="" autocomplete="off" class="layui-input"> <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="LowInventory" placeholder="请输入低库存" lay-verify="" autocomplete="off" class="layui-input"> </div> </div> </div> @@ -171,8 +183,10 @@ </div> </div> <div class="layui-form-item layui-hide"> <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="确认添加"> <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="确认编辑"> <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="确认添加"> <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="确认编辑"> </div> </div> @@ -217,8 +231,7 @@ console.log(res) if(res.code == 1) //成功 { for (var i = 0; i < res.data.length; i++) { for (var i = 0; i < res.data.length; i++) { $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'); } form.render('select'); @@ -240,8 +253,7 @@ synData(IP + "/Basis/GetUnitList",{},'get',function(res){ if(res.code == 0) //成功 { for (var i = 0; i < res.data.length; i++) { for (var i = 0; i < res.data.length; i++) { $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>'); } form.render('select'); @@ -261,8 +273,7 @@ synData(IP + "/Basis/GetPackagList",{},'get',function(res){ if(res.code == 0) //成功 { for (var i = 0; i < res.data.length; i++) { for (var i = 0; i < res.data.length; i++) { $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>'); } form.render('select'); @@ -279,13 +290,11 @@ }); var id = getQueryString('id'); if (!id) { if (!id) { id = 0; $("#AuditStatusNo").attr("disabled","true") } else { else { if (sel1 && sel2 && sel3) { var param = { UserId: id, @@ -295,15 +304,13 @@ { // console.log(res.data.CategoryNo) //审批状态编辑显示 if(res.data.AuditStatusNo != "") { if (res.data.AuditStatusNo != "") { $('#Auditishow').show(); // $('#IsControlledshow').show(); // $('#IsInspectshow').show(); } //物料号 if(res.data.SkuNo != "") { if (res.data.SkuNo != "") { $("input[name='SkuNo']").attr("disabled","disabled") } //页面赋值 @@ -351,4 +358,5 @@ } </script> </body> </html> Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -264,7 +264,7 @@ .AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime)) .AndIF(!string.IsNullOrWhiteSpace(model.InspectMark), it => it.InspectMark == model.InspectMark.Trim()) .AndIF(!string.IsNullOrWhiteSpace(model.BitBoxMark), it => it.BitBoxMark == model.BitBoxMark.Trim()) .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => it.Origin == model.Origin.Trim()) .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => model.Origin.Trim().Contains(it.Origin)) .And(m => m.SkuNo != "100099" && m.IsDel == "0" && m.Status == "0") .ToExpression();//注意 这一句 不能少 var total = 0;
