MES-WEB-LayUI.git

			@@ -577,13 +577,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});






			//éæ©ä¾åºå
			form.on('submit(HSupID-BT)', function () {
			layer.open({
			@@ -665,7 +671,9 @@

			//éåº
			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			window.close();
			});
			})
			//ç¼è¾
			form.on('submit(cmdModify)', function () {
			@@ -942,162 +950,167 @@
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç

			if (sQty == "") {
			sQty = 0;
			}
			var HDeleteFlag = sBarCode.substring(0, 1);
			var sBarCodeNew = sBarCode.slice(1);

			//å¤ææ¡ç æ¯å¦ä¸ºç©º 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 (sHWHID == "184154") {
			if (sHSPID == "0") {


			if (sQty == "") {
			sQty = 0;
			}

			//å¤ææ¡ç æ¯å¦ä¸ºç©º new
			if (sBarCode == '') {
			playSound();
			layer.msg("ä»ä½ä¸ºç©ºï¼è¯·éæ©ä»ä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ¡ç ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			}
			$.ajax({
			url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
			type: "GET",
			async: false,
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "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(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-POStockInBill', '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-POStockInBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-POStockInBill', '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.hSourceBillNoField);
			$("#HBillType").val(result.data.hSourceBillTypeField)
			sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1102") {
			$("#HBillType").val("1102");

			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			if (sQty != "") {
			$('#HQty').val("");
			}
			//if (sHWHID == "184154") {
			// if (sHSPID == "0") {
			// playSound();
			// layer.msg("ä»ä½ä¸ºç©ºï¼è¯·éæ©ä»ä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			// }
			//}
			$.ajax({
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			type: "GET",
			async: false,
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			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(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-POStockInBill', '2'); //è·³è½¬é¡µç¾
			}
			else if (result.data.HSourceBillType == "1103") {
			$("#HBillType").val("1103");
			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-POStockInBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-POStockInBill', '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.hSourceBillNoField);
			$("#HBillType").val(result.data.hSourceBillTypeField)
			sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1102") {
			$("#HBillType").val("1102");

			}
			else if (result.data.HSourceBillType == "1103") {
			$("#HBillType").val("1103");
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			}
			$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			element.tabChange('tab-POStockInBill', '3');
			}
			else {
			$("#HBillType").val("æå·¥å½å¥");
			if (HSourceFlag == true) {
			element.tabChange('tab-POStockInBill', '3');
			}
			else {
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			//$("#HBillType").val(result.data.hSourceBillTypeField)
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1102") {
			$("#HBillType").empty();
			$("#HBillType").val("1102");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'éè´è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			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").val("-1");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ç©ææ¡ç ");
			element.tabChange('tab-POStockInBill', '3');
			}
			}
			$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			element.tabChange('tab-POStockInBill', '3');

			layer.load(3)
			$.ajax({
			url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			//$("#HBarCode_B").val(result.data.list2[0].HBarCode);
			//$("#HMaterName_B").val(result.data.list2[0].HMaterName);
			//$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
			//$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
			//$("#HUnitName_B").val(result.data.list2[0].HUnitName);
			//$("#HQty_B").val(result.data.list2[0].HQty);
			//$("#HTMQty_B").val(result.data.list2[0].HTMQty);
			//$("#HWHName_B").val(result.data.list2[0].HWHName);
			//$("#HSPName_B").val(result.data.list2[0].HSPName);

			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});
			}
			else {
			if (HSourceFlag == true) {
			element.tabChange('tab-POStockInBill', '3');
			}
			else {
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			//$("#HBillType").val(result.data.hSourceBillTypeField)
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1102") {
			$("#HBillType").empty();
			$("#HBillType").val("1102");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'éè´è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			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").val("-1");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ç©ææ¡ç ");
			element.tabChange('tab-POStockInBill', '3');
			}
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}

			layer.load(3)
			$.ajax({
			url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			$("#HBarCode_B").val(result.data.list2[0].HBarCode);
			$("#HMaterName_B").val(result.data.list2[0].HMaterName);
			$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
			$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
			$("#HUnitName_B").val(result.data.list2[0].HUnitName);
			$("#HQty_B").val(result.data.list2[0].HQty);
			$("#HTMQty_B").val(result.data.list2[0].HTMQty);
			$("#HWHName_B").val(result.data.list2[0].HWHName);
			$("#HSPName_B").val(result.data.list2[0].HSPName);

			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});
			layer.closeAll("loading");
			}
			else {
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			});
			}
			var listOption = {
			elem: '#wl-table'
			@@ -1115,7 +1128,7 @@
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			, height: 500
			@@ -1174,6 +1187,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', sort: true, width: 200 }
			, { field: 'HSourceBillNo', title: 'æºååå·', sort: true, width: 200 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡' }
			, { field: 'HPieceQty', title:'æ¡ç ä»¶æ°', width: 100 }
			]]
			// , data: [linterid]
			// , page: true