MES-WEB-LayUI.git

			@@ -9,7 +9,7 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<style>


			.layui-col-xs8 {
			width: 55.666667%;
			}
			@@ -78,11 +78,26 @@
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ«æç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name=" HScanStyle" id="HScanStyle">
			<select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
			<option value="æ´ææ«ç ">æ´ææ«ç </option>
			<option value="åä¸ªæç ">åä¸ªæç </option>
			<option value="ååæç ">ååæç </option>
			<option value="æ´æå é¤">æ´æå é¤</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">åè¿ååºä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
			<input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
			</div>
			</div>
			</div>
			@@ -126,7 +141,7 @@
			<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>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			</div>
			</div>
			</div>
			@@ -215,20 +230,21 @@

			<!--ç©ææ¸å-->
			<div class="layui-tab-item">
			<!--<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs4">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>-->
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs4">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>

			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			<!--æç»æ¸å-->

			<div class="layui-tab-item">
			<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
			</div>
			@@ -285,7 +301,6 @@
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">ç¼è¾</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">å é¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSDelete">æ´æå é¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">éåº</button>
			</div>
			<div id="" style="display:none;">
			@@ -313,10 +328,10 @@
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;


			@@ -331,7 +346,7 @@
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ field: 'å¨åºç¶æ', title: 'å¨åºç¶æ',width:180 }
			{ field: 'å¨åºç¶æ', title: 'å¨åºç¶æ', width: 180 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡' }
			, { field: 'æ°é', title: 'æ°é' }
			@@ -375,6 +390,7 @@
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -427,10 +443,10 @@
			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å



			function RoadBillMain(linterid)//å è½½è¡¨å¤´


			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			@@ -444,6 +460,9 @@
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			HSourceFlag = true;
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);

			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			@@ -504,6 +523,7 @@
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			@@ -520,21 +540,50 @@
			layer.closeAll("loading");
			}
			});

			//$.ajax({
			// url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			// type: "GET",
			// data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// listOption.data = result.data.list;
			// table.render(listOption);
			// listOption1.data = result.data.list2;
			// table.render(listOption1);

			// //console.log(result.data.list2);
			// 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);
			// //return;
			// }
			// else {
			// layer.msg(result.Message);
			// }
			// layer.closeAll("loading");
			// }
			//});
			}


			//å¨æå è½½æºåç±»ååè¡¨ new










			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			@@ -547,13 +596,12 @@
			//$("#HBillNo").val('421458026');
			set_InitGrid();
			}
			});
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new-----ä¸ä¼èµ°
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			}


			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			@@ -564,6 +612,21 @@
			, 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(HWHID_FIFO-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=HFIFOWHID', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -695,9 +758,7 @@
			});

			form.on('submit(Cancel)', function () {
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})

			//ç¼è¾
			@@ -722,7 +783,7 @@
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'æç»åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , shade: 0.6 //é®ç½©éæåº¦wl-table
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/å¬å±é¡µé¢/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
			@@ -769,6 +830,7 @@
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			@@ -792,90 +854,63 @@

			//å é¤
			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			// console.log(data);
			var sInterID = $('#HInterID').val()
			var sMaterID = data[0].HMaterID
			var sBillType = '1205'
			var sAuxPropID = data[0].HAuxPropID
			//var sMTONo = data[0].HMTONo
			var sMTONo = ''
			var sSourceInterID = data[0].HSourceInterID
			var sSourceEntryID = data[0].HSourceEntryID
			$.ajax(
			{
			type: "Get",
			//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/Delete_Json",
			async: true,
			data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			, { field: 'HWHID', title: 'ck', width: 100 }
			]]
			//, height: 500
			})
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			//var checkStatus = table.checkStatus('wl-table')
			//, data = checkStatus.data;
			//// console.log(data);
			//var sInterID = $('#HInterID').val()
			//var sMaterID = data[0].HMaterID
			//var sBillType = '1205'
			//var sAuxPropID = data[0].HAuxPropID
			////var sMTONo = data[0].HMTONo
			//var sMTONo = ''
			//var sSourceInterID = data[0].HSourceInterID
			//var sSourceEntryID = data[0].HSourceEntryID
			//$.ajax(
			// {
			// type: "Get",
			// //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// url: GetWEBURL() + "/SellOut/Delete_Json",
			// async: true,
			// data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäº
			// table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , cellMinWidth: 80
			// , toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 100 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			// , { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			// , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			// , { field: 'HWHID', title: 'ck', width: 100 }
			// ]]
			// //, height: 500
			// })
			// }
			// else {
			// layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// },
			// error: function (err) {
			// layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// });
			});

			//æ´æå é¤ cmdSDelete
			form.on('submit(cmdSDelete)', function () {//å é¤
			var HBarCode = $('#HBarCode').val();
			var HInterID = $('#HInterID').val();
			if (HBarCode) {
			layer.msg("æ¡ç ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/POStockInBillList/SellOutBillSDeleCode",
			async: true,
			data: { "HBarCode": HBarCode, "HInterID": HInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.msg(data.Message, { icon: 1, btn: ['ç¡®è®¤'], time: 100000, title: "æ¸©é¦¨æç¤º" });
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});

			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			@@ -902,43 +937,43 @@
			} else {
			Saver(sMainStr);
			}


			}
			});
			//æäº¤æ¹æ³è°ç¨çajax
			function Saver(sMainStr) {
			layer.load(1);
			$.ajax(
			{
			type: "POST",
			// url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm(data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html";
			}//å³é
			}, function () {
			//sessionStorage["SourceFlag"] = false;
			window.location.reload();
			});//æ°å¢
			{
			type: "POST",
			// url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm(data.Message, {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html";
			}//å³é
			}, function () {
			//sessionStorage["SourceFlag"] = false;
			window.location.reload();
			});//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});
			}

			//çå¬æäº¤
			@@ -963,7 +998,7 @@
			form.on('submit(QueDin)', function (data) {
			GetMeesageByBarCode();
			});



			$('#HStockPlaceName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HStockPlaceName').val()
			@@ -1066,7 +1101,7 @@
			//});

			//æ«æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			$('#HSourceBillNo').on('keydown', function (event) {
			if (event.keyCode == 13) {
			GetMeesageBySourceBillNo();
			}
			@@ -1082,13 +1117,13 @@
			// , url: 'http://localhost:8083/Web/SellOut/GetHBarCodeShowBillSub'
			//, toolbar: '#toolbarDemo'
			// , where: { sMsg: linterid, sMsg2: lentryid }
			, cols: [[
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			]]
			, page: true
			, height: 500
			, done: function () {
			}
			, cols: [[
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			]]
			, page: true
			, height: 500
			, done: function () {
			}
			});

			//æ«æºåæ¥è´§
			@@ -1141,7 +1176,7 @@
			}
			});
			}


			//æ«æ¡ç
			function GetMeesageByBarCode(obj) { //è¿åå·¥ä½ä¸å¿
			var sOldBarCode = $('#HBarCode').val()
			@@ -1154,6 +1189,8 @@
			var sHWHID = $("#HWHID").val();//ä»åºID
			var sHSPID = $("#HStockPlaceID").val();//ä»ä½ID
			var sQty = $("#HQty").val()//æ°é
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			if (sQty == "") {
			sQty = 0;
			}
			@@ -1195,6 +1232,58 @@
			}
			});
			}
			else if (HScanStyle == "æ´æå é¤") {
			var HBarCode = $('#HBarCode').val();
			var HInterID = $('#HInterID').val();
			if (HBarCode == "") {
			layer.msg("æ´æå é¤æ¡ç ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/POStockInBillList/SellOutBillSDeleCode",
			async: true,
			data: { "HBarCode": HBarCode, "HInterID": HInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.msg(data.Message, { icon: 1, btn: ['ç¡®è®¤'], time: 100000, title: "æ¸©é¦¨æç¤º" });
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			, { field: 'HWHID', title: 'ck', width: 100 }
			]]
			//, height: 500
			})
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			else {
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == '') {
			@@ -1210,7 +1299,7 @@
			$.ajax({
			url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle},
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
			success: function (result) {
			playSound1();
			if (result.count == 1) {
			@@ -1286,38 +1375,70 @@
			//$("#HSupName").val(result.data.HSupName);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HDeptName").val(result.data.HDeptName);
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {


			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HSNO', title: 'åºå·', width: 60 }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			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);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});

			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.length; i++) {
			count += result.data.HQty;
			count1 += result.data.HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//var count = 0;
			//var count1 = 0;
			//for (var i = 0; i < result.data.length; i++) {
			// count += result.data.HQty;
			// count1 += result.data.HPieceQty;
			//}
			//$("#HSumQtys").val(count);
			//$("#HBarCodeQtys").val(count1);
			playSound1();
			}
			else {
			@@ -1336,6 +1457,57 @@
			//11
			}
			});
			}
			}




			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80, totalRow: true }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80, totalRow: true }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			var listOption1 = {
			elem: '#mx-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
			//, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			//, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			function playSound() {
			@@ -1364,6 +1536,10 @@
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var HSourceBillType = $("#HBillType").val()
			var HBillType = '1205'
			var HWHID_FIFO = $("#HWHID_FIFO").val();//åè¿ååºä»åºID
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			if (HSourceBillNo == "" \|\| sInterID <= 0) {
			layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			@@ -1371,7 +1547,7 @@
			$.ajax({
			url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			type: "GET",
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//GetSellOutFindSP();
			@@ -1385,26 +1561,56 @@
			// where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			//});

			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {
			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HSNO', title: 'åºå·', width: 60 }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			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);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});
			@@ -1416,8 +1622,9 @@
			}
			});
			}


			});


			//ä»¥ä¸ä¸ºlayuiæ¨¡å

			@@ -1427,6 +1634,11 @@
			//sessionStorage["HWHID"] = obj[0].HItemID;
			$("#HWHID").val(obj[0].HItemID);
			}
			function GetHFIFOWHNAMEValue(obj) //è¿ååè¿ååºä»åº
			{
			$("#HWHNAME_FIFO").val(obj[0].HName);
			$("#HWHID_FIFO").val(obj[0].HItemID);
			}
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);