MES-WEB-LayUI.git

			@@ -315,6 +315,35 @@
			$("#HBillerID").hide();



			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, 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: 'HAuxPropName', title: 'è¾å©å±æ§', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150, hide: true }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150, totalRow: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
			, { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
			, { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
			//, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new


			@@ -337,6 +366,7 @@
			function RoadBillMain(linterid) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			type: "GET",
			data: { "HInterID": linterid },
			success: function (d) {
			@@ -408,7 +438,9 @@
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			//RoadBillSub(linterid);
			HSourceFlag = true;
			}

			@@ -577,6 +609,57 @@
			})
			});

			//#region å é¤

			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åå°ä¸å¯æ¢å¤ï¼", { title: "å é¤ç¡®è®¤" }, function (index) {
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var sMaterID = data[0].HMaterID
			var sAuxPropID = data[0].HAuxPropID
			var sMTONo = ''
			var sSourceInterID = data[0].HSourceInterID
			var sSourceEntryID = data[0].HSourceEntryID
			var HBillType = '1210';
			var sHStockOrgID = sessionStorage["OrganizationID"]
			layer.load(3)
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			});
			}
			});
			layer.close(index)
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡è®°å½ï¼è¿è¡å é¤ï¼');
			}
			});

			//#endregion

			//å³éæé®
			form.on('submit(Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			@@ -702,34 +785,37 @@
			//æ¸ç©ºæ°é
			$("#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");
			}
			});
			DisBillEntryList();

			////æ¾ç¤ºè¡¨ä½æç»
			//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();
			@@ -859,34 +945,37 @@
			}
			}
			//æ¾ç¤ºè¡¨ä½æç»
			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");
			}
			});
			DisBillEntryList();

			////æ¾ç¤ºè¡¨ä½æç»
			//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("");
			}
			@@ -1062,33 +1151,37 @@
			HSourceFlag = true;
			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 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});

			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();

			//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 }
			// , { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			// ]]
			// // , data: [linterid]
			// // , page: true
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});
			}
			else {
			// $("#verifycode").click();
			@@ -1101,6 +1194,45 @@
			});
			}

			//#region æ¾ç¤ºç©æåè¡¨ä¿¡æ¯

			function DisBillEntryList() {
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var HBillType = '1210'
			var sHStockOrgID = sessionStorage["OrganizationID"];

			//å·æ°åè¡¨ä¿¡æ¯
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": sHStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.Materlist;
			table.render(listOption);

			//console.log(result.data.list2);
			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.Materlist.length; i++) {
			count += result.data.Materlist[i].HQty;
			count1 += result.data.Materlist[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarcodeQtys").val(count1);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			}
			});
			}

			//#endregion

			});
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			function GetHWHValue(obj) //è¿åè°å¥ä»åº