MES-WEB-LayUI.git

			@@ -19,7 +19,7 @@
			<body>
			<div class="layui-fluid" style="padding:0">
			<div class="layui-card">
			<div class="layui-card-body" style="padding: 5px; height:800px;">
			<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>
			@@ -40,21 +40,21 @@
			<label class="layui-form-label" style="width:60px;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 layui-col-xs12" lay-filter="tab-ProductlnBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">æºåä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">åæ®ä¿¡æ¯</li>
			<li lay-id="1" style="padding:1px;">æºåä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;" class="layui-this">åæ®ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">ç©ææ¸å</li>
			<li lay-id="4" style="padding:1px;">æç»æ¸å</li>
			<li lay-id="5" style="padding:1px;">åè®¡ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="layui-tab-item ">
			<div class="layui-form-item">
			<!--<div class="layui-row">
			<div class="layui-col-xs3">
			@@ -81,7 +81,7 @@
			<select name="HBillType" id="HBillType">
			<option value="3714">å·¥åºæ±æ¥å</option>
			<option value="3711">çäº§æ±æ¥å</option>
			<option value="3710">çäº§è®¢å</option>
			<option value="3710" selected>çäº§è®¢å</option>
			</select>
			</div>
			</div>
			@@ -95,7 +95,7 @@
			<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>
			@@ -113,14 +113,14 @@
			</div>
			</div>
			</div>
			<div class="layui-tab-item">
			<div class="layui-tab-item layui-show" >
			<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" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
			<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">
			@@ -134,7 +134,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" autocomplete="off" class="layui-input">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -148,7 +148,7 @@
			<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">
			@@ -162,7 +162,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">
			@@ -188,7 +188,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">
			@@ -210,13 +210,6 @@
			</div>
			</div>
			</div>







			<div class="layui-tab-item">
			<!--<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			@@ -250,7 +243,7 @@
			<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:40px;padding-left:0px;">æ¡ç æ°</label>
			<label class="layui-form-label" style="width:50px;padding-left:0px;">æ¡ç æ°</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCodeQtys" id="HBarCodeQtys" lay-verify="HBarCodeQtys" autocomplete="off" class="layui-input">
			@@ -260,7 +253,7 @@
			<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:40px;padding-left:0px;">æ»æ°é</label>
			<label class="layui-form-label" style="width:50px;padding-left:0px;">æ»æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" autocomplete="off" class="layui-input">
			@@ -357,7 +350,7 @@
			var HSourceFlag = sessionStorage["SourceFlag"];
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			$("#HBarCode").focus();
			$("#HWHNAME").focus();

			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			@@ -398,8 +391,8 @@
			option = {
			id: 'wl-table'
			, elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, page: false
			//, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 120
			, height: 500
			, cols: [columns]
			@@ -421,7 +414,7 @@
			return vars;
			}

			////å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			// icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			@@ -507,7 +500,7 @@
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			@@ -523,7 +516,8 @@
			//, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, page: true
			, limie: 100
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			@@ -576,7 +570,7 @@
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$("#HBillType").val("3714");
			$("#HBillType").val("3710");
			form.render('select');
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			@@ -629,7 +623,7 @@
			}
			})
			});
			////éæ©ä»åº
			//éæ©ä»åº
			//form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			// layer.open({
			// type: 2
			@@ -807,9 +801,11 @@
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, page: true
			, limit: 100
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			@@ -841,7 +837,7 @@
			});
			})

			////å é¤
			//å é¤
			//form.on('submit(cmdDelete)', function () {//å é¤
			// var checkStatus = table.checkStatus('wl-table')
			// , data = checkStatus.data;
			@@ -894,7 +890,7 @@
			// elem: '#wl-table'
			// //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			// , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// //, toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			// , cols: [[
			@@ -1021,7 +1017,8 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæäº§åå¥åºå" + data.Message + $("#HBillNo").val(), {
			layer.confirm(data.Message, {
			//layer.confirm("çæäº§åå¥åºå" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			@@ -1150,6 +1147,40 @@
			}
			});

			//æ«ä»åº
			$('#HWHNAME').on('keydown', function (event) {
			var HBarCode = $('#HWHNAME').val()
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg('æ ä»åºæ¡ç ä¿¡æ¯ï¼');
			return;
			}
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/LookingFor/getWHName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//$("#HStockPlaceName").val(result.data[0].HName);
			//$("#HStockPlaceID").val(result.data[0].HItemID);
			$("#HBarCode").focus();
			$("#HWHID").val(result.data[0].HItemID);
			$("#HWHNAME").val(result.data[0].HName);
			element.tabChange('tab-POStockInBill', '2');
			}
			else {
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			// layer.msg($('#HSourceBillNo').val(), { icon: 1 });
			}
			});

			//å·æ°æç»é¡µç¾
			table.render({
			elem: '#mx-table'
			@@ -1160,6 +1191,7 @@
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			]]
			, page: true
			, limit: 100
			, height: 500
			, done: function () {
			}
			@@ -1183,10 +1215,13 @@
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			if (HDeleteFlag == "*") {
			if (sBarCode != "") {
			if (sBarCode == "") {
			layer.msg("è¯·æ«æè¦å é¤çæ¡ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			else {
			$('#HBarCode').val("");
			}
			var sBarCode = sOldBarCode.slice(1);
			$.ajax(
			{
			type: "Get",
			@@ -1200,8 +1235,10 @@
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, page: true
			, limit: 100
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			@@ -1223,6 +1260,8 @@
			layer.closeAll("loading");
			}
			})
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			playSound();
			@@ -1270,47 +1309,78 @@
			//data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] }, //æ§
			success: function (result) {
			//debugger;
			playSound1();
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			playSound1();
			if (result.data.hBarTypeField == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.hWhNameField);
			$("#HWHID").val(result.data.hWhIDField);
			$("#HStockPlaceName").val("");
			$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-ProductlnBill', '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-ProductlnBill', '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-ProductlnBill', '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);
			else if (result.data.hBarTypeField == 'æºåæ¡ç ') {
			if (result.data.hDeptIDField != 0) {
			$("#HDeptID").val(result.data.hDeptIDField);
			$("#HDeptName").val(result.data.hDeptNameField);
			}
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			HSourceFlag = true;
			$("#HBillType").val(result.data.hSourceBillTypeField == null ? "3714" : result.data.hSourceBillTypeField);
			//è·åæºåç±»åãæºååå·
			//if (result.data.HSourceBillType == "3711") {
			// $("#HBillType").val("3711");
			//}
			//else {
			// $("#HBillType").val("-1");
			//}
			if (result.data.hSourceBillTypeField == "3711") {
			$("#HBillType").empty();
			$("#HBillType").val("3711");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§æ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (result.data.hSourceBillTypeField == "3710") {
			$("#HBillType").empty();
			$("#HBillType").val("3710");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (result.data.hSourceBillTypeField == "3714") {
			$("#HBillType").empty();
			$("#HBillType").val("3714");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å·¥åºæ±æ¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			element.tabChange('tab-ProductlnBill', '3');
			}
			@@ -1360,7 +1430,13 @@
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").val("-1");
			//$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ç©ææ¡ç ");
			@@ -1376,7 +1452,7 @@
			// elem: '#wl-table'
			// //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			// , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// //, toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			// , cols: [[
			@@ -1431,6 +1507,8 @@
			layer.closeAll("loading");
			}
			});
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			}
			else {
			playSound();
			@@ -1449,9 +1527,11 @@

			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, totalRow: true
			, cellMinWidth: 90
			, page: true
			,limit: 100
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true}
			@@ -1472,7 +1552,7 @@
			}
			var listOption1 = {
			elem: '#mx-table'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			@@ -1538,9 +1618,11 @@
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, totalRow: true
			, defaultToolbar: []
			, page: true
			, limit: 100
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			@@ -1556,7 +1638,6 @@
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");