JC34WMS.git - Gitblit

			@@ -130,7 +130,7 @@
			</div>
			<!-- 确认出库口弹窗 -->
			<div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
			<div class="layui-inline">
			<!-- <div class="layui-inline">
			<label class="layui-form-label">拆垛方式</label>
			<div class="layui-input-inline" style="width: 220px;">
			<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
			@@ -138,7 +138,7 @@
			<option value="1">PDA拆垛</option>
			</select>
			</div>
			</div>
			</div> -->
			<!-- <div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
			<label class="layui-form-label">装车口</label>
			<div class="layui-input-inline" style="width: 220px;">
			@@ -156,10 +156,8 @@
			<div class="layui-input-inline" style="width: 220px;">
			<select name="PickingArea" id="PickingArea" lay-search>
			<option value=""></option>
			<option value="1">1</option>
			<option value="2">2</option>
			<option value="3">3</option>
			<option value="4">4</option>
			<option value="17">17工位</option>
			<option value="18">18工位</option>
			</select>
			</div>
			</div>
			@@ -340,7 +338,11 @@
			</script>
			<!-- #endregion -->
			</div>

			<!-- if(d.Type == "1" && (d.Status == '2' \|\| d.Status == '3')){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="beiLiaoOutKu">
			<i class="layui-icon layui-icon-ok"></i>备料
			</a>`;
			} -->
			<script type="text/html" id="table-content-list">
			{{# function GetBtn1(d){
			var html = '';
			@@ -352,7 +354,7 @@
			</a>`;
			}
			}
			if(d.Status == '0' && d.Origin == 'WMS'){
			if(d.Status == '0'){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
			<i class="layui-icon layui-icon-edit"></i>编辑
			</a>
			@@ -365,12 +367,8 @@
			<i class="layui-icon layui-icon-delete"></i>取消分配
			</a>`;
			}
			if(d.Type == "1" && (d.Status == '2' \|\| d.Status == '3')){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="beiLiaoOutKu">
			<i class="layui-icon layui-icon-ok"></i>备料
			</a>`;
			}
			if( d.Status == '2' \|\| d.Status == '3'){

			if( (d.Status == '2' \|\| d.Status == '3')){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
			<i class="layui-icon layui-icon-ok"></i>出库
			</a>`;
			@@ -492,6 +490,7 @@
			{ field: 'SONo', title: '出库单号', align: 'center', fixed: 'left', width: 165, "disabled": true },
			{ field: 'Type', title: '单据类型', align: 'center', templet: '#templetType' , width: 120,},
			{ field: 'Status', title: '执行状态', align: 'center', templet: '#templetStatus', width: 90, },
			{ field: 'OrderCode', title: '下发单号', align: 'center', width: 180 },
			{ field: 'LogisticsName', title: '承运商', align: 'center', width: 120, },
			{ field: 'CustomerName', title: '客户名称', align: 'center', width: 120, },
			{ field: 'WareHouseName', title: '仓库', align: 'center', width: 90, },
			@@ -1128,6 +1127,7 @@
			}
			});
			var isNeedUnpack = '0'//是否需要拆箱，0：否 1：是
			var xmlFileName="";
			//监听数据操作
			table.on('tool(LAY-app-content-list)', function (obj) {
			var data = obj.data;
			@@ -1274,50 +1274,12 @@
			area: ['1200px', '90%'],
			});
			} else if (obj.event === 'outKu') {
			$("#UnstackWay").val(0)
			$("#UnstackWay").attr("disabled", false);
			//$("#LoadingArea").val('')
			$("#PickingArea").val('')
			$('.DivLoadingArea').show()
			form.render('select');
			var param = {
			soNo: SoNo
			};
			if (orderType == "0") {
			// 判断是否需要拆箱，需要拆箱就需要选择出库口
			sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function (res) {
			if (res.code == 0) { //成功
			if (res.data == "1") {
			isNeedUnpack = '1'
			$('.DivPickingArea2').show()
			} else {
			isNeedUnpack = '0'
			$('.DivPickingArea2').hide()
			}
			if ($('#UnstackWay').val() == '1') {
			$('.DivPickingArea2').show()
			}

			outFunction(data.SONo)
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			return;
			});
			}
			});
			} else {
			$("#UnstackWay").val(1)
			$("#UnstackWay").attr("disabled", true);
			form.render('select');

			$('.DivLoadingArea').hide()

			outFunction(data.SONo)
			}


			//if(data.WareHouseName =="成品库"){
			outFunction(data.SONo);
			// }else{
			// outFunction2(data.SONo)
			// }

			} else if (obj.event === 'beiLiaoOutKu') {
			if (orderType != "1") {
			@@ -1340,6 +1302,14 @@
			};
			sendData(IP + "/BllSo/AddExXmlStr", param, 'post', function (res) {
			console.log(res);
			if(data.Type=="0"){
			xmlFileName="SalesWareHouseOut_"+data.OrderCode+"_linklink";
			}else if(data.Type=="2"){
			xmlFileName="CheckWareHouseOut_"+data.OrderCode+"_linklink";
			}else{
			xmlFileName=data.OrderCode+"_linklink";
			}

			if (res.code == 0) { //成功
			createFile(res.data);
			layer.msg("操作成功！", {
			@@ -1430,6 +1400,7 @@

			//选择出库口弹窗方法
			function outFunction(soNo) {

			layer.open({
			type: 1,
			title: '确认出库口',
			@@ -1438,29 +1409,11 @@
			area: ['350px', '285px'],
			btn: ['确定', '取消'],
			yes: function (index, layero) {
			var pa = $('#PickingArea').val();
			console.log(pa)

			if (isChongFu == true) {
			isChongFu = false;
			if (pa == null) {
			layer.msg("请勿重复点击", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			return;
			}
			// if ($('#UnstackWay').val() == '0') {
			// if ($('#LoadingArea').val() == '') {
			// layer.msg("请选择装车口", {
			// icon: 2,
			// time: 2000 //2秒关闭（如果不配置，默认是3秒）
			// });
			// isChongFu = true;
			// return;
			// }
			// }
			console.log($("#PickingArea").val())
			if ($("#PickingArea").val() == '') {

			if ($("#PickingArea").val() == '' \|\| $('#PickingArea').val() == null) {
			layer.msg("请选择出库口", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			@@ -1470,8 +1423,8 @@
			}
			var param = {
			soNo: soNo,
			unstackingMode: $('#UnstackWay').val(),
			outMode: pa,
			//unstackingMode: $('#UnstackWay').val(),
			outMode: $("#PickingArea").val(),
			//loadingAddre: $('#LoadingArea').val()
			};
			console.log(param);
			@@ -1503,6 +1456,47 @@
			});
			}

			}
			});
			}

			//不选择出库口的弹窗方法
			function outFunction2(soNo) {
			layer.confirm('确定当前单据出库吗？', function (index) {

			if (isChongFu == true) {
			isChongFu = false;

			var param = {
			soNo: soNo,
			};
			console.log(param);
			sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function (res) {
			console.log(res);
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 3000 //1秒关闭（如果不配置，默认是3秒）
			}, function () {
			refreshTable();
			isChongFu = true;
			});
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 3000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			refreshTable();
			isChongFu = true;
			});
			}
			layer.close(index);
			});
			} else {
			layer.msg("请勿重复点击", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			}
			});
			}
			@@ -1613,7 +1607,7 @@
			function createFile(val) {
			var content = val; // 文件内容
			var blob = new Blob([content], { type: "text/plain;charset=utf-8" });
			var fileName = "ExInfo.xml"; // 文件名
			var fileName = xmlFileName+".xml"; // 文件名
			saveAs(blob, fileName);
			}
			//下载文件函数