MES-WEB-LayUI.git

			@@ -20,9 +20,9 @@
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<div class="layui-fluid" style="padding: 0px">
			<div class="layui-card">
			<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>
			@@ -45,18 +45,18 @@
			<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">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d?\.?\d?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1">éæ©æºå</li>
			<li lay-id="2">è¡¨å¤´ä¿¡æ¯</li>
			<li lay-id="3">æç»ä¿¡æ¯</li>
			<li lay-id="1" style="padding:1px;">éæ©æºå</li>
			<li lay-id="2" style="padding:1px;">è¡¨å¤´ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">æç»ä¿¡æ¯</li>
			<li lay-id="4" style="padding:1px;">ä¸æ¶ä¿¡æ¯</li>
			<li lay-id="5">åè®¡ä¿¡æ¯</li>
			<li lay-id="5" style="padding:1px;">åè®¡ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--éæ©æºå-->
			@@ -95,10 +95,12 @@
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æºåå·</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin3">éæ©</button>
			</div>
			</div>
			@@ -106,7 +108,7 @@
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs4">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åè¿ååºä»åº</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--åè¿ååºä»åº-->
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
			@@ -148,7 +150,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -162,7 +164,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -173,10 +175,24 @@
			<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="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">...</button>
			</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="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
			<input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -190,7 +206,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">é¢æ</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
			<input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -216,7 +232,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">é¨é¨</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
			<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -290,6 +306,7 @@
			<source src="../../video/success.wav" type="audio/ogg">
			</audio>
			</div>
			</div>
			</form>
			</div>
			</div>
			@@ -311,13 +328,19 @@
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;
			var HInterID = $('#HInterID').val()
			var HBillNo = $('#HBillNo').val()
			var HBillType = '1206'
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"]
			var HSourceFlag = sessionStorage["SourceFlag"];
			var OperationType = 0;//æä½ç±»å
			var option = [];


			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			//$("#HWHID").val(sessionStorage["HWHID"]);
			//$("#HWHNAME").val(sessionStorage["HWHName"]);
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHNAME").val(sessionStorage["HWHName"]);
			//$("#HStockPlaceID").val(sessionStorage["HSPID"]);
			//$("#HStockPlaceName").val(sessionStorage["HSPName"]);
			//$("#HSupID").val(sessionStorage["HSupID"]);
			@@ -352,6 +375,110 @@
			return [year, month, day].join('-');
			}

			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'
			});
			}

			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");
			}
			}
			var FIFOlistOption = {
			elem: '#FIFOlist-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'ä¸æ¶æ°é', width: 150, totalRow: true }
			, { field: 'HWhName', title: 'ä»åº', width: 150 }
			, { field: 'HSPName', title: 'ä»ä½', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HAuxPropName', title: 'è¾å©å±æ§', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			//æ£®æ¥·åè¡¨æ¾ç¤º
			//var listOption = {
			// elem: '#wl-table'
			// , toolbar: '#toolbarDemo'
			// , cellMinWidth: 90
			// , totalRow: true
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'éé', width: 150, totalRow: true }
			// , { field: 'HAuxQty', title: 'ç®±æ°', width: 150, totalRow: true }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			// , { 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 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//}


			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}

			function playSound() {
			console.log("playSound");
			var audio = document.getElementById("cs");
			audio.play();
			}
			function playSound1() {
			console.log("playSound1");
			var audio = document.getElementById("cs2");
			audio.play();
			}

			//è·ååæ°
			function getUrlVars() {
			@@ -364,27 +491,61 @@
			}
			return vars;
			}
			//var params = getUrlVars();
			//var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			//var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			var OperationType = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿åæ°æ®ç±»å 1æ°å¢ 2ä»ç¼ååè¡¨ä¸è¿å
			var HInterID_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID

			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'

			//å¤ææ¯å¦æ°å¢
			if (HInterID != 0) {
			HSourceFlag = true;
			}
			//ä»ç¼ååè¡¨ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å
			else if (OperationType == 2) {
			RoadBillMain(HInterID_Temp);
			$("#HBarCode").select();
			$("#HBarCode").focus(); //è·ååæ
			//$('#QueDin2').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			//document.getElementById("QueDin2").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			HSourceFlag = true;
			}
			else {
			OperationType = 1;
			//è·åæå¤§åæ®IDãåæ®å·
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HBillType": HBillType },
			success: function (d) {
			if (d.count == 1) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			HInterID = $('#HInterID').val()
			HBillNo = $('#HBillNo').val()
			}
			else {
			layer.msg(d.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}
			});
			HSourceFlag = false;
			}

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			type: "GET",
			data: { "HInterID": linterid },
			url: GetWEBURL() + '/WEBSController/GetSourceBill_Temp_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID_Temp, "HBillType": HBillType },
			success: function (d) {
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			@@ -442,31 +603,33 @@
			}


			function RoadBillSub(linterid)//å è½½è¡¨ä½
			{
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'éé', width: 150 }
			, { field: 'HAuxQty', 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");
			}
			});
			}
			//function RoadBillSub(linterid)//å è½½è¡¨ä½
			//{
			// table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
			// //, toolbar: '#toolbarDemo'
			// , page: true
			// , limit: 100
			// , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'éé', width: 150 }
			// , { field: 'HAuxQty', 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");
			// }
			// });
			//}

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

			@@ -476,45 +639,48 @@



			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1206' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			}
			});
			//è·ååæ®åç±»å
			var HBillSubType = '';
			$.ajax({
			url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
			type: "GET",
			data: { "HBillType": '1206', "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
			}
			$("#HBillSubType").append(HBillSubType);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			}
			////å¤ææ¯å¦æ°å¢
			//if (linterid == null \|\| linterid == 0) {
			// //è·åæå¤§åæ®å· new
			// $("#HInterID").val("");
			// $("#HBillNo").val("");
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetMAXNumPDA",
			// type: "GET",
			// data: { "HBillType": '1206' },
			// success: function (d) {
			// //console.log(d.data);
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			// }
			// });
			// //è·ååæ®åç±»å
			// var HBillSubType = '';
			// $.ajax({
			// url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
			// type: "GET",
			// data: { "HBillType": '1206', "HStockOrgID": HStockOrgID },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// var data = result.data;
			// for (var i = 0; i < data.length; i++) {
			// HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
			// }
			// $("#HBillSubType").append(HBillSubType);
			// form.render('select');
			// }
			// layer.closeAll("loading");
			// }
			// })
			//}
			//else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			// RoadBillMain(linterid);
			// //RoadBillSub(linterid);

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

			$('#HStockPlaceName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HStockPlaceName').val()
			@@ -588,21 +754,25 @@
			}
			})
			});
			form.on('submit(HSupID-BT)', function () {//éæ©ä¾åºå

			//#region å®¢æ·
			form.on('submit(HSupID-BT)', function () {//éæ©å®¢æ·
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¾åºååè¡¨'
			, title: 'å®¢æ·åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_SupplierList.html', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_CustomerListNew.html?HOrgID=' + HStockOrgID + '', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});

			//#endregion


			//form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			@@ -772,34 +942,37 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			//æ¾ç¤ºè¡¨ä½æç»
			$.ajax({
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			type: "GET",
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.Materlist;
			table.render(listOption);
			FIFOlistOption.data = result.data.FIFOlist;
			table.render(FIFOlistOption);
			DisBillEntryList();

			//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);
			}
			layer.closeAll("loading");
			}
			});
			////æ¾ç¤ºè¡¨ä½æç»
			//$.ajax({
			// url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			// type: "GET",
			// data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// listOption.data = result.data.Materlist;
			// table.render(listOption);
			// FIFOlistOption.data = result.data.FIFOlist;
			// table.render(FIFOlistOption);

			// //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);
			// }
			// layer.closeAll("loading");
			// }
			//});
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			@@ -839,15 +1012,22 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			layer.confirm(data.Message, {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			parent.location.href = "../../../views/index.html"
			}//å³é
			}, function () {
			location.replace('Kf_OtherOutBill_Fast.html?OperationType=1&HInterID=0');
			});//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			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 });
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			return false;
			@@ -945,34 +1125,37 @@
			layer.load(3);
			element.tabChange('tab-Kf_OtherOutBill', '2');

			$.ajax({
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			type: "GET",
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.Materlist;
			table.render(listOption);
			FIFOlistOption.data = result.data.FIFOlist;
			table.render(FIFOlistOption);
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();

			//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);
			}
			layer.closeAll("loading");
			}
			});
			//$.ajax({
			// url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			// type: "GET",
			// data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// listOption.data = result.data.Materlist;
			// table.render(listOption);
			// FIFOlistOption.data = result.data.FIFOlist;
			// table.render(FIFOlistOption);

			// //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);
			// }
			// layer.closeAll("loading");
			// }
			//});
			}
			else {
			playSound();
			@@ -1046,9 +1229,15 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			playSound1();
			table.reload('wl-table', {
			where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
			});
			//æ¸ç©ºæ°é
			$("#HQty").val("");

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

			//table.reload('wl-table', {
			// where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
			//});
			}
			else {
			playSound();
			@@ -1080,31 +1269,39 @@
			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: '1206', 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
			})
			//æ¸ç©ºæ°é
			$("#HQty").val("");

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

			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , cellMinWidth: 80
			// //, toolbar: '#toolbarDemo'
			// , page: true
			// , limit: 100
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1206', 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: "æ¸©é¦¨æç¤º" });
			@@ -1129,36 +1326,39 @@
			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": HStockOrgID, "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			if (result.data.hBarTypeField == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.hWhNameField);
			$("#HWHID").val(result.data.hWhIDField);
			$("#HStockPlaceName").val("");
			$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-Kf_OtherOutBill', '2'); //è·³è½¬é¡µç¾
			return;
			}
			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);
			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_OtherOutBill', '2');//è·³è½¬é¡µç¾
			return;
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			else if (result.data.hBarTypeField == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.hDeptNameField);
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-Kf_OtherOutBill', '2');//è·³è½¬é¡µç¾
			return;
			}
			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);
			else if (result.data.hBarTypeField == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.hSupNameField);
			$("#HSupID").val(result.data.hSupIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1206") {
			if (result.data.hSourceBillTypeField == "1206") {
			$("#HBillType").val("1206");

			}
			@@ -1211,35 +1411,41 @@
			}
			}
			layer.load(3)
			$.ajax({
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			type: "GET",
			data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.Materlist;
			table.render(listOption);
			FIFOlistOption.data = result.data.FIFOlist;
			table.render(FIFOlistOption);

			//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);
			}
			layer.closeAll("loading");
			}
			});
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();

			//$.ajax({
			// url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			// type: "GET",
			// data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HStockOrgID": HStockOrgID },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// listOption.data = result.data.Materlist;
			// table.render(listOption);
			// FIFOlistOption.data = result.data.FIFOlist;
			// table.render(FIFOlistOption);

			// //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);
			// }
			// layer.closeAll("loading");
			// }
			//});
			playSound1();
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			playSound();
			@@ -1253,92 +1459,48 @@

			//#endregion

			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, hide: 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");
			}
			}
			var FIFOlistOption = {
			elem: '#FIFOlist-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'ä¸æ¶æ°é', width: 150, totalRow: true }
			, { field: 'HWhName', title: 'ä»åº', width: 150 }
			, { field: 'HSPName', title: 'ä»ä½', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HAuxPropName', title: 'è¾å©å±æ§', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			//æ£®æ¥·åè¡¨æ¾ç¤º
			//var listOption = {
			// elem: '#wl-table'
			// , toolbar: '#toolbarDemo'
			// , cellMinWidth: 90
			// , totalRow: true
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'éé', width: 150, totalRow: true }
			// , { field: 'HAuxQty', title: 'ç®±æ°', width: 150, totalRow: true }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			// , { 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 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//}

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

			function playSound() {
			console.log("playSound");
			var audio = document.getElementById("cs");
			audio.play();
			function DisBillEntryList() {
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var HBillType = '1206'
			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);
			FIFOlistOption.data = result.data.FIFOlist;
			table.render(FIFOlistOption);

			//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);
			}
			}
			});
			}
			function playSound1() {
			console.log("playSound1");
			var audio = document.getElementById("cs2");
			audio.play();
			}

			//#endregion


			//function playSound() {
			// var audio = document.getElementById("cs");
			@@ -1426,7 +1588,7 @@
			$("#HWHNAME").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);
			}
			function GetHSupValue(obj) { //è¿åä¾åºå
			function GetHSupValue(obj) { //è¿åå®¢æ·
			$("#HSupName").val(obj[0].HName);
			$("#HSupID").val(obj[0].HItemID);
			}