MES-WEB-LayUI.git

			@@ -70,8 +70,11 @@
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" value="æ¶æéç¥å-å§å¤" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
			<input type="hidden" value="1103" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
			<select name="HBillType" id="HBillType">
			<option value="1103">æ¶æéç¥å</option>
			</select>
			<!--<input type="text" value="æ¶æéç¥å-å§å¤" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
			<input type="hidden" value="1103" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->

			<!--<select name="HBillType" id="HBillType">
			<option value="1103">æ¶æéç¥å-å§å¤</option>
			@@ -291,7 +294,7 @@
			, element = layui.element;

			var RZ = "";
			var Flag = sessionStorage["SourceFlag"];
			var HSourceFlag = sessionStorage["SourceFlag"];
			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHNAME").val(sessionStorage["HWHName"]);
			@@ -401,10 +404,12 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});
			HSourceFlag = false;
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			HSourceFlag = true;
			}

			//éæ©è°å¥ä»åº
			@@ -574,7 +579,6 @@

			//å³éæé®
			form.on('submit(Cancel)', function () {
			Flag = false;
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			@@ -661,6 +665,243 @@
			GetMeesageByBarCode();
			});

			//æ«æ¡ç
			function GetMeesageByBarCode(obj) {
			var sOldBarCode = $('#HBarCode').val()
			var HDeleteFlag = sOldBarCode.substring(0, 1);
			var sBarCode = sOldBarCode.slice(1);
			var sInterID = $("#HInterID").val()
			var sBillType = '1210'
			var sBillNo = $("#HBillNo").val()
			var sMaker = sessionStorage["HUserName"];
			var sHStockOrgID = sessionStorage["OrganizationID"];
			var sHWHID = $("#HWHID").val()
			var sHSPID = $("#HStockPlaceID").val()
			var sQty = $("#HQty").val()
			var sSourceBillNo = $("#HSourceBillNo").val()
			var sHBillType = $("#HBillType").val() //æºåç±»å

			if (HDeleteFlag == "*") {
			if (sBarCode == "") {
			layer.msg("è¯·æ«æè¦å é¤çæ¡ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			else {
			$('#HBarCode').val("");
			}
			$.ajax(
			{
			type: "GET",
			url: GetWEBURL() + "/ProductIn/Delete_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			playSound1();
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			//æ¾ç¤ºè¡¨ä½æç»
			layer.load(3);
			element.tabChange('tab-Kf_EntrustInBill', '2');
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { 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 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			playSound();
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			}
			},
			error: function (err) {
			playSound();
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			}
			});
			}
			else {
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			if (sQty == "") {
			sQty = 0;
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sHStockOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			success: function (result) {
			if (result.count == 1) {
			playSound1();
			if (result.data.hBarTypeField == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.hWhNameField);
			$("#HWHID").val(result.data.hWhIDField);
			$("#HStockPlaceName").val("");
			$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-Kf_EntrustInBill', '2'); //è·³è½¬é¡µç¾
			return;//ç»æ
			}
			else if (result.data.hBarTypeField == 'ä»ä½æ¡ç ') {
			$("#HStockPlaceName").val(result.data.hSPNameField);
			$("#HStockPlaceID").val(result.data.hSPIDField);
			$("#HWHNAME").val(result.data.hWhNameField);
			$("#HWHID").val(result.data.hWhIDField);
			$("#HNote").val(";ä¸é®æ«ç ä»ä½æ¡ç ");
			element.tabChange('tab-Kf_EntrustInBill', '2');//è·³è½¬é¡µç¾
			return;//ç»æ
			}
			else if (result.data.hBarTypeField == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.hDeptNameField);
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-Kf_EntrustInBill', '2');//è·³è½¬é¡µç¾
			return;//ç»æ
			}
			else if (result.data.hBarTypeField == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1103") {
			$("#HBillType").empty();
			$("#HBillType").val("1103");
			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-Kf_EntrustInBill', '3');
			}
			else {
			if (HSourceFlag == true) {
			element.tabChange('tab-Kf_EntrustInBill', '3');
			}
			else {
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1103") {
			$("#HBillType").empty();
			$("#HBillType").val("1103");
			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-Kf_EntrustInBill', '3');
			}
			}
			//æ¾ç¤ºè¡¨ä½æç»
			layer.load(3);
			element.tabChange('tab-Kf_EntrustInBill', '2');
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { 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 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			playSound();
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			}

			//æ«æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			@@ -688,7 +929,7 @@
			$("#HStockPlaceName").val(result.data[0].HName);
			$("#HWHID").val(result.data[0].HWHID);
			$("#HWHNAME").val(result.data[0].HWhName);
			element.tabChange('tab-POStockInBill', '2');
			element.tabChange('tab-Kf_EntrustInBill', '2');
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -772,7 +1013,7 @@
			//$("#HStockPlaceID").val(result.data[0].HItemID);
			$("#HWHID").val(result.data[0].HItemID);
			$("#HWHNAME").val(result.data[0].HName);
			element.tabChange('tab-POStockInBill', '2');
			element.tabChange('tab-Kf_EntrustInBill', '2');
			}
			else {
			// $("#verifycode").click();
			@@ -786,161 +1027,6 @@
			}
			});

			//æ«æ¡ç
			function GetMeesageByBarCode(obj) { //è¿åå·¥ä½ä¸å¿
			var sSubStr = table.cache['wl-table'];
			var sBarCode = $('#HBarCode').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var sQty = $("#HQty").val()
			var sHBillType = $("#HBillType").val()
			var sHWHID = $("#HWHID").val()
			var sHSPID = $("#HStockPlaceID").val()
			var sSourceBillNo = $("#HSourceBillNo").val()

			//å¤ææ¡ç æ¯å¦ä¸ºç©º new
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			if (sQty != "") {
			$('#HQty').val("");
			}
			if (sQty == "") {
			sQty = 0;
			}

			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			playSound1();
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			$("#HStockPlaceName").val("");
			//$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç ä»åºæ¡ç ï¼æå\n");
			element.tabChange('tab-Kf_EntrustInBill', '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(";ä¸é®æ«ç ä»ä½æ¡ç ");
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç ä»ä½æ¡ç ï¼æå\n");
			element.tabChange('tab-Kf_EntrustInBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			//$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç é¨é¨æ¡ç ï¼æå\n");
			element.tabChange('tab-Kf_EntrustInBill', '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);
			Flag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1103") {
			$("#HBillType").val("1103");

			}
			else if (result.data.HSourceBillType == "1601") {
			$("#HBillType").val("1601");
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			}
			//$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç æºåæ¡ç ï¼æå\n");
			element.tabChange('tab-Kf_EntrustInBill', '3');
			}
			else {
			if (Flag == "true") {
			element.tabChange('tab-Kf_EntrustInBill', '3');
			}
			else {
			//$("#HSupName").val(result.data.HSupName); 20210719ä¿®æ¹
			//$("#HSupID").val(result.data.HSupID); 20210719ä¿®æ¹
			//$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			Flag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1103") {
			$("#HBillType").val("1103");

			}
			else if (result.data.HSourceBillType == "1601") {
			$("#HBillType").val("1601");
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			}
			//$("#HNote").val(";ç©ææ¡ç ");
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç ç©ææ¡ç ï¼æå\n");
			element.tabChange('tab-Kf_EntrustInBill', '3');
			}
			}
			//$("#HSupID").val(result.data.HSupID);
			//$("#HSupName").val(result.data.HSupName);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HDeptName").val(result.data.HDeptName);
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { 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 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			playSound();
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			function playSound() {
			var audio = document.getElementById("cs");
			audio.play();
			@@ -973,7 +1059,7 @@
			$("#HSupName").val(result.data[0].HSupName);
			//$("#HDeptID").val(result.data[0].HDeptID);
			//$("#HDeptName").val(result.data[0].HDeptName);
			Flag = true;
			HSourceFlag = true;
			layer.load(3);
			element.tabChange('tab-Kf_EntrustInBill', '2');
			table.render({