JC24WMS.git - Gitblit

			@@ -66,6 +66,7 @@
			<option value="5">中间品出库</option>
			<option value="6">代储出库</option>
			<option value="7">其他出库</option>
			<option value="8">寄存出库</option>
			<!-- 09 -->
			<!-- <option value="0">标准销售出库</option>
			<option value="1">非标销售出库</option>
			@@ -90,7 +91,7 @@
			<option value="3">正在执行</option>
			<option value="4">执行完毕</option>
			<option value="5">订单关闭</option>
			<option value="6">已复核</option>
			<option value="6">上传完毕</option>
			</select>
			</div>
			</div>
			@@ -142,7 +143,7 @@
			<div class="layui-input-inline" style="width: 220px;">
			<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
			<option value="0" selected>机器人拆垛</option>
			<option value="1">人工拆垛</option>
			<option value="1">PDA拆垛</option>
			</select>
			</div>
			</div>
			@@ -212,6 +213,8 @@
			return "代储出库";
			case "7":
			return "其他出库";
			case "8":
			return "寄存出库";
			default:
			return "";
			}
			@@ -333,7 +336,7 @@
			var html = '';
			if(d.IsWave == '0'){
			if(d.Status == '0' \|\| d.Status == '1' ){
			if(d.type != "8") {
			if(d.Type != "8") {
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
			<i class="layui-icon layui-icon-ok"></i>自动分配
			</a>`;
			@@ -364,11 +367,13 @@
			</a>`;
			}
			if( d.Status == '5'){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check">
			<i class="layui-icon layui-icon-ok"></i>复核
			</a>`;
			}

			html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
			<i class="layui-icon layui-icon-ok"></i>XML
			</a>`;
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
			<i class="layui-icon layui-icon-edit"></i>备注</a>`;
			return html;
			@@ -1110,6 +1115,7 @@
			console.log(data);
			Id = data.Id;
			SoNo = data.SONo;
			var orderType=data.Type//单据类型
			if (obj.event === 'delete') {//删除
			layer.confirm('确定删除此单据吗？', function(index) {
			var param = {
			@@ -1137,7 +1143,7 @@
			var param = {
			Id: parseInt(Id),
			};
			sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function(res) {
			sendData(IP + "/UpApi/CloseExportNotice", param, 'post', function(res) {
			console.log(res);
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			@@ -1221,85 +1227,52 @@
			maxmin: true,
			area: ['1200px', '90%'],
			});
			}else if(obj.event === 'outKu'){
			}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
			};
			sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
			if (res.code == 0) { //成功
			if(res.data=="1"){
			isNeedUnpack='1'
			$('.DivPickingArea2').attr("style", "display:block")
			}else{
			isNeedUnpack='0'
			$('.DivPickingArea2').attr("style", "display:none")
			}
			if($('#UnstackWay').val()=='1'){
			$('.DivPickingArea2').attr("style", "display:block")
			}
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function() {
			return;
			});
			}
			});
			layer.open({
			type: 1,
			title: '确认出库口',
			content: $('#divPickingArea'),
			maxmin: true,
			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秒）
			});
			}
			var param = {
			soNo: data.SONo,
			outMode: pa,
			};
			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("请勿重复点击", {
			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)
			}


			}else if(obj.event === 'xml'){//编辑
			layer.confirm('确定要将选中的单据上传吗？', function() {
			if (isChongFu== true) {
			@@ -1371,9 +1344,113 @@
			});
			}
			});
			}else if(obj.event === 'check'){//复核
			// 代码区域
			layer.confirm('确定复核此单据吗？', function(index) {
			var param = {
			Id:data.Id,
			};
			sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
			if (res.code == 0) { //成功
			layer.msg(res.msg, {
			icon: 1,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () {
			refreshTable();
			doing = true
			});
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () { doing = true });
			}
			});
			});
			}
			});

			//选择出库口弹窗方法
			function outFunction(soNo){
			layer.open({
			type: 1,
			title: '确认出库口',
			content: $('#divPickingArea'),
			maxmin: true,
			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() == '')
			{
			layer.msg("请选择出库口", {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			});
			isChongFu= true;
			return;
			}
			var param = {
			soNo: soNo,
			unstackingMode:$('#UnstackWay').val(),
			outMode: pa,
			loadingAddre:$('#LoadingArea').val()
			};
			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秒）
			});
			}

			}
			});
			}

			table.on('tool(LAY-app-content-list2)', function(obj) {
			var data = obj.data;
			var id = data.Id;
			@@ -1469,15 +1546,15 @@
			form.on('select(UnstackWay)',function(data){
			var value = data.value;
			if(value==0){
			$('.DivLoadingArea').attr("style", "display:block")
			$('.DivLoadingArea').show()
			if(isNeedUnpack=='0'){
			$('.DivPickingArea2').attr("style", "display:none")
			$('.DivPickingArea2').hide()
			}else{
			$('.DivPickingArea2').attr("style", "display:block")
			$('.DivPickingArea2').show()
			}
			}else{
			$('.DivLoadingArea').attr("style", "display:none")
			$('.DivPickingArea2').attr("style", "display:block")
			$('.DivLoadingArea').hide()
			$('.DivPickingArea2').show()
			}
			});