MES-WEB-LayUI.git

			@@ -19,7 +19,7 @@
			<body>
			<div class="layui-fluid" style="padding:0">
			<div class="layui-card">
			<div class="layui-card-body" style="padding: 5px; height:800px;">
			<div class="layui-card-body" style="padding: 0px; height:800px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="background-color:#0085E8;">
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>å§å¤åºåºå</span>
			@@ -34,6 +34,14 @@
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">ç¡®å®</button>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -96,7 +104,7 @@
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			@@ -175,14 +183,14 @@
			<!--ç©ææ¸å-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<!--<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>-->
			</div>
			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			@@ -284,7 +292,7 @@

			<!--æ¥å¿-->
			<div class="layui-tab-item">
			<textarea id="rizhi" style="height: 200px;width: 100%;margin-left: 1%;"></textarea>
			<textarea id="rizhi" style="height: 200px;width: 98%;margin-left: 1%;"></textarea>
			</div>
			</div>
			</div>
			@@ -333,7 +341,7 @@
			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHNAME").val(sessionStorage["HWHName"]);
			$("#HSupID").val(sessionStorage["HSPID"]);
			$("#HStockPlaceID").val(sessionStorage["HSPID"]);
			$("#HStockPlaceName").val(sessionStorage["HSPName"]);
			//$("#HSupID").val(sessionStorage["HSupID"]);
			//$("#HSupName").val(sessionStorage["HSupName"]);
			@@ -348,6 +356,7 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];

			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			@@ -377,15 +386,26 @@
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HBillType").val(d.data[0].HSourceBillType == null ? "1604" : d.data[0].HSourceBillType);
			//è·åæºåç±»åãæºååå·
			if (d.data[0].HSourceBillType == "1604") {
			$("#HBillType").empty();
			$("#HBillType").val("1604");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'å§å¤è®¢å-ææ' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").val("-1");
			}
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			//$("#HSecManagerID").val(d.data[0].HSecManagerID);
			//$("#HDeptID").val(d.data[0].HDeptID);
			//$("#HBarCode").val(d.data[0].HBarCode);
			//$("#HQty").val(d.data[0].HQty);
			RoadSup();
			$("#HSourceBillNo").attr("disabled", "true");
			HSourceFlag = true;
			$("#HDeptID").val(d.data[0].HDeptID);
			$("#HDeptName").val(d.data[0].HDeptName);
			//RoadSup();
			}
			})
			}
			@@ -412,7 +432,6 @@
			$("#HSupName").val(result.data[0].HSupName);
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			sessionStorage["SourceFlag"] = true;
			element.tabChange('tab-EntrustOutBill', '2');
			layer.load(3);
			}
			@@ -467,7 +486,7 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1211' },
			success: function (d) {
			@@ -485,8 +504,7 @@



			//éæ©ä»åº
			form.on('submit(HWHID-BT)', function () {
			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -494,13 +512,28 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});
			////éæ©ä»åº
			//form.on('submit(HWHID-BT)', function () {
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});

			//éæ©ä»ä½
			form.on('submit(HSpID-BT)', function () {
			@@ -637,9 +670,10 @@

			//éåºæé®
			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			HSourceFlag = false;
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			})

			//ç¼è¾æé®
			@@ -681,7 +715,8 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæå§å¤åºåºå" + data.Message + $("#HBillNo").val(), {
			layer.confirm(data.Message, {
			//layer.confirm("çæå§å¤åºåºå" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			@@ -720,7 +755,7 @@
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			@@ -728,6 +763,7 @@
			$("#HStockPlaceName").val(result.data[0].HName);
			$("#HWHID").val(result.data[0].HWHID);
			$("#HWHNAME").val(result.data[0].HWhName);
			$("#HStockPlaceID").val(result.data[0].HItemID);
			element.tabChange('tab-POStockInBill', '2');
			}
			else {
			@@ -739,12 +775,42 @@
			}
			});

			//æ«ä»åº
			$('#HWHNAME').on('keydown', function (event) {
			var HBarCode = $('#HWHNAME').val()
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg('æ ä»åºæ¡ç ä¿¡æ¯ï¼');
			return;
			}
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/LookingFor/getWHName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//$("#HStockPlaceName").val(result.data[0].HName);
			//$("#HStockPlaceID").val(result.data[0].HItemID);
			$("#HWHID").val(result.data[0].HItemID);
			$("#HWHNAME").val(result.data[0].HName);
			element.tabChange('tab-POStockInBill', '2');
			}
			else {
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			// layer.msg($('#HSourceBillNo').val(), { icon: 1 });
			}
			});

			//æ¡å½¢ç åè½¦æ¹æ³
			$('#HBarCode').on('keydown', function (event) {
			var sQty = $("#HQty").val();
			if (sQty == "") {
			sQty = 0;
			}

			if (event.keyCode == 13) {
			GetMeesageByBarCode();
			}
			@@ -828,12 +894,16 @@
			var sBillNo = $("#HBillNo").val()
			var sQty = $("#HQty").val()
			var sWHID = $("#HWHID").val()
			var sSPID = $("#HSupID").val()
			var sSPID = $("#HStockPlaceID").val()
			var sHBillType = $("#HBillType").val()
			var sSourceBillNo = $("#HSourceBillNo").val()
			var Flag = sessionStorage["SourceFlag"];
			var Flag = HSourceFlag;
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			var sQty = $("#HQty").val();
			if (sQty == "") {
			sQty = 0;
			}

			if (sBarCode == '') {
			playSound();
			@@ -847,25 +917,91 @@
			$('#HQty').val("");
			}
			$.ajax({
			url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": '1211', "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sWHID, "HSPID": sSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": Flag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			//url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			//type: "GET",
			//data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			$("#HStockPlaceName").val("");
			$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2'); //è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'ä»ä½æ¡ç ') {
			$("#HStockPlaceName").val(result.data.HSPName);
			$("#HStockPlaceID").val(result.data.HSPID);
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			$("#HNote").val(";ä¸é®æ«ç ä»ä½æ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			$("#HBillType").val(result.data.hSourceBillTypeField == null ? "1604" : result.data.hSourceBillTypeField);
			if (result.data.hSourceBillTypeField == "1604") {
			$("#HBillType").empty();
			$("#HBillType").val("1604");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å§å¤è®¢å-ææ' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			element.tabChange('tab-EntrustOutBill', '3');
			}
			else {
			if (HSourceFlag == true) {
			element.tabChange('tab-EntrustOutBill', '3');
			}
			else {
			HSourceFlag = true;
			$("#HNote").val(";ç©ææ¡ç ");
			element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			}
			}
			playSound1();
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç ï¼æå\n");
			element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			//element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150, totalRow: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -906,6 +1042,8 @@
			layer.closeAll("loading");
			}
			});
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			playSound();
			@@ -940,7 +1078,7 @@
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			playSound1();
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æºåå·ï¼æå\n");
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			element.tabChange('tab-EntrustOutBill', '2'); //è·³è½¬é¡µç¾
			layer.load(3)
			table.render({
			@@ -948,11 +1086,12 @@
			// , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
			, url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true}
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -960,6 +1099,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -990,7 +1130,9 @@
			}
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HSupID").val(obj[0].HItemID);
			$("#HStockPlaceID").val(obj[0].HItemID);
			$("#HWHNAME").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);
			}
			function GetHSupValue(obj) { //è¿åä¾åºå
			$("#HSupName").val(obj[0].HName);
			@@ -1009,6 +1151,12 @@
			$("#HDeptID").val(obj[0].HItemID);
			}
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			//if (reg.test($("#HQty").val()) == false \|\| $("#HQty").val() == '') {
			// layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if ($("#HSourceBillNo").val() == '') {
			// layer.msg("è¯·åæ«æºå!", { icon: 5 });
			// return false;