JC24WMS.git - Gitblit

			@@ -98,6 +98,17 @@
			</div>
			</div>
			<div class="layui-inline">
			<!-- 物料类别 -->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 60px;">物料类别</label>
			<div class="layui-input-inline">
			<select name="CategoryNo" id="CategoryNo" lay-verify="">
			<option value=""></option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
			</button>
			@@ -192,10 +203,23 @@
			laypage = layui.laypage,
			layer = layui.layer;

			refreshTable("","","","","","","");
			refreshTable("","","","","","","","");
			var tableIns;
			//获取类别信息
			sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
			console.log(res)
			if (res.code == 1) //成功
			{
			Categoryhtml = '<option value =""></option>';
			for (var i = 0; i < res.data.length; i++) {
			Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
			}
			$("#CategoryNo").append(Categoryhtml);
			form.render('select');
			}
			})

			function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment) {
			function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo) {
			var param = {
			SkuNo: SkuNo,
			SkuName: SkuName,
			@@ -203,10 +227,11 @@
			Type: Type,
			IsControlled: IsControlled,
			IsInspect: IsInspect,
			Environment: Environment
			Environment: Environment,
			CategoryNo:CategoryNo
			};

			var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment;
			var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
			sendData(IP + url, {}, 'get', function(res) {
			if (res.code == 0) //成功
			{
			@@ -324,6 +349,9 @@
			field: 'Environment',title: '存储环境',align: 'center',templet: '#buttonEnvironment',width: 120
			},
			{
			field: 'CategoryName',title: '物料类别',align: 'center',width: 120
			},
			{
			field: 'Weight',title: '理论重量',align: 'center',width: 135
			},
			{
			@@ -365,8 +393,9 @@
			var IsControlled = data.field.IsControlled;
			var IsInspect = data.field.IsInspect;
			var Environment = data.field.Environment;
			var CategoryNo = data.field.CategoryNo;

			refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment);
			refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo);
			});
			var doing = true;
			var $ = layui.$,
			@@ -398,6 +427,7 @@
			IsControlled: field.IsControlled,
			IsInspect: field.IsInspect,
			Origin: field.Origin,
			CategoryNo: field.CategoryNo,
			UnitNo: field.UnitNo,
			PackagNo: field.PackagNo,
			Environment: field.Environment,
			@@ -427,7 +457,8 @@
			$("#Type").val(),
			$("#IsControlled").val(),
			$("#IsInspect").val(),
			$("#Environment").val()
			$("#Environment").val(),
			$("#CategoryNo").val()
			);
			doing = true;
			});
			@@ -519,7 +550,8 @@
			$("#Type").val(),
			$("#IsControlled").val(),
			$("#IsInspect").val(),
			$("#Environment").val()
			$("#Environment").val(),
			$("#CategoryNo").val()
			);
			//table.reload('LAY-app-content-list'); //数据刷新
			doing = true;
			@@ -569,6 +601,7 @@
			IsControlled: field.IsControlled,
			IsInspect: field.IsInspect,
			Origin: field.Origin,
			CategoryNo: field.CategoryNo,
			UnitNo: field.UnitNo,
			PackagNo: field.PackagNo,
			Environment: field.Environment,
			@@ -599,7 +632,8 @@
			$("#Type").val(),
			$("#IsControlled").val(),
			$("#IsInspect").val(),
			$("#Environment").val()
			$("#Environment").val(),
			$("#CategoryNo").val(),
			);
			doing = true;
			});