lightningupdate.git

			@@ -1,5 +1,5 @@
			<!--仿EquipmentSetShippmentReceived6.page-->
			<apex:page Controller="ReceivingNoteStockInController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单入库">
			<apex:page Controller="ReceivingNoteStockInController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单入库" lightningStylesheets="true">
			<head>
			<meta name="format-detection" content="telephone=no"/>
			</head>
			@@ -178,10 +178,12 @@
			border-top-right-radius:10px;
			text-align: left;
			margin: 0;
			padding: 1%;
			width: 98%;
			/20230725 ljh/
			/padding: 1%;/
			/width: 98%;/
			background:#DCDCDC;
			position: relative;
			padding-left: 0.75rem;/20230721 ljh /
			}
			.checkintitle{
			position:absolute;
			@@ -220,8 +222,9 @@
			color: #fff;
			}
			div.menu{
			margin-bottom: 20px;
			width: 490px;
			/20230725 ljh/
			/margin-bottom: 20px; /
			/width: 490px;/
			}

			hr {
			@@ -229,7 +232,9 @@
			color: #fff;
			background-color: #fff;
			height: 1px;
			width: 90%;
			/20230725 ljh/
			/width: 90%;/
			width: 98%;
			}
			.close {
			color: #aaaaaa;
			@@ -253,31 +258,35 @@
			.menu{
			border:1px solid #a1a1a1;
			border-radius:10px;
			width: 400px;
			/width: 400px;//20230725 ljh/
			}
			.menu li .fieldname {
			width: 30%;
			line-height: 25px;
			/20230725 ljh/
			/*width: 30%;
			line-height: 25px;*/
			text-align: right;
			float: left;
			}
			.menu li .fieldvalue{
			width: 40%;
			line-height: 25px;
			/20230725 ljh/
			/*width: 40%;
			line-height: 25px;*/
			text-align: left;
			margin-left: 10px;
			}
			/20230725 ljh/
			.menu li {
			vertical-align: middle;
			height: 25px;
			margin: 5px 0;
			/*height: 25px;
			margin: 5px 0;*/
			}
			.commandbutton{
			width: 100px !important;
			margin-left: 20px !important;
			}
			div.freezehander{
			width:500px;
			/width:500px;//20230725 ljh/
			}
			}
			</style>

			@@ -307,18 +316,17 @@
			<apex:outputPanel id="message">
			<apex:pageMessages />
			</apex:outputPanel>
			<div style="text-align: right;margin-top: 10px;">
			<!-- <div style="text-align: right;margin-top: 10px;">
			<apex:commandButton styleClass="commandbutton" onclick="savejs();" rerender="dummy" value="保存" disabled="{!saveBtnDisabled}"/>
			</div>
			<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
			<!-- <apex:outputText value="（出库指示后取消）" style="color:red;" rendered="{!IF(SR_status='Received' && es.cancel_after_loaner_arranged__c, true, false)}"/> -->
			<table style="border-collapse: collapse; font-size:13px;">
			<colgroup>
			<col width="150" />
			<col width="170" />
			</colgroup>
			<tr>
			<!-- 状态切换btn -->
			状态切换btn
			<th colspan="2" style="font-size:20px;text-align: center;width:500px;">
			<ul id="Step_tab">
			<li class="selected"><span class="tabsize">入库</span></li>
			@@ -330,7 +338,37 @@
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/>
			<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/>
			</div>
			<apex:outputPanel layout="none" rendered="{!isConsum}">
			<div style="font-size: 14px;background-color:yellow;display:inline;">⚠️已存在货架号信息时无法修改，请在新品收货完成后再修改。</div>
			</apex:outputPanel>
			<div style="font-size: 14px;">缺少一对一入库:<apex:inputCheckbox value="{!forceSave}" /></div> -->

			<apex:pageBlock >
			<table style="border-collapse: collapse; font-size:13px;">
			<colgroup>
			<col width="20%" />
			<col width="80%" />
			</colgroup>
			<tr>
			<!-- 状态切换btn -->
			<th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
			<ul id="Step_tab" style="margin:0;">
			<li class="selected"><span class="tabsize">入库</span></li>
			</ul>
			</th>
			<th width="900px;" style="padding-left:50px;" class="myBtn">
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/>
			<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/>
			<apex:commandButton styleClass="commandbutton" onclick="savejs();" rerender="dummy" value="保存" disabled="{!saveBtnDisabled}"/>
			<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
			</th>
			</tr>
			</table>
			<apex:outputPanel layout="none" rendered="{!isConsum}">
			<div style="font-size: 14px;background-color:yellow;display:inline;">⚠️已存在货架号信息时无法修改，请在新品收货完成后再修改。</div>
			</apex:outputPanel>
			<div style="font-size: 14px;">缺少一对一入库:<apex:inputCheckbox value="{!forceSave}" /></div>
			</apex:pageBlock>
			</div>
			<apex:outputPanel id="detail">

			@@ -364,7 +402,9 @@
			</div></h2>

			<!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
			<ul style="display:table text-align:center">
			<!-- <ul style="display:table text-align:center"> -->
			<!-- 20230722 ljh -->
			<ul style="padding: 1px 0.75rem;" >
			<li>
			<span class="fieldname">明细No.</span>
			<span class="fieldvalue">{!esdInfo.rec.ReceivingNoteDetailNo__c}</span>
			@@ -428,13 +468,14 @@
			<!-- 货架号 -->
			<span class="fieldname">{!$ObjectType.Asset.fields.WH_location__c.label}</span>

			<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
			<apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.WH_location__c =''}">
			<apex:inputField id="WHlocation" value="{!esdInfo.rec.WH_location__c}" styleClass="fieldvalue" style="margin-top:5px;height:15px"/>
			</apex:outputPanel>
			<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
			<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable && esdInfo.rec.WH_location__c ='')}">
			<span class="fieldvalue">{!esdInfo.rec.WH_location__c}</span>
			</apex:outputPanel>
			</li>

			<!-- qiu 改 -->
			<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" data-bar="{!esdInfo.rec.Barcode_F__c}">
			<!-- 入库确认 -->
			@@ -442,7 +483,7 @@

			<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
			<!-- 可修改情况下的入库确认的checkbox -->
			<apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin-left:20px;margin-top:10px;" />
			<span class="fieldvalue"><apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin-left:20px;margin-top:10px;" /></span>

			<apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.onetoone}">
			<input type="hidden" name="onetoone" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/>
			@@ -450,17 +491,17 @@

			<apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body_F__c}">
			<apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" />
			<input type="hidden" name="onetoone_main" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/>
			<span class="fieldvalue"><input type="hidden" name="onetoone_main" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/></span>
			</apex:outputPanel>

			</apex:outputPanel>

			<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
			<!-- 不可修改情况下的入库确认的checkbox -->
			<apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" />
			<span class="fieldvalue"> <apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" /></span>

			<apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body_F__c}">
			<apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" />
			<span class="fieldvalue"> <apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" /></span>
			</apex:outputPanel>

			</apex:outputPanel>