JC24WMS.git - Gitblit

			@@ -27,11 +27,10 @@
			</script>

			</head>
			<body>

			<body id="body">
			<div class="layui-fluid" style="padding-bottom: 0;">
			<div class="layui-card">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto">
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item" style="margin-bottom: 0px;">
			<div class="layui-inline zongdan" >
			<label class="layui-form-label" style="width: 60px;">物料编码</label>
			@@ -52,6 +51,20 @@
			</div>
			</div>
			<div class="layui-inline mingxi">
			<label class="layui-form-label" style="width: 60px;">货主编码</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			<input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			<div class="layui-inline mingxi">
			<label class="layui-form-label" style="width: 60px;">货主名称</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			<input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			<div class="layui-inline mingxi">
			<label class="layui-form-label" style="width: 60px;">批次号</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			<input type="text" id="LotNo" name="LotNo" placeholder="批次号" autocomplete="off" class="layui-input">
			@@ -66,7 +79,7 @@
			<input type="text" id="BoxNo" name="BoxNo" placeholder="箱码" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-inline zhijian">
			<!-- <div class="layui-inline zhijian">
			<label class="layui-form-label" style="width: 60px;">箱支状态</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			<select name="Status" id="Status" lay-search>
			@@ -77,7 +90,7 @@
			<option value="3">已出库</option>
			</select>
			</div>
			</div>
			</div> -->
			<div class="layui-inline zhijian">
			<label class="layui-form-label" style="width: 60px;">抽检标记</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			@@ -134,19 +147,20 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>导出
			</button>
			</div>


			</div>
			</div>



			<div class="layui-card-body">
			<div style="position: relative;">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<ul class="layui-tab-title">
			<ul class="layui-tab-title" id="tab">
			<li class="layui-this">托盘明细</li>
			<li >箱码明细</li>
			</ul>

			<div id="center">
			</div>

			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
			@@ -204,7 +218,12 @@
			<p>已入库</p>
			{{# } else if(d.Status == '3') { }}
			<p>已出库</p>
			{{# } }}
			{{# } else if(d.Status == '4') { }}
			<p>已分配</p>
			{{# } else if(d.Status == '5') { }}
			<p>已拣货</p>
			{{# } }}

			</script>
			<script type="text/html" id="InspectMarkStatus">
			{{# if(d.InspectMark=='0'){ }}
			@@ -266,7 +285,10 @@
			element = layui.element;
			laydate = layui.laydate;


			var h1 = GetTableTabHeight();
			// var h1 = GetTkableTopHeight();
			// console.log(h1)

			laydate.render({
			elem: '#StartTime',
			format: 'yyyy-MM-dd' //可任意组合
			@@ -303,7 +325,7 @@

			var $ = layui.$;
			var yemianid =0;
			refreshTable("","","","","","","","","","");
			refreshTable("","","","","","","","","","","","");

			// 表单需要的变量
			var infoOptions;
			@@ -371,12 +393,17 @@
			//#region 自定义表头
			var TotalColsArr = [[
			{field: '',title: '序号',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
			{field: 'WareHouseNo', title: '所属仓库', align: 'center'},
			{field: 'AreaNo', title: '所属区域', align: 'center'},
			{field: 'WareHouseName', title: '所属仓库', align: 'center'},
			{field: 'RoadwayName', title: '所属巷道', align: 'center'},
			{field: 'AreaName', title: '所属区域', align: 'center'},
			{field: 'LocatNo', title: '储位地址', align: 'center'},
			{field: 'PalletNo', title: '托盘号', align: 'center'},
			{field: 'SkuNo', title: '物料编码', align: 'center'},
			{field: 'SkuName', title: '物料名称', align: 'center'},
			{field: 'OwnerNo',title: '货主编码',align: 'center'},
			{field: 'OwnerName',title: '货主名称',align: 'center'},
			{field: 'SupplierNo',title: '供应商编码',align: 'center'},
			{field: 'SupplierName',title: '供应商名称',align: 'center'},
			{field: 'LotNo', title: '批次号', align: 'center'},
			{field: 'LotText', title: '批次描述', align: 'center'},
			{field: 'SupplierLot', title: '供货批次', align: 'center'},
			@@ -389,7 +416,7 @@
			var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
			//#endregion
			//获取托盘明细
			function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus) {
			function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName) {
			//#region 自定义表头
			var colsJson
			var param1={
			@@ -407,7 +434,7 @@
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,
			@@ -431,9 +458,12 @@
			InspectMark:InspectMark, //检验标记
			BitPalletMark:BitPalletMark, //零托标记
			BitBoxMark:BitBoxMark, //零箱标记
			InspectStatus:InspectStatus //质量状态
			InspectStatus:InspectStatus, //质量状态
			OwnerNo:OwnerNo, //货主编码
			OwnerName:OwnerName //货主名称
			};
			sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
			sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
			console.log(res)
			if (res.code == 0) { //成功
			var list = res.data;
			$.extend(infoOptions, {
			@@ -567,7 +597,7 @@
			}
			infoOptions2 = {
			elem: '#LAY-app-content-list2',
			height: 'full-206',
			height: h1,
			id: 'LAY-app-content-list2',
			page: true,
			limit: pageCnt,
			@@ -637,9 +667,12 @@
			var BitBoxMark = $("#BitBoxMark").val();
			var InspectStatus = $("#InspectStatus").val();

			var OwnerNo = $("#OwnerNo").val();
			var OwnerName = $("#OwnerName").val();

			if(yemianid == 0){
			console.log("总单");
			refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus);
			refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
			}else if(yemianid == 1){
			quanid = '';
			console.log("明细");
			@@ -661,14 +694,29 @@

			//监听Tab切换，以改变地址hash值
			element.on('tab(docDemoTabBrief)', function(data){
			var SkuNo = $("#SkuNo").val();
			var SkuName = $("#SkuName").val();
			var LotNo = $("#LotNo").val();
			var PalletNo = $("#PalletNo").val();

			var BoxNo = $("#BoxNo").val();
			var Status = $("#Status").val();
			var InspectMark = $("#InspectMark").val();
			var BitPalletMark = $("#BitPalletMark").val();
			var BitBoxMark = $("#BitBoxMark").val();
			var InspectStatus = $("#InspectStatus").val();

			var OwnerNo = $("#OwnerNo").val();
			var OwnerName = $("#OwnerName").val();

			console.log(data.index);
			yemianid = data.index
			if(yemianid == 0){
			console.log("总单");
			refreshTable("","","","","","","","","","");
			refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
			}else if(yemianid == 1){
			console.log("明细");
			refreshTable2(quanid);
			refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus);
			}
			});
			var doing = true;