From 69186fc45df2899e84a1114188929fdebc6d79f9 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期三, 23 三月 2022 17:53:00 +0800
Subject: [PATCH] 打印维修委托书的页面和后台类修改
---
force-app/main/default/classes/BatchSelectRepairPageController.cls | 82 ++++++++++++++++++----------------------
force-app/main/default/pages/BatchSelectRepairPage.page | 34 ++++++++---------
2 files changed, 53 insertions(+), 63 deletions(-)
diff --git a/force-app/main/default/classes/BatchSelectRepairPageController.cls b/force-app/main/default/classes/BatchSelectRepairPageController.cls
index ae63a1c..e1526dd 100644
--- a/force-app/main/default/classes/BatchSelectRepairPageController.cls
+++ b/force-app/main/default/classes/BatchSelectRepairPageController.cls
@@ -1,5 +1,5 @@
public with sharing class BatchSelectRepairPageController {
- public List<RetrievalData> RevalInfoList { get; set; }
+ public RetrievalData RevalInfo { get; set; }
public List<RepairData> RAInfoList { get; set; }
public List<Repair__c> RepairList { get; set; }
public List<String> repairIdList{ get; set; }
@@ -12,58 +12,51 @@
}
public void init(){
- RetrievalData reval = new RetrievalData();
- RevalInfoList = new List<RetrievalData>();
- RevalInfoList.add(reval);
+ RevalInfo = new RetrievalData();
}
public PageReference RetrievalBtn() {
RepairList = new List<Repair__c>();
RAInfoList = new List<RepairData>();
- String sql;
- System.debug('RevalInfoList1:' + RevalInfoList);
- for(RetrievalData reval : RevalInfoList){
- if(String.isBlank(reval.Status2) && String.isBlank(reval.RepairName) && String.isBlank(reval.SAPRepairNo)
- && String.isBlank(reval.SerialNumber) && String.isBlank(reval.repair.Incharge_Staff__c)
- && String.isBlank(String.valueOf(reval.repair.Final_complete_day__c))){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇疯嚦灏戞坊鍔犱竴涓绱㈡潯浠�!'));
- return null;
- }
- sql += 'select Id, Name, SAP_Service_Repair_No__c, Status1__c, Status2__c, Delivered_Product__c, SerialNumber__c, ';
- sql += 'HP_Name__c, State_Hospital__c, Incharge_Staff__c, FSE_ApplyForRepair_Day__c, work_location_select__c, On_site_repair__c,';
- sql += 'Number_of_EffectiveContract__c, NewProductGuaranteeObject__c from Repair__c where Id != null ';
- if(String.isNotBlank(reval.Status2)){
- sql += ' and Status2__c like \'%' + reval.Status2 + '%\' ';
- }
- if(String.isNotBlank(reval.RepairName)){
- sql += ' and Name like \'%' + reval.RepairName + '%\' ';
- }
- if(String.isNotBlank(reval.SAPRepairNo)){
- sql += ' and SAP_Service_Repair_No__c like \'%' + reval.SAPRepairNo + '%\' ';
- }
- if(String.isNotBlank(reval.SerialNumber)){
- sql += ' and SerialNumber__c like \'%' + reval.SerialNumber + '%\' ';
- }
- if(String.isNotBlank(reval.repair.Incharge_Staff__c)){
- sql += ' and Incharge_Staff__c = \'' + reval.repair.Incharge_Staff__c + '\' ';
- }
- if(String.isNotBlank(String.valueof(reval.repair.Final_complete_day__c))){
- String day = String.valueof(reval.repair.Final_complete_day__c);
- day = day.substring(0,10);
- sql += ' and FSE_ApplyForRepair_Day__c = ' + day;
- }
- sql += ' limit 200';
- sql = sql.substring(4);
+ if(String.isBlank(RevalInfo.Status2) && String.isBlank(RevalInfo.RepairName) && String.isBlank(RevalInfo.SAPRepairNo)
+ && String.isBlank(RevalInfo.SerialNumber) && String.isBlank(RevalInfo.repair.Incharge_Staff__c)
+ && String.isBlank(String.valueOf(RevalInfo.repair.Final_complete_day__c))){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇疯嚦灏戞坊鍔犱竴涓绱㈡潯浠�!'));
+ return null;
}
+ String sql = 'select Id, Name, SAP_Service_Repair_No__c, Status1__c, Status2__c, Delivered_Product__c, SerialNumber__c, ';
+ sql += 'HP_Name__c, State_Hospital__c, Incharge_Staff__c, FSE_ApplyForRepair_Day__c, work_location_select__c, On_site_repair__c,';
+ sql += 'Number_of_EffectiveContract__c, NewProductGuaranteeObject__c from Repair__c where Id != null ';
+ if(String.isNotBlank(RevalInfo.Status2)){
+ sql += ' and Status2__c like \'%' + RevalInfo.Status2 + '%\' ';
+ }
+ if(String.isNotBlank(RevalInfo.RepairName)){
+ sql += ' and Name like \'%' + RevalInfo.RepairName + '%\' ';
+ }
+ if(String.isNotBlank(RevalInfo.SAPRepairNo)){
+ sql += ' and SAP_Service_Repair_No__c like \'%' + RevalInfo.SAPRepairNo + '%\' ';
+ }
+ if(String.isNotBlank(RevalInfo.SerialNumber)){
+ sql += ' and SerialNumber__c like \'%' + RevalInfo.SerialNumber + '%\' ';
+ }
+ if(String.isNotBlank(RevalInfo.repair.Incharge_Staff__c)){
+ sql += ' and Incharge_Staff__c = \'' + RevalInfo.repair.Incharge_Staff__c + '\' ';
+ }
+ if(String.isNotBlank(String.valueof(RevalInfo.repair.Final_complete_day__c))){
+ String day = String.valueof(RevalInfo.repair.Final_complete_day__c);
+ day = day.substring(0,10);
+ sql += ' and FSE_ApplyForRepair_Day__c = ' + day;
+ }
+ sql += ' limit 201';
System.debug('sql1:' + sql);
if(String.isNotBlank(sql)){
RepairList = Database.query(sql);
}
- if(RepairList.size() >= 200 ){
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '妫�绱㈡暟鎹お澶�,璇风缉灏忔绱㈣寖鍥�'));
+ if(RepairList.size() > 200){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '妫�绱㈡暟鎹お澶�,璇风缉灏忔绱㈣寖鍥达紒'));
return null;
}
- if(RepairList.size() <= 0 ){
+ if(RepairList.size() <= 0){
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '娌℃绱㈠埌浠讳綍淇悊'));
return null;
}
@@ -78,7 +71,8 @@
repairIdList = new List<String>();
RepairList = new List<Repair__c>();
String url = '=';
- if(RAInfoList == null){
+ System.debug('RAInfoList:' + RAInfoList);
+ if(RAInfoList == null || RAInfoList.isEmpty()){
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '璇峰厛妫�绱慨鐞�'));
return null;
}
@@ -101,7 +95,7 @@
pageRef.setRedirect(true);
return pageRef;
} else{
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶氬崟鎵撳嵃鏈�澶ф暟閲忎负50,璇烽�夋嫨灏戜簬50涓慨鐞�!'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '澶氬崟鎵撳嵃鏈�澶ф暟閲忎负50,璇烽�夋嫨灏戜簬50涓慨鐞嗭紒'));
return null;
}
} else{
@@ -137,8 +131,6 @@
public String RepairName{ get; set; }
public String SAPRepairNo{ get; set; }
public String SerialNumber{ get; set; }
- // public String FSE_ApplyForRepair_Day{ get; set; }
- // public String InchargeStaffName{ get; set; }
public Repair__c repair{ get; set; }
public RetrievalData(){
repair = new Repair__c();
diff --git a/force-app/main/default/pages/BatchSelectRepairPage.page b/force-app/main/default/pages/BatchSelectRepairPage.page
index a5291dd..5cf2d1a 100644
--- a/force-app/main/default/pages/BatchSelectRepairPage.page
+++ b/force-app/main/default/pages/BatchSelectRepairPage.page
@@ -55,13 +55,13 @@
//鍏ㄩ�夊姛鑳�
function checkAll() {
var cnt = j$(escapeVfId('raCnt')).val();
- if (j$(escapeVfId('Page:Form:Block:j_id53:checkAll')).attr('checked') == 'checked') {
+ if (j$(escapeVfId('Page:allForm:allBlock:j_id56:checkAll')).attr('checked') == 'checked') {
for (var i = 0; i < cnt; i++) {
- j$(escapeVfId('Page:Form:Block:j_id53:records:' + i + ':checklist')).attr('checked',true);
+ j$(escapeVfId('Page:allForm:allBlock:j_id56:records:' + i + ':checklist')).attr('checked',true);
}
} else {
for (var i = 0; i < cnt; i++) {
- j$(escapeVfId('Page:Form:Block:j_id53:records:' + i + ':checklist')).attr('checked',false);
+ j$(escapeVfId('Page:allForm:allBlock:j_id56:records:' + i + ':checklist')).attr('checked',false);
}
}
}
@@ -99,26 +99,25 @@
<apex:pageBlock title="妫�绱㈠垪" id="Editable">
<table>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
- <apex:repeat value="{!RevalInfoList}" var="reval" id="RevalInfoList">
<tr>
<!-- <td style="text-align: left;padding-right: 100px;"> </td> -->
<td style="text-align: right; width:200px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鐘舵��2"/>
</td>
<td style="text-align: left;">
- <apex:inputText id="Status2" value="{!reval.Status2}"/>
+ <apex:inputText id="Status2" value="{!RevalInfo.Status2}"/>
</td>
<td style="text-align: right; width:200px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="RS淇悊鍗曞彿"/>
</td>
<td style="text-align: left;">
- <apex:inputText id="RepairName" value="{!reval.RepairName}"/>
+ <apex:inputText id="RepairName" value="{!RevalInfo.RepairName}"/>
</td>
<td style="text-align: right; width:150px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="SAP淇悊鍗曞彿"/>
</td>
<td style="text-align: left;padding-right: 100px;">
- <apex:inputText id="SAPRepairNo" value="{!reval.SAPRepairNo}"/>
+ <apex:inputText id="SAPRepairNo" value="{!RevalInfo.SAPRepairNo}"/>
</td>
</tr>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
@@ -128,22 +127,21 @@
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鏈鸿韩缂栫爜"/>
</td>
<td style="text-align: left;">
- <apex:inputText id="SerialNumber" value="{!reval.SerialNumber}"/>
+ <apex:inputText id="SerialNumber" value="{!RevalInfo.SerialNumber}"/>
</td>
<td style="text-align: right; width:200px;">
<apex:outputLabel style="font-weight: bold; " value="淇悊濮旀墭鑰�"/>
</td>
<td style="text-align: left;">
- <apex:inputField id="InchargeStaffName" value="{!reval.repair.Incharge_Staff__c}"/>
+ <apex:inputField id="InchargeStaffName" value="{!RevalInfo.repair.Incharge_Staff__c}"/>
</td>
<td style="text-align: right; width:150px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="FSE鐢宠鏃�"/>
</td>
<td style="text-align: left;padding-right: 80px;">
- <apex:inputField id="FSE_ApplyForRepair_Day" value="{!reval.repair.Final_complete_day__c}"/>
+ <apex:inputField id="FSE_ApplyForRepair_Day" value="{!RevalInfo.repair.Final_complete_day__c}"/>
</td>
</tr>
- </apex:repeat>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
<tr>
<td style="text-align: center;" colspan="6">
@@ -163,14 +161,14 @@
<th style="text-align:left; width:6%">鐘舵��1</th>
<th style="text-align:left; width:6%">鐘舵��2</th>
<th style="text-align:left; width:7%">RS淇悊鍗曞彿</th>
- <th style="text-align:left; width:10%">SAP淇悊鍗曞彿</th>
+ <th style="text-align:left; width:8%">SAP淇悊鍗曞彿</th>
<th style="text-align:left; width:10%">鍨嬪彿</th>
<th style="text-align:left; width:5%">鏈鸿韩缂栧彿</th>
- <th style="text-align:left; width:8%">鍖婚櫌鍚嶇О</th>
+ <th style="text-align:left; width:9%">鍖婚櫌鍚嶇О</th>
<th style="text-align:left; width:5%">鐪佷唤</th>
<th style="text-align:left; width:5%">淇悊濮旀墭鑰�</th>
<th style="text-align:left; width:8%">FSE鐢宠鏃ユ湡</th>
- <th style="text-align:left; width:5%">缁翠慨涓績</th>
+ <th style="text-align:left; width:6%">缁翠慨涓績</th>
<th style="text-align:left; width:5%">鏈嶅姟鏂瑰紡</th>
<th style="text-align:left; width:8%">鏈夋棤缁翠慨鍚堝悓瀵硅薄</th>
<th style="text-align:left; width:8%">鏃犲伩鍖哄埆鏍囧織</th>
@@ -191,16 +189,16 @@
<td align="left" width="7%">
<apex:outputField id="OTCode" value="{!ra.repair.Name}"/>
</td>
- <td align="left" width="10%">
+ <td align="left" width="8%">
<apex:outputField id="SAP_Service_Repair_No" value="{!ra.repair.SAP_Service_Repair_No__c}"/>
</td>
<td align="left" width="10%">
<apex:outputField id="Delivered_Product" value="{!ra.repair.Delivered_Product__c}"/>
</td>
- <td align="left" width="5%">
+ <td align="left" width="5%" style="word-wrap:break-word;word-break:break-all;">
<apex:outputField id="SerialNumber" value="{!ra.repair.SerialNumber__c}"/>
</td>
- <td align="left" width="8%">
+ <td align="left" width="9%">
<apex:outputField id="HP_Name" value="{!ra.repair.HP_Name__c}"/>
</td>
<td align="left" width="5%">
@@ -212,7 +210,7 @@
<td align="left" width="8%">
<apex:outputField id="FSE_ApplyForRepair_Day" value="{!ra.repair.FSE_ApplyForRepair_Day__c}"/>
</td>
- <td align="left" width="5%">
+ <td align="left" width="6%">
<apex:outputField id="work_location_select" value="{!ra.repair.work_location_select__c}"/>
</td>
<td align="left" width="5%">
--
Gitblit v1.9.1