JC24WMS.git - Gitblit

			@@ -105,7 +105,7 @@
			<li id="option1">标签</li>
			<li id="option2">数量</li>
			</ul> -->


			<button id="option1" class="layout-btn" type="button">标签</button>
			<button id="option2" class="layout-btn" type="button">数量</button>
			<br /><br />
			@@ -250,7 +250,7 @@
			</table>
			<!-- 分页 -->
			<table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
			<tr >
			<tr>
			<td class="page-prev">上一页</td>
			<td class="page-num page-num-select">1</td>
			<td class="page-num">2</td>
			@@ -352,11 +352,12 @@
			<div id="demodiv" class="layui-form-item layout-input" style="height: auto;">
			<label class="layui-form-label">寄存备注：</label>
			<div class="layui-input-inline" style="width: 365px;height: auto;">
			<textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo" class="layui-textarea" ></textarea>
			<textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo"
			class="layui-textarea"></textarea>
			</div>
			<br>
			</div>


			<table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
			<tr>
			<td style="width: 23%;"></td>
			@@ -377,7 +378,7 @@
			<div id="demodiv1">
			<br><br><br><br><br><br><br>
			</div>



			<div id="" class="cut-line">
			<img src="/assets/fengexian.png">
			@@ -455,8 +456,8 @@
			xianshiyemian = 1;
			$('#content1').hide();
			$('#option1').attr("style", "background-color: #999;width: 50%;float: left;text-align: center;"); //默认颜色




			$('#content2').show();
			$('#option2').attr("style", "background-color: red;width: 50%;float: right;text-align: center;"); //选中后颜色

			@@ -620,7 +621,7 @@
			form.render('select');

			var param = {
			Type: "2,5,6,7"
			Type: "1,2,3,4,5,6,7"
			};
			sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
			if (res.code == 0) { //成功
			@@ -731,8 +732,10 @@
			BoxNo: $("#BOXCODE").val(),
			IsContinue: isContinue,
			TailBoxNo: $("#BOXCODE2").val(),
			Origin: "PDA"
			Origin: "PDA",
			TableType: xianshiyemian,
			}
			console.log(param)
			//组盘
			sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
			if (res.code == 0) { //成功
			@@ -785,7 +788,8 @@
			LotNo: $("#goodSelect1").find("option:selected").text(), //物料批次
			SkuQty: parseInt($("#SkuQty").val()), //物料数量
			Demo: $("#NoticeDemo").val(), //物料数量
			Origin: "PDA"
			Origin: "PDA",
			TableType: xianshiyemian,
			}

			console.log(param)
			@@ -824,21 +828,19 @@
			synData(IP + "/PdaAsn/GetArrivalNotice", param, 'post', function (res) {
			console.log(res)
			if (res.code == 0 && res.data != null) { //成功


			//判断默认选中是否为寄存物料
			if(res.data[0].Type == "7")
			{
			if (res.data[0].Type == "7") {
			$("textarea[name='NoticeDemo']").val(res.data[0].Demo); //备注
			$('#demodiv').show();
			$('#demodiv1').show();
			}
			else
			{
			else {
			$('#demodiv').hide();
			$('#demodiv1').hide();
			}
			}
			else{
			else {
			$('#demodiv').hide();
			$('#demodiv1').hide();
			}
			@@ -881,7 +883,7 @@
			$("#Standard1").val(res.data.Standard);
			$("#ImportFactQuantity1").val(res.data.FactQty + "");
			}
			else{}
			else { }
			});
			}

			@@ -906,36 +908,43 @@
			console.log("出库口：" + JSON.stringify(res))
			if (res.code == 0) { //成功
			asnDetails = res.data;
			if (asnDetails.length <= 0) {
			layer.msg('当前单据下不存在贴标物料', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			for (var i = 0; i < res.data.length; i++) {
			if (skuNo != '' && skuNo == res.data[i].SkuNo) {
			if (res.data[i].LotNo == '' \|\| res.data[i].LotNo == null) {
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
			.SkuName +
			'</option>');
			} else {
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			}
			} else {
			if (i == 0) {
			if (res.data[i].LotNo == '' \|\| res.data[i].LotNo == null) {
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
			.SkuName +
			'</option>');
			} else {
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			}

			} else {
			if (res.data[i].LotNo == '' \|\| res.data[i].LotNo == null) {
			$("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
			.SkuName +
			'</option>');
			} else {
			$("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
			$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			}
			@@ -969,9 +978,17 @@
			console.log("出库口：" + JSON.stringify(res))
			if (res.code == 0) { //成功
			asnDetails = res.data;
			// console.log(asnDetails.length)
			if (asnDetails.length <= 0) {
			layer.msg('当前单据下不存在不贴标物料', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			for (var i = 0; i < res.data.length; i++) {
			if (skuNo != '' && skuNo == res.data[i].SkuNo) {


			if (i == 0) {
			$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			.SkuName);
			@@ -1005,7 +1022,7 @@
			$('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
			}
			} else {


			}
			});
			}
			@@ -1083,7 +1100,8 @@
			tr.show();
			arrTrs[i] = tr
			}

			//设置分页
			setPages(1, res.data.length)

			} else { //不成功
			layer.msg("无数据", {
			@@ -1091,6 +1109,7 @@
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () { });
			$("#boxNum").val(0)
			setPages(1, 0)
			}
			});
			}
			@@ -1140,6 +1159,7 @@
			yes: function () {

			var param = {
			Id: parseInt(Id),
			PalletNo: res.data[0].PalletNo,
			};
			console.log(Id)
			@@ -1168,7 +1188,7 @@
			}

			//设置分页
			setPages(1, list.length)
			setPages(1, res.data.length)

			} else { //不成功
			layer.msg("无数据", {
			@@ -1291,217 +1311,98 @@
			/* 分页 */
			//设置分页
			function setPages(pageIndex, boxNum) {

			if (xianshiyemian == 0) {
			if (boxNum <= 0) {
			//列表为空，隐藏分页页码
			$("#tableBoxPages").hide()
			return
			}

			let pageNum = Math.floor(boxNum / 10);
			if (boxNum % 10 > 0) {
			pageNum += 1;
			}
			//console.log("pageNum is " + pageNum)

			$("#tableBoxPages").find("tr").remove()
			let table = $("#tableBoxPages")
			$("<tr></tr>").appendTo("#tableBoxPages")

			// let newTr = table.append("<tr></tr>")
			// newTr.append("<td class='page-prev'>上一页</td>")
			$("<td id='prevPage' class='page-prev'>上一页</td>").appendTo("#tableBoxPages tr")
			$("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function () {
			onClickPrevPage()
			})
			for (i = 1; i < pageNum + 1; i++) {
			// newTr.append("<td class='page-num'>"+ i +"</td>")
			$("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages tr")
			}
			// newTr.append("<td class='page-next'>下一页</td>")
			$("<td id='nextPage' class='page-next'>下一页</td>").appendTo("#tableBoxPages tr")
			$("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function () {
			onClickNextPage()
			})
			// pages.show()
			$("#tableBoxPages").show()

			setCurPage(1)
			}
			else if (xianshiyemian == 1) {
			if (boxNum <= 0) {
			//列表为空，隐藏分页页码
			$("#tableBoxPages1").hide()
			return
			}

			let pageNum = Math.floor(boxNum / 10);
			if (boxNum % 10 > 0) {
			pageNum += 1;
			}
			//console.log("pageNum is " + pageNum)

			$("#tableBoxPages1").find("tr").remove()
			let table = $("#tableBoxPages1")
			$("<tr></tr>").appendTo("#tableBoxPages1")

			// let newTr = table.append("<tr></tr>")
			// newTr.append("<td class='page-prev'>上一页</td>")
			$("<td id='prevPage' class='page-prev'>上一页</td>").appendTo("#tableBoxPages1 tr")
			$("#tableBoxPages1 tr").eq(0).find("td[id^='prevPage']").click(function () {
			onClickPrevPage()
			})
			for (i = 1; i < pageNum + 1; i++) {
			// newTr.append("<td class='page-num'>"+ i +"</td>")
			$("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages1 tr")
			}
			// newTr.append("<td class='page-next'>下一页</td>")
			$("<td id='nextPage' class='page-next'>下一页</td>").appendTo("#tableBoxPages1 tr")
			$("#tableBoxPages1 tr").eq(0).find("td[id^='nextPage']").click(function () {
			onClickNextPage()
			})
			// pages.show()
			$("#tableBoxPages1").show()

			setCurPage(1)
			if (boxNum <= 0) {
			//列表为空，隐藏分页页码
			$("#tableBoxPages").hide()
			return
			}

			let pageNum = Math.floor(boxNum / 10);
			if (boxNum % 10 > 0) {
			pageNum += 1;
			}
			//console.log("pageNum is " + pageNum)

			$("#tableBoxPages").find("tr").remove()
			let table = $("#tableBoxPages")
			$("<tr></tr>").appendTo("#tableBoxPages")

			// let newTr = table.append("<tr></tr>")
			// newTr.append("<td class='page-prev'>上一页</td>")
			$("<td id='prevPage' class='page-prev'>上一页</td>").appendTo("#tableBoxPages tr")
			$("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function () {
			onClickPrevPage()
			})
			for (i = 1; i < pageNum + 1; i++) {
			// newTr.append("<td class='page-num'>"+ i +"</td>")
			$("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages tr")
			}
			// newTr.append("<td class='page-next'>下一页</td>")
			$("<td id='nextPage' class='page-next'>下一页</td>").appendTo("#tableBoxPages tr")
			$("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function () {
			onClickNextPage()
			})
			// pages.show()
			$("#tableBoxPages").show()

			setCurPage(1)
			}

			//设置当前分页
			function setCurPage(pageIndex) {
			if (xianshiyemian == 0) {
			let totalTrNum = $("#tableBoxList tr").length
			if (totalTrNum <= 2) {
			//console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
			//curPageIndex = 1
			return
			}
			let totalTrNum = $("#tableBoxList tr").length
			if (totalTrNum <= 2) {
			//console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
			//curPageIndex = 1
			return
			}

			let pageNum = getBoxPageNum()
			if (pageIndex > pageNum) {
			//console.log("设置的页码超出页数, pageIndex : " + pageIndex)
			//curPageIndex = 1
			return
			}
			let pageNum = getBoxPageNum()
			if (pageIndex > pageNum) {
			//console.log("设置的页码超出页数, pageIndex : " + pageIndex)
			//curPageIndex = 1
			return
			}

			let startIndex = (pageIndex - 1) * 10 + 1
			let n = totalTrNum - startIndex
			let endIndex = 0
			if (n > 9) {
			endIndex = startIndex + 9
			let startIndex = (pageIndex - 1) * 10 + 1
			let n = totalTrNum - startIndex
			let endIndex = 0
			if (n > 9) {
			endIndex = startIndex + 9
			} else {
			endIndex = startIndex + n
			}
			//console.log("startIndex is "+startIndex)
			//console.log("endIndex is "+endIndex)
			//startIndex =2
			//endIndex = 2
			let trs = $("#tableBoxList tr")
			//console.log("行数 "+trs.length)
			let d = 0
			for (let i = 2; i < trs.length; i++) {
			//console.log("行索引 " + trs.eq(i).attr('index'))
			let t = trs.eq(i)
			d = t.attr('index')
			if (d >= startIndex && d <= endIndex) {
			//console.log("需要显示")
			//显示行
			t.show()
			} else {
			endIndex = startIndex + n
			}

			let trs = $("#tableBoxList tr")
			//console.log("行数 "+trs.length)
			let d = 0
			for (let i = 2; i < trs.length; i++) {
			//console.log("行索引 " + trs.eq(i).attr('index'))
			let t = trs.eq(i)
			d = t.attr('index')
			if (d >= startIndex && d <= endIndex) {
			//console.log("需要显示")
			//显示行
			t.show()
			} else {
			//隐藏行
			t.hide()
			}
			}

			curPageIndex = pageIndex

			let ptr = $("#tableBoxPages tr")
			for (let i = 1; i < pageNum + 1; i++) {
			ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
			if (i == curPageIndex) {
			ptr.eq(0).find("td").eq(i).addClass("page-num-select")
			}
			}
			}
			else if (xianshiyemian == 1) {
			let totalTrNum = $("#tableBoxList1 tr").length
			if (totalTrNum <= 2) {
			return
			}

			let pageNum = getBoxPageNum()
			if (pageIndex > pageNum) {
			//console.log("设置的页码超出页数, pageIndex : " + pageIndex)
			//curPageIndex = 1
			return
			}

			let startIndex = (pageIndex - 1) * 10 + 1
			let n = totalTrNum - startIndex
			let endIndex = 0
			if (n > 9) {
			endIndex = startIndex + 9
			} else {
			endIndex = startIndex + n
			}

			let trs = $("#tableBoxList1 tr")
			//console.log("行数 "+trs.length)
			let d = 0
			for (let i = 2; i < trs.length; i++) {
			//console.log("行索引 " + trs.eq(i).attr('index'))
			let t = trs.eq(i)
			d = t.attr('index')
			if (d >= startIndex && d <= endIndex) {
			//console.log("需要显示")
			//显示行
			t.show()
			} else {
			//隐藏行
			t.hide()
			}
			}

			curPageIndex = pageIndex

			let ptr = $("#tableBoxPages1 tr")
			for (let i = 1; i < pageNum + 1; i++) {
			ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
			if (i == curPageIndex) {
			ptr.eq(0).find("td").eq(i).addClass("page-num-select")
			}
			//隐藏行
			t.hide()
			}
			}

			}
			curPageIndex = pageIndex

			function getBoxPageNum() {
			if (xianshiyemian == 0) {
			let num = $("#tableBoxList tr").length
			if (num <= 2) {
			return 0
			let ptr = $("#tableBoxPages tr")
			for (let i = 1; i < pageNum + 1; i++) {
			ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
			if (i == curPageIndex) {
			ptr.eq(0).find("td").eq(i).addClass("page-num-select")
			}

			let pageNum = Math.floor(num / 10);
			if (num % 10 > 0) {
			pageNum += 1;
			}

			return pageNum
			}
			else if (xianshiyemian == 1) {
			let num = $("#tableBoxList1 tr").length
			if (num <= 2) {
			return 0
			}

			let pageNum = Math.floor(num / 10);
			if (num % 10 > 0) {
			pageNum += 1;
			}

			return pageNum
			}

			//console.log("totalTrNum is " + totalTrNum)
			}

			function onClickPrevPage() {
			@@ -1515,11 +1416,24 @@
			function onClickNextPage() {
			//console.log("下一页按钮被点击")
			let n = getBoxPageNum()
			if (curPageIndex == n) {
			if (curPageIndex == n - 1) {
			return
			}
			setCurPage(curPageIndex + 1)
			}
			function getBoxPageNum() {
			let num = $("#tableBoxList tr").length
			if (num <= 2) {
			return 0
			}

			let pageNum = Math.floor(num / 10);
			if (num % 10 > 0) {
			pageNum += 1;
			}

			return pageNum
			}

			/——————————————————————————————————————————————————————————/