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%;
			}
			@@ -62,27 +62,12 @@
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ç±»å</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æºåç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name=" HBillType" id="HBillType">
			<option value="1402">åè´§éç¥å</option>
			<option value="1401">éå®è®¢å</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ«æç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name=" HScanStyle" id="HScanStyle">
			<option value="æ´ææ«ç ">æ´ææ«ç </option>
			<option value="åä¸ªæç ">åä¸ªæç </option>
			<option value="ååæç ">ååæç </option>
			<option value="æ´æå é¤">æ´æå é¤</option>
			</select>
			</div>
			</div>
			@@ -97,6 +82,45 @@
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ«æç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<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:60px;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>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ¥æ</label>
			</div>
			<div class="layui-col-xs8">
			<input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -127,7 +151,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>
			@@ -216,20 +240,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>
			@@ -313,14 +338,13 @@
			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
			, laydate = layui.laydate
			, element = layui.element;



			var HStockOrgID = sessionStorage["OrganizationID"]
			var option = [];

			//æºåæ¾è´§åè¡¨
			@@ -331,7 +355,7 @@
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ field: 'å¨åºç¶æ', title: 'å¨åºç¶æ',width:180 }
			{ field: 'å¨åºç¶æ', title: 'å¨åºç¶æ', width: 180 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡' }
			, { field: 'æ°é', title: 'æ°é' }
			@@ -365,8 +389,21 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			$("#HDate").val(formatDate(sessionStorage["HDate"]));
			var HSourceFlag = sessionStorage["SourceFlag"];

			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			@@ -428,10 +465,20 @@
			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å



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

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

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

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			@@ -441,10 +488,36 @@
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
			//è·åæºåç±»åãæºååå·
			if (d.data[0].HSourceBillType == "1402") {
			$("#HBillType").empty();
			$("#HBillType").val("1402");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'åè´§éç¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (d.data[0].HSourceBillType == "1401") {
			$("#HBillType").empty();
			$("#HBillType").val("1401");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'éå®è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").val("-1");
			}
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			HSourceFlag = true;
			$("#HDeptID").val(d.data[0].HDeptID);
			$("#HDeptName").val(d.data[0].HDeptName);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));

			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			@@ -522,34 +595,64 @@
			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/GetMAXNumPDA",
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1205' },
			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"));
			//$("#HInterID").val('132522535');
			//$("#HBillNo").val('421458026');
			set_InitGrid();
			}
			});
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new-----ä¸ä¼èµ°
			RoadBillMain(linterid);
			@@ -565,7 +668,36 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
			, resize: false
			, cancel: function () {
			}
			})
			});
			//form.on('submit(HWHID-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=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");
			@@ -697,9 +829,6 @@
			});

			form.on('submit(Cancel)', function () {
			//sessionStorage["SourceFlag"] = false;
			//parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			window.close();
			});
			@@ -798,61 +927,61 @@

			//å é¤
			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: '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: "æ¸©é¦¨æç¤º" });
			}
			});
			//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: "æ¸©é¦¨æç¤º" });
			// }
			// });
			});


			@@ -864,60 +993,60 @@
			var sSourceType = $("#HBillType").val();
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			var flage = true;
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HQty == 0) {
			flage = false;
			}
			}
			if (!flage) {
			layer.confirm('å®éæ«æå·æ°ä¸º0å°äºæ¾è´§åæ°éï¼æ¯å¦ç»§ç»æäº¤ï¼', {
			btn: ['ç»§ç»', 'åæ¶'], skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			}, function () {
			Saver(sMainStr);
			}, function () {
			layer.closeAll("loading");
			});
			} else {
			//var flage = true;
			//for (var i = 0; i < sSubStr.length; i++) {
			// if (sSubStr[i].HQty == 0) {
			// flage = false;
			// }
			//}
			//if (!flage) {
			// layer.confirm('å®éæ«æå·æ°ä¸º0å°äºæ¾è´§åæ°éï¼æ¯å¦ç»§ç»æäº¤ï¼', {
			// btn: ['ç»§ç»', 'åæ¶'], skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			// }, function () {
			// Saver(sMainStr);
			// }, function () {
			// layer.closeAll("loading");
			// });
			//} 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 , {
			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: "æ¸©é¦¨æç¤º" });
			}
			});
			});
			}

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



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

			//æ«æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			$('#HSourceBillNo').on('keydown', function (event) {
			if (event.keyCode == 13) {
			GetMeesageBySourceBillNo();
			}
			@@ -1061,13 +1190,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 () {
			}
			});

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


			//æ«æ¡ç
			function GetMeesageByBarCode(obj) { //è¿åå·¥ä½ä¸å¿
			var sOldBarCode = $('#HBarCode').val()
			@@ -1133,6 +1262,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;
			}
			@@ -1174,10 +1305,10 @@
			}
			});
			}
			else if (HScanStyle =="æ´æå é¤") {
			else if (HScanStyle == "æ´æå é¤") {
			var HBarCode = $('#HBarCode').val();
			var HInterID = $('#HInterID').val();
			if (HBarCode=="") {
			if (HBarCode == "") {
			layer.msg("æ´æå é¤æ¡ç ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			@@ -1238,10 +1369,19 @@
			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			//ä»ä½å¿é¡»å½å¥
			//if (sHSPID == '' \|\| sHSPID == 0) {
			// //
			// playSound();
			// layer.msg("ä»ä½ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®å®'], time: 100000, offset: 't' });
			// //11
			// return false;
			//}
			//
			$.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) {
			@@ -1317,39 +1457,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: '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 () {


			//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 {
			@@ -1368,6 +1539,58 @@
			//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 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			, 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() {
			@@ -1396,6 +1619,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;
			@@ -1403,7 +1630,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();
			@@ -1417,27 +1644,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: '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 () {
			//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");
			}
			});
			@@ -1449,8 +1705,9 @@
			}
			});
			}


			});


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

			@@ -1459,6 +1716,11 @@
			$("#HWHNAME").val(obj[0].HName);
			//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);
			@@ -1483,6 +1745,20 @@
			$("#HDeptID").val(obj[0].HItemID);
			}
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			//if (reg.test($("#HQty").val()) == false \|\| $("#HQty").val() == '') {
			// layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (reg.test($("#HBarcodeQtys").val()) == false \|\| $("#HBarcodeQtys").val() == '') {
			// layer.msg("æ¡ç æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (reg.test($("#HSumQtys").val()) == false \|\| $("#HSumQtys").val() == '') {
			// layer.msg("æ»æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if ($("#HSourceBillNo").val() == '') {
			// layer.msg("è¯·åæ«æºå!", { icon: 5 });
			// return false;