MES-WEB-LayUI.git

			@@ -83,7 +83,6 @@
			<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" style="padding:1px;">ä¸æ¶ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--éæ©æºå-->
			@@ -409,15 +408,6 @@
			</div>
			</div>
			</div>
			<!--ä¸æ¶ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-row">
			<div class="layui-col-xs12">
			<div class="layui-form-item" style="padding:0px;margin:0px"></div>
			<table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			@@ -476,7 +466,6 @@
			var HSourceFlag = false //æ¯å¦å·²æ«ç æ å¿
			var OperationType = 1 //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var listOption = [];
			var FIFOListOption = [];
			var columns = "";
			var HModName = "Kf_MoveStockBill_PDA_XiaBao";
			var ModRightName = "CE_MoveStock2"; //æ¨¡åæéåæ°
			@@ -612,8 +601,6 @@
			]];
			listOption.data = data;
			table.render(listOption);
			FIFOListOption.data = data;
			table.render(FIFOListOption);

			//åæ é»è®¤å¨æ¡ç ä½ç½®ä¸
			var pFocus = $("#HBarCode");
			@@ -684,32 +671,6 @@
			, cellMinWidth: 90
			, limit: 200
			};

			//ä¸æ¶ä¿¡æ¯
			FIFOListOption = {
			elem: '#FIFOList-table'
			//, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ field: 'HQty', title: 'æ°é', width: 80, totalRow: true }
			, { field: 'HQtyMust', title: 'ä¸æ¶æ°é', width: 90 }
			, { field: 'HWhName', title: 'ä»åº', width: 150 }
			, { field: 'HSPName', title: 'ä»ä½', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
			, { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
			, { field: 'HAuxPropName', title: 'è¾å©å±æ§', width: 150 }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			}

			//#region ç¹å»è¡éä¸é«äº®
			@@ -1664,7 +1625,7 @@
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢','å³é'],
			btn2: function () {
			if (OperationType == 2) {
			parent.location.href = "../../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBillList_PDA.html";
			parent.location.href = "../../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBillList_PDA_XiaBao.html";
			}
			else {
			parent.location.href = "../../../views/index_Mobile.html";
			@@ -1920,26 +1881,93 @@
			element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
			$("#HBarCode").select();
			$("#HBarCode").focus();
			//è°å¥è°åºç»ç»ä¸ç»å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥è°åºä»åºä»ä½æ°æ®
			if (HStockInOrgID != HStockOrgID) {
			//è°å¥ç»ç»ä¸çé¢æéè°å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥ä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockInOrgID != $('#HStockInOrgID').val()) {
			$("#HWHID").val("0");
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			if (result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			}
			}
			if (HStockOutOrgID != HStockOrgID) {
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHWHID == 0 && result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			//è°åºç»ç»ä¸çé¢æéè°åºç»ç»ä¸åæ¶ï¼æ¸ç©ºè°åºä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
			$("#HSCWHID").val("0");
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			if (result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			}
			}
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			@@ -2208,26 +2236,93 @@
			//å®¢æ·ä¸å¯ç¼è¾
			$("#HSupName").attr("disabled", "disabled");
			$('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			//è°å¥è°åºç»ç»ä¸ç»å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥è°åºä»åºä»ä½æ°æ®
			if (HStockInOrgID != HStockOrgID) {
			//è°å¥ç»ç»ä¸çé¢æéè°å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥ä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockInOrgID != $('#HStockInOrgID').val()) {
			$("#HWHID").val("0");
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			if (result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			}
			}
			if (HStockOutOrgID != HStockOrgID) {
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHWHID == 0 && result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			//è°åºç»ç»ä¸çé¢æéè°åºç»ç»ä¸åæ¶ï¼æ¸ç©ºè°åºä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
			$("#HSCWHID").val("0");
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			if (result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			}
			}
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
			}
			@@ -2270,26 +2365,93 @@
			//å®¢æ·ä¸å¯ç¼è¾
			$("#HSupName").attr("disabled", "disabled");
			$('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			//è°å¥è°åºç»ç»ä¸çé¢æéç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥è°åºä»åºä»ä½æ°æ®
			//è°å¥ç»ç»ä¸çé¢æéè°å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥ä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockInOrgID != $('#HStockInOrgID').val()) {
			$("#HWHID").val("0");
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			if (result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HWHName").val("");
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HWHName").select();
			$("#HWHName").focus();
			}
			}
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHWHID == 0 && result.data.hWhIDField != 0) {
			$("#HWHID").val(result.data.hWhIDField);
			$("#HWHName").val(result.data.hWhNameField);
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			if (result.data.hSPFlagField == 0) {
			$("#HStockPlaceName").attr("disabled", "disabled");
			$('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			//è°åºç»ç»ä¸çé¢æéè°åºç»ç»ä¸åæ¶ï¼æ¸ç©ºè°åºä»åºä»ä½æ°æ®ï¼éæ°èµå¼
			if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
			$("#HSCWHID").val("0");
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			if (result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			else {
			$("#HSCWHName").val("");
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			$("#HSCWHName").select();
			$("#HSCWHName").focus();
			}
			}
			else {
			//çé¢ä¸æªéä»åºï¼æºåä¸æä»åºï¼åæºåä»åºæ¾ç¤ºå¨çé¢ä¸
			if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
			$("#HSCWHID").val(result.data.hSCWhIDField);
			$("#HSCWHName").val(result.data.hSCWhNameField);
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			if (result.data.hSCSPFlagField == 0) {
			$("#HOutStockPlaceName").attr("disabled", "disabled");
			$('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			}
			else {
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			}
			}
			HStockInOrgID = $('#HStockInOrgID').val()
			HStockOutOrgID = $('#HStockOutOrgID').val()
			@@ -2388,13 +2550,6 @@
			listOption.totalRow = true;
			table.cache['wl-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.render(listOption);
			if (result.data.FIFOlist.length != 0) {
			if (result.data.FIFOlist[0].HMaterID != 0) {
			FIFOListOption.data = result.data.FIFOlist;
			table.cache['FIFOList-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.render(FIFOListOption);
			}
			}

			//æ¡ç ä¿¡æ¯
			$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);

	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html	347 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/公共页面/Kf_BarCodeEditDlg.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -221,7 +221,7 @@
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Kf_BarCodeEditDlg/DeltetBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": sBillType },
			success: function (result) {
			if (result.count == 1) {