JC24WMS.git - Gitblit

			@@ -46,6 +46,7 @@
			background-color: #eff2ff;
			border: 1px solid #5298ff;
			}

			/* 内容居中 */
			.tableyang-tab {
			display: flex;
			@@ -54,8 +55,10 @@
			flex-direction: column;
			height: 90vh;
			}

			/* 必用样式 */
			.tableyang-2,.tableyang-3 {
			.tableyang-2,
			.tableyang-3 {
			display: none;
			}

			@@ -70,9 +73,6 @@
			padding: 10px;
			margin-bottom: 5px;
			}



			</style>
			<link rel="stylesheet" href="/css/adapter.css" />
			<script src="../../js/jquery.js"></script>
			@@ -134,15 +134,15 @@
			<div id="" class="layui-form-item layout-input">
			<label class="layui-form-label" lang>托盘条码：</label>
			<div class="layui-input-block">
			<input id="STOCKCODE" type="text" lay-verify="stock" lang langholder placeholder="请扫描托盘条码"
			autocomplete="off" class="layui-input">
			<input id="STOCKCODE" type="text" lay-verify="stock" lang langholder
			placeholder="请扫描托盘条码" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div id="BOX" class="layui-form-item layout-input">
			<label class="layui-form-label" lang>外箱条码：</label>
			<div class="layui-input-block">
			<input id="BOXCODE" type="text" lay-verify="required" lang langholder placeholder="请扫描外箱条码"
			autocomplete="off" class="layui-input">
			<input id="BOXCODE" type="text" lay-verify="required" lang langholder
			placeholder="请扫描外箱条码" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div id="" class="layui-form-item layout-input">
			@@ -155,8 +155,8 @@
			<div id="BOX2" class="layui-form-item layout-input" style="display: none;">
			<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">
			<input id="BOXCODE2" type="text" lang langholder placeholder="请扫描外箱条码"
			autocomplete="off" class="layui-input">
			</div>
			</div>

			@@ -287,8 +287,8 @@
			<div id="" class="layui-form-item layout-input">
			<label class="layui-form-label" lang>托盘条码：</label>
			<div class="layui-input-block">
			<input id="STOCKCODE1" type="text" lay-verify="stock" lang langholder placeholder="请扫描托盘条码"
			autocomplete="off" class="layui-input">
			<input id="STOCKCODE1" type="text" lay-verify="stock" lang langholder
			placeholder="请扫描托盘条码" autocomplete="off" class="layui-input">
			</div>
			</div>

			@@ -523,8 +523,7 @@
			/* 入库单据下拉框 */
			//点击入库单据下拉框事件
			$("#selectDiv").click(function () {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			var input = $('select[id="bar"]').next().find('.layui-select-title input')
			var val = input.val()
			//先更新一下入库单
			@@ -536,8 +535,7 @@
			})
			//点击入库单据下拉框事件
			$("#selectDiv1").click(function () {
			if (xianshiyemian == 1)
			{
			if (xianshiyemian == 1) {
			var input = $('select[id="bar1"]').next().find('.layui-select-title input')
			var val = input.val()
			//先更新一下入库单
			@@ -554,8 +552,7 @@
			/* 绑定入库单信息 */

			function updateBillList(callback) {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			var input = $('select[id="bar"]').next().find('.layui-select-title input')
			var val = input.val()
			$("#bar").empty()
			@@ -590,8 +587,7 @@
			}
			});
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			var input = $('select[id="bar1"]').next().find('.layui-select-title input')
			var val = input.val()
			$("#bar1").empty()
			@@ -671,8 +667,7 @@

			//绑定到托盘事件
			form.on('submit(formBind)', function (data) {
			if(xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			console.log($("#goodSelect").val());
			if ($("#bar").val() == "") {
			layer.msg('请选择入库单', {
			@@ -735,8 +730,7 @@
			}
			});
			}
			else if(xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			if ($("#bar1").val() == "") {
			layer.msg('请选择入库单', {
			icon: 2,
			@@ -761,7 +755,8 @@
			var param = {
			AsnNo: $("#bar1").val(), //出库单据
			PalletNo: $("#STOCKCODE1").val(), //托盘条码
			AsnDetailId: parseInt($("#goodSelect1").val()), //物料批次
			AsnDetailId: parseInt($("#goodSelect1").val()), //入库单明细ID
			LotNo: $("#goodSelect1").find("option:selected").text(), //物料批次
			SkuQty: parseInt($("#SkuQty").val()), //物料数量
			Origin:"PDA"
			}
			@@ -796,8 +791,7 @@

			// 根据入库明细ID 获取详细信息
			function setOrderGoods() {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			$("#ImportQuantity").val("");
			$("#Standard").val("");
			$("#ImportFactQuantity").val("");
			@@ -815,8 +809,7 @@
			}
			});
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			$("#ImportQuantity1").val("");
			$("#Standard1").val("");
			$("#ImportFactQuantity1").val("");
			@@ -841,8 +834,7 @@

			/* 绑定入库单物料及批次 */
			function updateGoodList(skuNo) {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			console.log("aaaa");
			var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
			var val = input.val()
			@@ -905,8 +897,7 @@
			}
			});
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			console.log("bbbb");
			var input = $('select[id="goodSelect1"]').next().find('.layui-select-title input')
			var val = input.val()
			@@ -930,8 +921,7 @@
			$("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
			.SkuName);
			}
			if (res.data[i].LotNo != null)
			{
			if (res.data[i].LotNo != null) {
			$("#goodSelect1").append("-" + res.data[i].LotNo +
			'</option>');
			}
			@@ -965,8 +955,7 @@

			// 渲染箱码信息
			function refreshTable() {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			//先清空一下箱子列表
			let trs = $("#tableBoxList tr")
			let len = trs.length
			@@ -1046,8 +1035,7 @@
			}
			});
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			//先清空一下箱子列表
			let trs = $("#tableBoxList1 tr")
			let len = trs.length
			@@ -1138,8 +1126,7 @@

			// 判断托盘码是否可用
			function checkPalletStat() {
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			var param = {
			"PalletNo": $("#STOCKCODE").val()
			}
			@@ -1158,8 +1145,7 @@
			}
			});
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			var param = {
			"PalletNo": $("#STOCKCODE1").val()
			}
			@@ -1247,8 +1233,7 @@
			//设置分页
			function setPages(pageIndex, boxNum){

			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			if(boxNum <= 0){
			//列表为空，隐藏分页页码
			$("#tableBoxPages").hide()
			@@ -1285,8 +1270,7 @@

			setCurPage(1)
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			if(boxNum <= 0){
			//列表为空，隐藏分页页码
			$("#tableBoxPages1").hide()
			@@ -1328,8 +1312,7 @@

			//设置当前分页
			function setCurPage(pageIndex){
			if (xianshiyemian == 0)
			{
			if (xianshiyemian == 0) {
			let totalTrNum = $("#tableBoxList tr").length
			if(totalTrNum <= 2 ){
			//console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
			@@ -1380,8 +1363,7 @@
			}
			}
			}
			else if (xianshiyemian == 1)
			{
			else if (xianshiyemian == 1) {
			let totalTrNum = $("#tableBoxList1 tr").length
			if(totalTrNum <= 2 ){
			return
			@@ -1433,10 +1415,8 @@

			}

			function getBoxPageNum()
			{
			if (xianshiyemian == 0)
			{
			function getBoxPageNum() {
			if (xianshiyemian == 0) {
			let num = $("#tableBoxList tr").length
			if(num <= 2 ){
			return 0
			@@ -1449,8 +1429,7 @@

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