JC24WMS.git - Gitblit

			@@ -243,7 +243,7 @@
			<div id="layout-bill" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">入库单：</label>
			<div class="layui-input-block" id="selectDiv">
			<select id="bar" lay-filter="getbar" lay-search>
			<select id="AsnBar" lay-filter="getAsnBar" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			@@ -296,7 +296,7 @@
			</table>
			</div>
			<div id="" class="layout-tab-page">
			<table class="layout-tab-content" border="" cellspacing="" cellpadding="">
			<table id="kuneiQty" class="layout-tab-content" border="" cellspacing="" cellpadding="">
			<tr>
			<td>
			<table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
			@@ -380,63 +380,74 @@

			<div id="" class="layout-bill-info">
			<form class="layui-form" action="" style="height: auto;">
			<div id="kuneilabel2" >
			<div id="layout-bill2" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">出库单：</label>
			<div class="layui-input-block" id="selectDiv2">
			<select id="bar2" lay-filter="getbar2" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			<div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">物料 - 批次：</label>
			<div class="layui-input-block">
			<select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			<div id="" class="layout-tab-page">
			<table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
			<tr>
			<td>
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 50%;">计划数量：</label>
			<div class="layui-input-block" style="width: 50%;margin-left:50%;">
			<input id="planQty2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>
			</td>
			<td>
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 50%">完成数量：</label>
			<div class="layui-input-block" style="width: 50%;margin-left:50%;">
			<input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>

			<div id="layout-bill2" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">出库单：</label>
			<div class="layui-input-block" id="selectDiv2">
			<select id="bar2" lay-filter="getbar2" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			<div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">物料 - 批次：</label>
			<div class="layui-input-block">
			<select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			<div id="" class="layout-tab-page">
			<table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
			<tr>
			<td>
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 50%;">计划数量：</label>
			<div class="layui-input-block" style="width: 50%;margin-left:50%;">
			<input id="planQty2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>
			</td>
			<td>
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 50%">完成数量：</label>
			<div class="layui-input-block" style="width: 50%;margin-left:50%;">
			<input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>

			</td>
			</tr>
			<tr>
			<td colspan="3">
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 17%;">规格：</label>
			<div class="layui-input-block" style="width: 83%;margin-left:17%;">
			<input id="standard2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>
			</td>

			</tr>
			</table>
			</div>

			</td>
			</tr>
			<tr>
			<td colspan="3">
			<div class="layui-form-item">
			<label class="layui-form-label" style="width: 17%;">规格：</label>
			<div class="layui-input-block" style="width: 83%;margin-left:17%;">
			<input id="standard2" type="text" lay-verify="" disabled placeholder=""
			class="layui-input">
			</div>
			</div>
			</td>

			</tr>
			</table>
			</div>
			</div>
			<div id="kuqianlabel2" >
			<div id="layout-bill" class="layui-form-item layout-dropdownlist">
			<label class="layui-form-label lableWidth">入库单：</label>
			<div class="layui-input-block" id="selectDiv">
			<select id="AsnBar2" lay-filter="getAsnBar2" lay-search>
			<option value=""></option>
			</select>
			<img src="/assets/down_arraw.png">
			</div>
			</div>
			</div>
			<div id="layout-pallet" class="layui-form-item layout-input">
			<label class="layui-form-label lableWidth">托盘条码：</label>
			<div class="layui-input-block">
			@@ -543,6 +554,11 @@

			$('#kuneilabel').hide();
			$('#kuqianlabel').hide();
			$('#kuneilabel2').hide();
			$('#kuqianlabel2').hide();

			$('#kuneiQty').hide();

			$('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色
			$('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //默认颜色
			$('#content2').hide();
			@@ -637,11 +653,15 @@
			if (res.code == 0){
			if (res.data == "0") {//库内取样
			$('#kuneilabel').show();
			$('#kuneiQty').show();
			$('#kuqianlabel').hide();
			}
			if (res.data == "1") {//库前取样
			$('#kuqianlabel').show();
			$('#kuneilabel').hide();
			$('#kuneiQty').hide();

			updateAsnBillList();
			}
			// updateBillList();
			// if ($('#bar').val() == "") {
			@@ -672,21 +692,21 @@
			//初始化渲染入库单
			function updateAsnBillList() {

			$("#bar").empty()
			$("#bar").append('<option value =>' + '</option>');
			$("#AsnBar").empty()
			$("#AsnBar").append('<option value =>' + '</option>');
			form.render('select');

			var param = {
			PalletNo: $("#palletNo").val(),
			palletNo: $("#palletNo").val(),
			};
			synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
			synData(IP + "/PdaSo/GetAsnNoByPallet", param, 'get', function (res) {
			if (res.code == 0) { //成功
			console.log(res.data);
			for (var i = 0; i < res.data.length; i++) {
			if (i == 0) {
			$("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
			$("#AsnBar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
			} else {
			$("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
			$("#AsnBar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
			}
			}
			form.render('select');
			@@ -1209,27 +1229,76 @@
			}
			checkPalletState2()
			})
			//初始化渲染入库单
			function updateAsnBillList2() {

			$("#AsnBar2").empty()
			$("#AsnBar2").append('<option value =>' + '</option>');
			form.render('select');
			console.log("afdsaf")
			var param = {
			palletNo: $("#palletNo2").val(),
			};
			synData(IP + "/PdaSo/GetAsnNoByPallet", param, 'get', function (res) {
			if (res.code == 0) { //成功
			console.log(res.data);
			for (var i = 0; i < res.data.length; i++) {
			if (i == 0) {
			$("#AsnBar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
			} else {
			$("#AsnBar2").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
			}
			}
			form.render('select');

			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			}
			});
			}

			//检查托盘状态
			function checkPalletState2() {
			var param = {
			"PalletNo": $("#palletNo2").val()
			}
			}
			synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {

			if (res.code == 0) { //成功
			updateBillList2();
			console.log($('#bar2').val())
			if ($('#bar2').val() == "") {
			console.log(1)
			clear21();
			return;
			} else {
			console.log(2)
			updateSkuLotNoList2();
			updateQtyList2();
			getBar2();
			GetDataInfo();
			}

			synData(IP + "/PdaSo/GetSampleType", param, 'get', function (res) {
			if (res.code == 0){
			if (res.data == "0") {//库内取样
			$('#kuneilabel2').show();
			$('#kuqianlabel2').hide();
			}
			if (res.data == "1") {//库前取样
			$('#kuqianlabel2').show();
			$('#kuneilabel2').hide();
			updateAsnBillList2();
			}
			// updateBillList2();
			// console.log($('#bar2').val())
			// if ($('#bar2').val() == "") {
			// console.log(1)
			// clear21();
			// return;
			// } else {
			// console.log(2)
			// updateSkuLotNoList2();
			// updateQtyList2();
			// getBar2();
			// GetDataInfo();
			// }
			}else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () { });
			}
			});
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,