JC24WMS.git - Gitblit

			@@ -46,7 +46,7 @@
			</ul>
			</div>

			<div id="zongDiv" class="layout-bill-info" style="height: 335px;">
			<div id="zongDiv" class="layout-bill-info" style="height: 285px;">
			<form class="layui-form" action="">
			<div id="" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label" lang>入库单：</label>
			@@ -92,28 +92,6 @@
			<label class="layui-form-label" lang>尾箱条码：</label>
			<div class="layui-input-block">
			<input id="BOXCODE2" type="text" lang langholder placeholder="请扫描外箱条码" autocomplete="off"
			class="layui-input">
			</div>
			</div>

			<div id="" class="layui-form-item layout-input BOX01">
			<label class="layui-form-label" lang>二级条码：</label>
			<div class="layui-input-block">
			<input id="BOXCODE01" type="text" lang langholder placeholder="请扫描二级条码" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			<div id="" class="layui-form-item layout-input BOX01">
			<label class="layui-form-label" lang>二级连组：</label>
			<div class="layui-input-block">
			<input type="checkbox" name="IsLianXu2" id="IsLianXu2" lay-skin="switch" lay-text="是\|否"
			lay-filter="IsLianXu2">
			</div>
			</div>
			<div id="" class="layui-form-item layout-input BOX02" style="display: none;">
			<label class="layui-form-label" lang>二级尾码：</label>
			<div class="layui-input-block">
			<input id="BOXCODE02" type="text" lang langholder placeholder="请扫描二级条码尾码" autocomplete="off"
			class="layui-input">
			</div>
			</div>
			@@ -201,7 +179,7 @@
			</div>
			<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
			<tr>
			<th lang style="width: 15%;">编码</th>
			<th lang style="width: 15%;">箱码</th>
			<th lang style="width: 35%;">名称</th>
			<th lang style="width: 25%;">批次</th>
			<th lang style="width: 15%;">数量</th>
			@@ -238,15 +216,14 @@
			var curPageIndex = 1;
			//是否连续外箱组托
			isContinue = "0";
			//是否连续二级码组托
			isContinue2 = "0";
			//清楚文本框中数据
			function clear() {
			function clear() {
			$("#BOXCODE").val("");
			$("#BOXCODE2").val("");

			$("#ImportQuantity").val("");
			$("#GoodsCode").val("");
			$("#Standard").val("");
			$("#ImportFactQuantity").val("");
			$("#ImportQty").val("");
			$("#BoxQty").val("");
			}

			@@ -269,15 +246,15 @@
			return
			}

			if ($("#STOCKCODE").val() == "") {
			layer.msg('请先扫描托盘码', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			$("#BOXCODE").val("");
			$("#STOCKCODE").focus();
			return;
			}
			// if ($("#STOCKCODE").val() == "") {
			// layer.msg('请先扫描托盘码', {
			// icon: 2,
			// time: 2000 //2秒关闭（如果不配置，默认是3秒）
			// });
			// $("#BOXCODE").val("");
			// $("#STOCKCODE").focus();
			// return;
			// }
			checkBoxInfo()
			}
			});
			@@ -305,12 +282,14 @@

			//选中入库单事件
			form.on('select(getbar)', function (data) {
			clear();
			updateGoodList()
			setOrderGoods();
			});

			//选中物料事件
			form.on('select(goodSelect)', function (data) {
			clear();
			setOrderGoods();
			});

			@@ -410,7 +389,7 @@
			form.render('select');

			var param = {
			Type: "0,1"
			Type: "0,1,2,3,4,5,6"
			};
			sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
			if (res.code == 0) { //成功
			@@ -441,8 +420,7 @@
			var asnDetails = "";

			// 绑定入库单物料及批次
			function updateGoodList() {
			console.log("aaaa");
			function updateGoodList(skuNo) {
			var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
			var val = input.val()

			@@ -457,16 +435,21 @@
			if (res.code == 0) { //成功
			asnDetails = res.data;
			for (var i = 0; i < res.data.length; i++) {
			if (i == 0) {
			if(skuNo!='' && skuNo==res.data[i].SkuNo){
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			} else {
			$("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			}

			}else{
			if (i == 0) {
			$("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			} else {
			$("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
			.SkuName + "-" + res.data[i].LotNo +
			'</option>');
			}
			}
			}
			form.render('select');

			@@ -525,11 +508,11 @@
			time: 0, //2秒关闭（如果不配置，默认是3秒）
			btn: ['删除', '取消'],
			yes: function () {

			console.log(Id);
			var param = {
			Id: Id,
			boxNo: res.data[i].BoxNo,
			};
			sendData(IP + "/PdaAsn/DelBoxInfo", param, 'post', function (res) {
			sendData(IP + "/BllAsn/DelBindBoxInfo", param, 'get', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			@@ -586,18 +569,35 @@

			function checkBoxInfo() {
			var param = {
			"ASNNo":$("#bar").val(),
			"BoxNo": $("#BOXCODE").val(),
			}
			sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
			if (res.code == 0) { //成功
			var bl = false; console.log(res.data);
			var bl = false;
			if (res.data.length == 0) {
			layer.msg("未查询到此箱物料信息，请核实!", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			if(res.data[0].ASNNo!='' && res.data[0].ASNNo!=null){
			$("#bar").empty()
			$("#bar").append('<option value =>' + '</option>');
			form.render('select');

			$("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo +'</option>');

			updateGoodList(res.data[0].SkuNo)
			setOrderGoods();
			}else{
			if(asnDetails==''){
			layer.msg("请先选择入库单据!", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			}
			asnDetails.forEach(element => {
			console.log(element);
			@@ -630,7 +630,7 @@
			form.on('switch(IsLianXu)', function (obj) {
			if (obj.elem.checked) {
			$('#BOX2').attr("style", "display:block")
			$('#zongDiv').attr("style", "height: 335px;")
			$('#zongDiv').attr("style", "height: 305px;")
			isContinue = "1";

			$('.BOX01').attr("style", "display:none")
			@@ -638,30 +638,12 @@

			} else {
			$('#BOX2').attr("style", "display:none")
			$('#zongDiv').attr("style", "height: 315px;")
			$('#zongDiv').attr("style", "height: 285px;")
			isContinue = "0";

			$('.BOX01').attr("style", "display:block");
			}
			$('#BOXCODE2').val("");

			$('#BOXCODE01').val("");
			$('#BOXCODE02').val("");
			$('#IsLianXu2').attr("checked", false);
			isContinue2 = "0";
			});

			form.on('switch(IsLianXu2)', function (obj) {
			if (obj.elem.checked) {
			$('.BOX02').attr("style", "display:block")
			$('#zongDiv').attr("style", "height: 345px;")
			isContinue = "1";
			} else {
			$('.BOX02').attr("style", "display:none")
			$('#zongDiv').attr("style", "height: 315px;")
			isContinue2 = "0";
			}
			$('#BOXCODE02').val("");
			});

			$("#menuImg").click(function (e) {