OlyMEBG.git - Gitblit

			@@ -1,4 +1,4 @@
			<apex:page Controller="ConsumEquipmentSetReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
			<apex:page Controller="ConsumEquipmentSetReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
			<head>
			<meta name="format-detection" content="telephone=no"/>
			<meta name="viewport" content="width=device-width,initial-scale=1"/>
			@@ -7,8 +7,8 @@
			<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
			<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
			<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
			<apex:includeScript value="/soap/ajax/46.0/connection.js"/>
			<apex:includeScript value="/soap/ajax/46.0/apex.js"/>
			<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
			<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
			<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
			<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
			<style>
			@@ -40,7 +40,7 @@
			height: 100px;
			width: 30px;
			}
			/*add start by youc 2021-12-07 耗材追溯 -收货管理编码备品管理码设置成只读
			/*add start by youc 2021-12-07 耗材追溯 -收货管理编码备品管理码设置成只读
			.col_ManagementCode__c input{
			border:none;
			pointer-events: none;
			@@ -49,7 +49,7 @@
			border:none;
			pointer-events: none;
			}
			*/
			*/
			.col_barcodeforReceipt__c{
			display: none;
			}
			@@ -108,7 +108,7 @@
			<tr> <td align="right">管理编码</td> <td><span id="bianma"/></td> </tr> -->
			<tr class="headerRow" height="30px">
			<td class="headerRow booleanColumn" onclick="document.getElementById('xiaomaCode').focus();return false" align="left">
			码枪扫描袋子二维码: <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" />
			码枪扫描袋子条形码: <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" />
			</td>
			<!-- <td class="headerRow booleanColumn"> <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" /> </td> -->
			<!-- <td class="headerRow booleanColumn" colspan="8"/> -->
			@@ -452,6 +452,7 @@
			//update by wangweipeng 2022/02/24 end
			}
			j$("#boxCode").val("");
			setTimeout(function(){j$("#maqCode").focus();},300);
			}

			//4.扫小码之后对码的校验
			@@ -522,12 +523,36 @@
			return;
			}
			//批量赋值的一个操作
			if (nowCode == 'AllmoveToBaoFei') {
			if (nowCode == 'allMoveToBaoFei') {
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = true;
			tableId.children[0].children[i].children[8].children[0].checked = false;
			tableId.children[0].children[i].children[9].children[0].checked = false;
			}
			}

			j$( '#xiaomaCode' ).val("");
			return;
			}
			if (nowCode == 'allMoveToGuoqi') {
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = false;
			tableId.children[0].children[i].children[8].children[0].checked = true;
			tableId.children[0].children[i].children[9].children[0].checked = false;
			}
			}

			j$( '#xiaomaCode' ).val("");
			return;
			}
			if (nowCode == 'allShangJia') {
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = false;
			tableId.children[0].children[i].children[8].children[0].checked = false;
			tableId.children[0].children[i].children[9].children[0].checked = true;
			}
			}

			@@ -548,7 +573,7 @@
			var YZCode =SMCode+nowCode;
			//if (havCode.indexOf(nowCode) != -1) {
			if (havCode.indexOf(YZCode) != -1) {
			alert('该明细已保存过,请重新尝试');
			alert('该明细已保存过,不能再进行修改');
			j$( '#xiaomaCode' ).val("");
			return;
			}
			@@ -556,18 +581,22 @@
			var aa = rowObj[0].children[17].children[1].value;
			//alert(aa);
			if (aa != null && aa.length > 0) {

			//向弹出框里添加明细行
			//if (aa.indexOf(nowCode) == -1) {
			if (aa.indexOf(YZCode) == -1) {
			//alert('this.flag==='+this.flag);
			if (this.flag == 'delConsumables') {
			alert('必须先扫描要取消的小码');
			alert('已进入删除小码操作，请扫描正确的小码');
			j$( '#xiaomaCode' ).val("");
			this.flag = '';
			return;
			}
			alert('扫描的小码在发货明细中不存在，请重新扫描!');
			} else if(nowCode != null && nowCode.length == 3 && !isNaN(nowCode)){
			}else{
			alert('当前小码不正确');
			j$( '#xiaomaCode' ).val("");
			return;
			}
			alert('扫描的小码在发货明细中不存在或未寄回，请重新扫描!');
			j$( '#xiaomaCode' ).val("");
			return;
			}else{
			@@ -575,7 +604,7 @@
			// var tableId = document.getElementById("detailTb");
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			//alert(nowCode+'=498='+tableId.rows[i].cells[6].innerHTML);
			console.log(nowCode+'=498='+tableId.rows[i].cells[6].innerHTML);
			if(nowCode == tableId.rows[i].cells[6].innerHTML){
			if (this.flag == 'delConsumables') {
			//删除这一行
			@@ -585,15 +614,31 @@
			return;
			}else{
			//小码已存在滞后先删后加相当于让扫这个小码的那三个类型
			var bf1 = tableId.children[0].children[i].children[7].children[0].checked;
			var gq1 = tableId.children[0].children[i].children[8].children[0].checked;
			var sj1 = tableId.children[0].children[i].children[9].children[0].checked;
			console.log(bf1+'=1='+gq1+'=='+sj1);
			tableId.rows[i].remove();
			j$( '#xiaomaCode' ).val("");
			// return;
			alert('已为您滞后!');
			break;
			alert('小码已扫描，无需再次扫描！');
			// console.log(bf1+'=2='+gq1+'=='+sj1);
			if (bf1) {
			addRow(nowCode,'1');
			}else if (gq1) {
			addRow(nowCode,'2');
			}else if (sj1) {
			addRow(nowCode,'3');
			}else{
			addRow(nowCode,'');
			}
			//break;
			return;
			}
			}
			}
			}
			console.log('新码直接添加');
			addRow(nowCode,'');
			}
			}
			@@ -709,6 +754,33 @@
			tableId.children[0].children[tableId.rows.length-1].children[8].children[0].checked = false;
			tableId.children[0].children[tableId.rows.length-1].children[9].children[0].checked = true;
			return false
			} else if (ipadnowCode == 'allMoveToBaoFei') {//批量赋值的一个操作
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = true;
			tableId.children[0].children[i].children[8].children[0].checked = false;
			tableId.children[0].children[i].children[9].children[0].checked = false;
			}
			}
			return false
			}else if (ipadnowCode == 'allMoveToGuoqi') {
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = false;
			tableId.children[0].children[i].children[8].children[0].checked = true;
			tableId.children[0].children[i].children[9].children[0].checked = false;
			}
			}
			return false
			}else if (ipadnowCode == 'allShangJia') {
			if(tableId.rows.length > 0){
			for(var i=1;i<tableId.rows.length;i++) {
			tableId.children[0].children[i].children[7].children[0].checked = false;
			tableId.children[0].children[i].children[8].children[0].checked = false;
			tableId.children[0].children[i].children[9].children[0].checked = true;
			}
			}
			return false
			}

			var havCode = document.getElementById("havCode").value;
			@@ -717,24 +789,27 @@
			var YZCode =SMCode+ipadnowCode;
			//if (havCode.indexOf(ipadnowCode) != -1) {
			if (havCode.indexOf(YZCode) != -1) {
			alert('该明细已保存过,请重新尝试')
			alert('该明细已保存过,不能再进行修改')
			return false;
			}
			//aa 拿到该保有设备对应的所有小码判断是否存在
			var aa = rowObj[0].children[17].children[1].value;
			if (aa != null && aa.length > 0) {

			//向弹出框里添加明细行
			//if (aa.indexOf(ipadnowCode) == -1) {
			if (aa.indexOf(YZCode) == -1) {
			console.log('3=='+ipadnowCode+'==='+ipadflag);
			if (ipadflag == 'delConsumables') {
			alert('必须先扫描要取消的小码')
			alert('已进入删除小码操作，请扫描正确的小码')
			ipadflag = '';

			return false;
			}else if(ipadnowCode != null && ipadnowCode.length == 3 && !isNaN(ipadnowCode)){
			}else{
			alert('当前小码不正确');
			return;
			}
			alert('扫描的小码在发货明细中不存在，请重新扫描!')
			alert('扫描的小码在发货明细中不存在或未寄回，请重新扫描!')
			return;
			}else{
			//判断是否已经扫描过
			@@ -754,6 +829,10 @@
			break;
			}else{
			//小码已存在滞后先删后加相当于让扫这个小码的那三个类型
			var bf1 = tableId.children[0].children[i].children[7].children[0].checked;
			var gq1 = tableId.children[0].children[i].children[8].children[0].checked;
			var sj1 = tableId.children[0].children[i].children[9].children[0].checked;
			console.log(bf1+'=1='+gq1+'=='+sj1);
			tableId.rows[i].remove();
			// return;
			//alert('qqq')
			@@ -762,10 +841,21 @@
			// });
			// j$
			//alert(1)
			alert('已为您滞后!');
			alert('小码已扫描，无需再次扫描！');
			//已为您滞后!
			//break;
			}
			//break;之前就是注释的
			console.log(bf1+'=2='+gq1+'=='+sj1);
			if (bf1) {
			addRow(ipadnowCode,'1');
			}else if (gq1) {
			addRow(ipadnowCode,'2');
			}else if (sj1) {
			addRow(ipadnowCode,'3');
			}else{
			addRow(ipadnowCode,'');
			}
			return;
			}
			}
			}
			//
			@@ -876,7 +966,7 @@
			//add by youc 2021-12-07 end 删除输入框内容并光标自动定位到输入框
			return false;
			} else if(allboxbarcode.indexOf(content250) == -1){
			alert('扫描的盒与发货时不一致，请重新扫描');
			alert('扫描的盒与发货时不一致或未寄回，请重新扫描');
			if(maqiang !='' && maqiang !=undefined){
			j$("#maqCode").val("");
			j$("#maqCode").focus();