From de9565270a88b0749d17c1961cd41399c8483c96 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 17:46:45 +0800
Subject: [PATCH] merge
---
force-app/main/default/classes/AccessorySelectController.cls | 1298 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 676 insertions(+), 622 deletions(-)
diff --git a/force-app/main/default/classes/AccessorySelectController.cls b/force-app/main/default/classes/AccessorySelectController.cls
index 7ba65a3..ea0cd00 100644
--- a/force-app/main/default/classes/AccessorySelectController.cls
+++ b/force-app/main/default/classes/AccessorySelectController.cls
@@ -5,7 +5,7 @@
* RentalFixtureManage2Test
*/
public with sharing class AccessorySelectController extends CreateRelationListPagingCtrlBase {
- public override Integer getSearchNumMax() {
+ public override Integer getSearchNumMax() {
//鍚勩儦銉笺偢銇埗寰°亗銈屻伆銆佹渶澶т欢鏁般倰鎸囧畾銇欍倠
searchNumMax = Integer.valueOf(Label.Product_Select_Limit);
searchNumMax = 20;
@@ -19,9 +19,9 @@
selectedDataSql += ' where Rental_Apply_Equipment_Set__c = \'' + String.escapeSingleQuotes(parentId) + '\'';
selectedDataSql += ' and Is_Body__c = false';
selectedDataSql += ' and Cancel_Select__c = False';
- selectedDataSql += ' and (ApplyPersonAppended_F__c = false OR (' ;
+ selectedDataSql += ' and (ApplyPersonAppended_F__c = false OR (';
selectedDataSql += ' ApplyPersonAppended_F__c = true AND (Add_Request_approval_time__c != null OR Select_Time__c != null)))';
- selectedDataSql += ' order by Name ASC nulls last'; // order by Fixture_Set_Detail__r.SortInt__c
+ selectedDataSql += ' order by Name ASC nulls last'; // order by Fixture_Set_Detail__r.SortInt__c
return selectedDataSql;
}
@@ -55,17 +55,34 @@
public override List<String> getColumnFieldList() {
// strColumus 閲屽姞 field
// FixtureUtil#raesdGroupBy()銇爡鐩倐蹇呰
- return new List<String>{'Id', 'Rental_Apply_Equipment_Set__c', 'FSD_Id__c', 'Select_Time__c', 'Fixture_Model_No_F__c',
- 'IndexFromUniqueKey__c', 'FSD_Fixture_Model_No__c', 'Is_Body_F__c', 'SalesProvince__c', 'OneToOne_Flag__c',
- 'Rental_Apply__c', 'Rental_Apply__r.Salesdepartment__c', 'DeliverySlip__c', 'Is_Body__c',
- 'Rental_Apply__r.Equipment_Type_F__c', 'Rental_Apply__r.Internal_asset_location_F__c',
- 'Rental_Apply__r.Salesdept__c', 'Rental_Apply__r.Product_category__c',
- 'Rental_Apply__r.demo_purpose2__c','Rental_Apply__r.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c',
- 'Rental_Apply__r.next_action__c','Rental_Apply__r.QIS_number__r.ReplaceDeliveryDate__c'};
+ return new List<String>{
+ 'Id',
+ 'Rental_Apply_Equipment_Set__c',
+ 'FSD_Id__c',
+ 'Select_Time__c',
+ 'Fixture_Model_No_F__c',
+ 'IndexFromUniqueKey__c',
+ 'FSD_Fixture_Model_No__c',
+ 'Is_Body_F__c',
+ 'SalesProvince__c',
+ 'OneToOne_Flag__c',
+ 'Rental_Apply__c',
+ 'Rental_Apply__r.Salesdepartment__c',
+ 'DeliverySlip__c',
+ 'Is_Body__c',
+ 'Rental_Apply__r.Equipment_Type_F__c',
+ 'Rental_Apply__r.Internal_asset_location_F__c',
+ 'Rental_Apply__r.Salesdept__c',
+ 'Rental_Apply__r.Product_category__c',
+ 'Rental_Apply__r.demo_purpose2__c',
+ 'Rental_Apply__r.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c',
+ 'Rental_Apply__r.next_action__c',
+ 'Rental_Apply__r.QIS_number__r.ReplaceDeliveryDate__c'
+ };
}
// 鐢婚潰閲岀洿鎺ュ彲浠ヨ緭鍏ョ殑闋呯洰 List
public override List<String> getWritableColumnFieldList() {
- return new List<String>{'Cancel_Reason__c','Loaner_cancel_reason__c','Loaner_cancel_Remarks__c'};
+ return new List<String>{ 'Cancel_Reason__c', 'Loaner_cancel_reason__c', 'Loaner_cancel_Remarks__c' };
// 20210818 ljh SFDC-C448KZ add
}
// getObjName 杩� getOriginObjName 鐨� FK
@@ -83,7 +100,6 @@
public override String getSqlWhereStr() {
sqlWhereStr = '';
return sqlWhereStr;
-
}
public override Boolean getIsNeedRunSearch() {
@@ -95,7 +111,6 @@
/*****************妞滅储鐢�******************/
-
/*****************銈姐兗銉堟檪鍐嶆绱㈡潯浠讹紙鐢婚潰銇嬨倝銇叆鍔涙潯浠躲倰鐒¤銇欍倠銇熴倎锛�******************/
public String saveType { get; set; }
@@ -103,13 +118,13 @@
public Rental_Apply_Equipment_Set__c parentObj { get; set; }
public Rental_Apply_Equipment_Set_Detail__c sonObj { get; set; } // 20210817 ljh SFDC-C448KZ add
- public Boolean bieField { get; set; } // 鍒渷銆佸埆鏈儴鍒瓨鏀惧湴
+ public Boolean bieField { get; set; } // 鍒渷銆佸埆鏈儴鍒瓨鏀惧湴
List<Boolean> showButtonList = new List<Boolean>();
- public String bieCunFangDi { get; set; } //鍒瓨鏀惧湴, 鑲畾鏈夊�� 涓嶄负null
+ public String bieCunFangDi { get; set; } //鍒瓨鏀惧湴, 鑲畾鏈夊�� 涓嶄负null
// #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� Start
- public String bieBenBu { get; set; } //鍒湰閮�
+ public String bieBenBu { get; set; } //鍒湰閮�
public Set<String> benbuSet;
// #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� End
@@ -117,454 +132,453 @@
// public String bieChanPinFenLei { get; set; } //浜у搧鍒嗙被
// public String bieBiePinFenLei { get; set; } //鍒鍝佸垎绫�
// #OLY_OCM-654 End
- public Rental_Apply_Equipment_Set_Detail__c pageRaesd {get; set;}
-
+ public Rental_Apply_Equipment_Set_Detail__c pageRaesd { get; set; }
public AccessorySelectController() {
Integer i = 0;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
- i ++;
-
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+
parentId = ApexPages.currentPage().getParameters().get('pt_recid');
pageRaesd = new Rental_Apply_Equipment_Set_Detail__c();
this.bieField = true;
@@ -572,56 +586,68 @@
//鍊熷嚭澶囧搧涓�瑙堛伄鎯呭牨銈掑彇寰�
if (!String.isBlank(this.parentId)) {
List<Rental_Apply_Equipment_Set__c> parentObjs = [
- SELECT Id, Rental_Apply__r.Name,
- Rental_Apply__r.Owner.Name,
- Rental_Apply__r.Salesdept__c,
- Rental_Apply__r.WorkPlace__c,
- Rental_Apply__r.Request_shipping_day__c,
- Fu_Shu_Pin_Fen_Pei_Jia__c,
- Rental_Apply__r.Demo_purpose1__c,
- Rental_Apply__r.demo_purpose2__c,
- Fixture_Set__r.Product_Category_GI_SP__c,
- Rental_Apply__r.Product_category__c,
- Fixture_Set__r.Equipment_Type__c,
- Rental_Apply__r.Equipment_Type_F__c,
- Rental_Apply__r.Internal_asset_location_F__c,
- Rental_Apply__r.Request_return_day__c,
- Fixture_Set__r.Fixture_Set_Body_Model_No__c,
- Rental_Apply__r.Salesdepartment__c,
- SerialNumber_F__c,
- Rental_Start_Date__c,
- Rental_End_Date__c,
- Irreplaceable_flag__c,
- RequestNoJoinStr2__c,
- First_RAESD__c, First_RAESD__r.Is_Body__c
- FROM Rental_Apply_Equipment_Set__c
- where Id = :parentId];
- if(parentObjs.size()>0){
+ SELECT
+ Id,
+ Rental_Apply__r.Name,
+ Rental_Apply__r.Owner.Name,
+ Rental_Apply__r.Salesdept__c,
+ Rental_Apply__r.WorkPlace__c,
+ Rental_Apply__r.Request_shipping_day__c,
+ Fu_Shu_Pin_Fen_Pei_Jia__c,
+ Rental_Apply__r.Demo_purpose1__c,
+ Rental_Apply__r.demo_purpose2__c,
+ Fixture_Set__r.Product_Category_GI_SP__c,
+ Rental_Apply__r.Product_category__c,
+ Fixture_Set__r.Equipment_Type__c,
+ Rental_Apply__r.Equipment_Type_F__c,
+ Rental_Apply__r.Internal_asset_location_F__c,
+ Rental_Apply__r.Request_return_day__c,
+ Fixture_Set__r.Fixture_Set_Body_Model_No__c,
+ Rental_Apply__r.Salesdepartment__c,
+ SerialNumber_F__c,
+ Rental_Start_Date__c,
+ Rental_End_Date__c,
+ Irreplaceable_flag__c,
+ RequestNoJoinStr2__c,
+ First_RAESD__c,
+ First_RAESD__r.Is_Body__c
+ FROM Rental_Apply_Equipment_Set__c
+ WHERE Id = :parentId
+ ];
+ if (parentObjs.size() > 0) {
parentObj = parentObjs.get(0);
- String rsdid=System.label.Rental_Apply_id;
+ String rsdid = System.label.Rental_Apply_id;
List<Rental_Apply_Equipment_Set_Detail__c> raesdObjs = [
- SELECT Id, Rental_Apply_Equipment_Set__c,
- Cancel_Reason__c, // 20210817 ljh SFDC-C448KZ add
- Loaner_cancel_reason__c,// 20210817 ljh SFDC-C448KZ add
- Loaner_cancel_Remarks__c// 20210817 ljh SFDC-C448KZ add
- FROM Rental_Apply_Equipment_Set_Detail__c
- WHERE Rental_Apply__c =:rsdid limit 1];
+ SELECT
+ Id,
+ Rental_Apply_Equipment_Set__c,
+ Cancel_Reason__c, // 20210817 ljh SFDC-C448KZ add
+ Loaner_cancel_reason__c, // 20210817 ljh SFDC-C448KZ add
+ Loaner_cancel_Remarks__c // 20210817 ljh SFDC-C448KZ add
+ FROM Rental_Apply_Equipment_Set_Detail__c
+ WHERE Rental_Apply__c = :rsdid
+ LIMIT 1
+ ];
- if (!raesdObjs.isEmpty()) {
- sonObj = raesdObjs[0];
- }
+ if (!raesdObjs.isEmpty()) {
+ sonObj = raesdObjs[0];
+ }
// 涓讳綋 or 绗竴鏉�
List<Rental_Apply_Equipment_Set_Detail__c> bodyObjs = [
- SELECT Id, Internal_asset_location_before__c, Salesdepartment_before__c,
- Product_category_text__c, Equipment_Type_text__c, Select_Time__c
- FROM Rental_Apply_Equipment_Set_Detail__c
- WHERE Rental_Apply_Equipment_Set__c = :parentId
- and Id =: parentObj.First_RAESD__c
- and Cancel_Select__c = false];
+ SELECT
+ Id,
+ Internal_asset_location_before__c,
+ Salesdepartment_before__c,
+ Product_category_text__c,
+ Equipment_Type_text__c,
+ Select_Time__c
+ FROM Rental_Apply_Equipment_Set_Detail__c
+ WHERE Rental_Apply_Equipment_Set__c = :parentId AND Id = :parentObj.First_RAESD__c AND Cancel_Select__c = FALSE
+ ];
if (!bodyObjs.isEmpty()) {
if (bodyObjs[0].Select_Time__c != null) {
bieCunFangDi = bodyObjs[0].Internal_asset_location_before__c;
- bieBenBu = bodyObjs[0].Salesdepartment_before__c; // #OLY_OCM-654 MA鍜屼骇鍝佹娴嬫湰閮ㄦ槸闇�瑕佹绱㈢殑,鎵�浠ヤ笉娉ㄩ噴
+ bieBenBu = bodyObjs[0].Salesdepartment_before__c; // #OLY_OCM-654 MA鍜屼骇鍝佹娴嬫湰閮ㄦ槸闇�瑕佹绱㈢殑,鎵�浠ヤ笉娉ㄩ噴
// #OLY_OCM-654 Start
// bieChanPinFenLei = bodyObjs[0].Product_category_text__c;
// bieBiePinFenLei = bodyObjs[0].Equipment_Type_text__c;
@@ -632,7 +658,7 @@
}
if (String.isBlank(bieCunFangDi)) {
bieCunFangDi = parentObj.Rental_Apply__r.Internal_asset_location_F__c;
- bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c; // #OLY_OCM-654 MA鍜屼骇鍝佹娴嬫湰閮ㄦ槸闇�瑕佹绱㈢殑,鎵�浠ヤ笉娉ㄩ噴
+ bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c; // #OLY_OCM-654 MA鍜屼骇鍝佹娴嬫湰閮ㄦ槸闇�瑕佹绱㈢殑,鎵�浠ヤ笉娉ㄩ噴
// #OLY_OCM-654 Start
// bieChanPinFenLei = parentObj.Rental_Apply__r.Product_category__c;
// bieBiePinFenLei = parentObj.Rental_Apply__r.Equipment_Type_F__c;
@@ -642,7 +668,6 @@
throw new ControllerUtil.myException('涓嶈兘鏄庣‘瀛樻斁鍦�, 璇风‘璁ゆ暟鎹��');
}
}
-
}
// 20210817 ljh SFDC-C448KZ update end
}
@@ -667,26 +692,20 @@
bieBenBu = '';
}
// #OLY_OCM-654 淇濇湁璁惧鍚堝苟鍚�,鍙栧嚭鐨勭涓�鏉′竴瑙堟槑缁嗙殑鏈儴鍙兘涓虹┖,鎵�浠iebenbu涓虹┖鏃�,涔熻娣诲姞妫�绱㈡潯浠� End
-
}
//鍒瓨鏀惧湴 SelectOption
public List<SelectOption> getbieCunFangDiOps() {
- return new List<SelectOption>{
- new SelectOption(bieCunFangDi, bieCunFangDi)
- };
+ return new List<SelectOption>{ new SelectOption(bieCunFangDi, bieCunFangDi) };
}
// #OLY_OCM-654 鍒湰閮� 椤甸潰娌℃湁妫�绱㈡墍浠ヤ笉鏀� SelectOption
public List<SelectOption> getbieBenBuOps() {
- return new List<SelectOption>{
- new SelectOption(bieBenBu, bieBenBu)
- };
+ return new List<SelectOption>{ new SelectOption(bieBenBu, bieBenBu) };
// return FixtureUtil.bieBenBuOpsMap.get('鏈儴');
}
private void searchOppSetParam() {
-
}
public PageReference searchOpp() {
@@ -709,7 +728,7 @@
PageReference pg;
if (parentObj.First_RAESD__r.Is_Body__c) {
pg = new PageReference('/apex/MainFixtureSelect');
- pg.getParameters().put('pt_recid',parentId);
+ pg.getParameters().put('pt_recid', parentId);
pg.setRedirect(true);
} else {
pg = new PageReference('/' + parentId);
@@ -730,7 +749,9 @@
Rental_Apply_Equipment_Set_Detail__c robj = (Rental_Apply_Equipment_Set_Detail__c) wprInfo.sobj;
// 鐘舵�佸彧鏈夋槸鍙互鍒嗛厤鏃舵墠浼氫繚瀛�
- if (FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.AssetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) == robj.Fu_Shu_Pin_Fen_Pei_Jia__c
+ if (
+ FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.AssetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) ==
+ robj.Fu_Shu_Pin_Fen_Pei_Jia__c
) {
if (!String.isBlank(robj.Asset__c)) {
assetIdList.add(robj.Asset__c);
@@ -742,15 +763,20 @@
if (assetIdList.size() > 0) {
//20170906 upsert by UniqueKey__c
List<Rental_Apply_Equipment_Set_Detail__c> mfUpsert = new List<Rental_Apply_Equipment_Set_Detail__c>();
- Map<Id, Asset> aSetMap = new Map<Id, Asset>([
- Select Id, Quantity,
- Out_of_wh__c,
- Manage_type__c,
- Ji_Zhong_Guan_Li_Ku_Cun__c, // 20220118 ljh SFDC-C9V84U start
- Last_Reserve_RAES_Detail__c
- From Asset
- where Id = :assetIdList
- for Update]);
+ Map<Id, Asset> aSetMap = new Map<Id, Asset>(
+ [
+ SELECT
+ Id,
+ Quantity,
+ Out_of_wh__c,
+ Manage_type__c,
+ Ji_Zhong_Guan_Li_Ku_Cun__c, // 20220118 ljh SFDC-C9V84U start
+ Last_Reserve_RAES_Detail__c
+ FROM Asset
+ WHERE Id = :assetIdList
+ FOR UPDATE
+ ]
+ );
Map<Id, Asset> assetUpdateMap = new Map<Id, Asset>();
// 鐘舵�佸彧鏈夋槸鍙互鍒嗛厤鏃舵墠浼氫繚瀛�
@@ -761,20 +787,29 @@
}
Rental_Apply_Equipment_Set_Detail__c robj = (Rental_Apply_Equipment_Set_Detail__c) wprInfo.sobj;
//1822 yc 20211021 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 start
- if(robj.Rental_Apply__r.demo_purpose2__c=='宸茶喘寰呰揣' && robj.Rental_Apply__r.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c!= null){
+ if (
+ robj.Rental_Apply__r.demo_purpose2__c == '宸茶喘寰呰揣' &&
+ robj.Rental_Apply__r.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c != null
+ ) {
throw new ControllerUtil.myException('宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩锛屼笉鑳界户缁簡');
- }
- if(robj.Rental_Apply__r.demo_purpose2__c=='绱㈣禂QIS' && robj.Rental_Apply__r.next_action__c=='鏃犲伩鏇存崲' && robj.Rental_Apply__r.QIS_number__r.ReplaceDeliveryDate__c!= null){
+ }
+ if (
+ robj.Rental_Apply__r.demo_purpose2__c == '绱㈣禂QIS' &&
+ robj.Rental_Apply__r.next_action__c == '鏃犲伩鏇存崲' &&
+ robj.Rental_Apply__r.QIS_number__r.ReplaceDeliveryDate__c != null
+ ) {
throw new ControllerUtil.myException('绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ワ紝涓嶈兘缁х画浜�');
- }
- //1822 yc 20211021 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
+ }
+ //1822 yc 20211021 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱 end
// 鍙互鍒嗛厤銇牬鍚� (Asset__c 浠� null 鍒� 鏈夊��)
- if (FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.AssetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) == robj.Fu_Shu_Pin_Fen_Pei_Jia__c
+ if (
+ FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.AssetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) ==
+ robj.Fu_Shu_Pin_Fen_Pei_Jia__c
) {
Asset aSet = aSetMap.get(robj.Asset__c);
// 涓嶈兘lock鍒版暟鎹殑鏃跺��
if (aSet == null) {
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝涓嶆槸鏈夋晥鐨勯檮灞炲搧锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝涓嶆槸鏈夋晥鐨勯檮灞炲搧锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
}
// 鍒嗛厤鏃堕棿 (Asset__c 浠� null 鍒� 鏈夊��)
if (robj.Select_Time__c == null) {
@@ -787,11 +822,11 @@
Integer num = Integer.valueof(aSet.Quantity - aSet.Out_of_wh__c);
// 澶囧搧鏈夋晥搴撳瓨娌℃湁鏃�,绋嬪簭杩斿洖骞舵彁绀洪敊璇俊鎭�
if (num < 1) {
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝娌℃湁瓒冲鏈夋晥搴撳瓨锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝娌℃湁瓒冲鏈夋晥搴撳瓨锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
}
// 20220118 ljh SFDC-C9V84U start
- if(aSet.Ji_Zhong_Guan_Li_Ku_Cun__c <= 0){
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝闆嗕腑搴撳簱瀛樹笉瓒筹紝璇峰埛鏂扮敾闈㈠悗閲嶆柊鎿嶄綔');
+ if (aSet.Ji_Zhong_Guan_Li_Ku_Cun__c <= 0) {
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝闆嗕腑搴撳簱瀛樹笉瓒筹紝璇峰埛鏂扮敾闈㈠悗閲嶆柊鎿嶄綔');
}
// 20220118 ljh SFDC-C9V84U end
//aSet.Out_of_wh__c = aSet.Out_of_wh__c + 1;
@@ -799,8 +834,14 @@
//assetUpdateMap.put(aSet.Id, aSet);
}
- String uniqueKeyStr = parentObj.RequestNoJoinStr2__c + ':'+ robj.Rental_Apply_Equipment_Set__c
- + ':' + robj.FSD_Id__c + ':' + robj.IndexFromUniqueKey__c;
+ String uniqueKeyStr =
+ parentObj.RequestNoJoinStr2__c +
+ ':' +
+ robj.Rental_Apply_Equipment_Set__c +
+ ':' +
+ robj.FSD_Id__c +
+ ':' +
+ robj.IndexFromUniqueKey__c;
robj.UniqueKey__c = uniqueKeyStr;
@@ -830,7 +871,7 @@
saveType = '';
return null;
} else if (saveType == '2') {
- // 銈姐兗銉堟檪銇鏇淬亗銈�
+ // 銈姐兗銉堟檪銇鏇淬亗銈�
myComponentController.sortTable();
saveType = '';
return null;
@@ -844,11 +885,10 @@
}
}
/**
- *#OLY_OCM-668 鍙栨秷闄勫睘鍝佸垎閰�
- *@return PageReference 鍒锋柊闄勫睘鍝侀�夋嫨椤甸潰
- */
- public PageReference unassign(){
-
+ *#OLY_OCM-668 鍙栨秷闄勫睘鍝佸垎閰�
+ *@return PageReference 鍒锋柊闄勫睘鍝侀�夋嫨椤甸潰
+ */
+ public PageReference unassign() {
Savepoint sp = Database.setSavepoint();
try {
@@ -859,34 +899,32 @@
for (WrapperInfo wprInfo : viewList) {
Rental_Apply_Equipment_Set_Detail__c robj = (Rental_Apply_Equipment_Set_Detail__c) wprInfo.sobj;
if (!String.isBlank(robj.Asset__c)) {
- assetIdList.add(robj.Asset__c);
- raesdIdList.add(robj.Id);
+ assetIdList.add(robj.Asset__c);
+ raesdIdList.add(robj.Id);
}
}
// 鍔爈ock
- Map<Id,Rental_Apply_Equipment_Set_Detail__c> raesdMap = new Map<Id,Rental_Apply_Equipment_Set_Detail__c>([
- SELECT Id
- , Asset__c
- , Select_Time__c
- , StockDown_time__c
- , Cancel_Date__c
- , Fixture_OneToOne_Link_Id__c
- FROM Rental_Apply_Equipment_Set_Detail__c
- WHERE Id in :raesdIdList
- FOR UPDATE]);
+ Map<Id, Rental_Apply_Equipment_Set_Detail__c> raesdMap = new Map<Id, Rental_Apply_Equipment_Set_Detail__c>(
+ [
+ SELECT Id, Asset__c, Select_Time__c, StockDown_time__c, Cancel_Date__c, Fixture_OneToOne_Link_Id__c
+ FROM Rental_Apply_Equipment_Set_Detail__c
+ WHERE Id IN :raesdIdList
+ FOR UPDATE
+ ]
+ );
if (raesdMap.size() > 0) {
Map<String, Rental_Apply_Equipment_Set_Detail__c> mfUpsert = new Map<String, Rental_Apply_Equipment_Set_Detail__c>();
// 璇诲彇宸插垎閰嶇殑鎵�鏈夐檮灞炲搧
- Map<Id, Asset> aSetMap = new Map<Id, Asset>([
- Select Id, Quantity,
- Out_of_wh__c,
- Manage_type__c,
- Last_Reserve_RAES_Detail__c
- From Asset
- where Id = :assetIdList
- for Update]);
+ Map<Id, Asset> aSetMap = new Map<Id, Asset>(
+ [
+ SELECT Id, Quantity, Out_of_wh__c, Manage_type__c, Last_Reserve_RAES_Detail__c
+ FROM Asset
+ WHERE Id = :assetIdList
+ FOR UPDATE
+ ]
+ );
for (Integer indexNum = 0; indexNum < viewList.size(); indexNum++) {
// 瀵规墦鍕剧殑闄勫睘鍝佸彇娑堝垎閰�
WrapperInfo wprInfo = viewList[indexNum];
@@ -895,24 +933,24 @@
if (!wprInfo.check) {
continue;
}
- if(robjOnline.Cancel_Date__c != null){
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝宸茬粡鍙栨秷鐢宠浜嗭紝涓嶈兘鍙栨秷鍒嗛厤');
+ if (robjOnline.Cancel_Date__c != null) {
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝宸茬粡鍙栨秷鐢宠浜嗭紝涓嶈兘鍙栨秷鍒嗛厤');
}
- if(robjOnline.StockDown_time__c != null){
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝宸蹭笅鏋讹紝涓嶅彲浠ュ彇娑堝垎閰�');
+ if (robjOnline.StockDown_time__c != null) {
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝宸蹭笅鏋讹紝涓嶅彲浠ュ彇娑堝垎閰�');
}
- if(robjOnline.Select_Time__c == null){
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝杩樻病鏈夎鍒嗛厤锛屼笉鍙互鍙栨秷鍒嗛厤');
+ if (robjOnline.Select_Time__c == null) {
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝杩樻病鏈夎鍒嗛厤锛屼笉鍙互鍙栨秷鍒嗛厤');
}
// OLY_OCM-668 涓�瀵逛竴闄勫睘鍝佷笉鑳藉彇娑堝垎閰嶏細绯荤粺閫昏緫淇濇寔涓嶅彉
if (String.isNotBlank(robjOnline.Fixture_OneToOne_Link_Id__c)) {
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝涓�瀵逛竴鍒嗛厤鐨勯檮灞炲搧锛屼笉鑳藉彇娑堝垎閰�');
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝涓�瀵逛竴鍒嗛厤鐨勯檮灞炲搧锛屼笉鑳藉彇娑堝垎閰�');
}
Asset aSet = aSetMap.get(robj.Asset__c);
// 涓嶈兘lock鍒版暟鎹殑鏃跺��
if (aSet == null) {
- throw new ControllerUtil.myException('绗�' + (indexNum + 1) +'琛岋紝涓嶆槸鏈夋晥鐨勯檮灞炲搧锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
+ throw new ControllerUtil.myException('绗�' + (indexNum + 1) + '琛岋紝涓嶆槸鏈夋晥鐨勯檮灞炲搧锛岃鍒锋柊鐢婚潰鍚庨噸鏂版搷浣�');
}
// 鐩稿叧瀛楁缃负 null
@@ -941,8 +979,14 @@
// 澶囧搧绠＄悊缂栫爜(鍊熷嚭鏃�)
robj.EquipmentSet_Managment_Code_text__c = null;
- String uniqueKeyStr = parentObj.RequestNoJoinStr2__c + ':'+ robj.Rental_Apply_Equipment_Set__c
- + ':' + robj.FSD_Id__c + ':' + robj.IndexFromUniqueKey__c;
+ String uniqueKeyStr =
+ parentObj.RequestNoJoinStr2__c +
+ ':' +
+ robj.Rental_Apply_Equipment_Set__c +
+ ':' +
+ robj.FSD_Id__c +
+ ':' +
+ robj.IndexFromUniqueKey__c;
robj.UniqueKey__c = uniqueKeyStr;
mfUpsert.put(robj.UniqueKey__c, robj);
@@ -951,13 +995,10 @@
if (!mfUpsert.isEmpty()) {
FixtureUtil.withoutUpsertRaesd(mfUpsert.values());
}
-
- }
- else{
+ } else {
throw new ControllerUtil.myException('娌℃湁涓嬫灦鍓嶅凡鍒嗛厤鐨勯檮灞炲搧');
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
ApexPages.addMessages(ex);
Database.rollback(sp);
return null;
@@ -965,18 +1006,16 @@
// 鍒锋柊鐢婚潰
PageReference pg = new PageReference('/apex/AccessorySelect');
- pg.getParameters().put('pt_recid',parentId);
+ pg.getParameters().put('pt_recid', parentId);
pg.setRedirect(true);
return pg;
-
-
}
// https://sohobb.backlog.jp/view/OLY_OCM-152#comment-20041467
// 涓�瀵逛竴鐨勯檮灞炲搧 涓嶈兘 鍗曠嫭 鍙栨秷
public PageReference cancel() {
Savepoint sp = Database.setSavepoint();
- try{
+ try {
List<Rental_Apply_Equipment_Set_Detail__c> raesds = new List<Rental_Apply_Equipment_Set_Detail__c>();
List<Id> delIds = new List<Id>();
for (WrapperInfo wprInfo : viewList) {
@@ -996,7 +1035,6 @@
if (robj.CreatedBy.ProfileId == System.Label.ProfileId_EquipmentCenter && robj.Select_Time__c == null) {
// 鍒犻櫎鏄庣粏Id<List>
delIds.add(robj.Id);
-
} else {
if (String.isBlank(robj.Cancel_Reason__c)) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '璇疯緭鍏ュ彇娑堢悊鐢�'));
@@ -1007,7 +1045,7 @@
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '璇疯緭鍏ユ槑缁嗗彇娑堢悊鐢�'));
return null;
}
- if (robj.Loaner_cancel_reason__c=='鍏朵粬' && String.isBlank(robj.Loaner_cancel_Remarks__c)) {
+ if (robj.Loaner_cancel_reason__c == '鍏朵粬' && String.isBlank(robj.Loaner_cancel_Remarks__c)) {
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '璇疯緭鍏ュ彇娑堢悊鐢卞娉�'));
return null;
}
@@ -1026,20 +1064,21 @@
robj.Cancel_Mem__c = UserInfo.getUserId();
// 鍙栨秷鐞嗙敱澶囨敞
//robj.Loaner_cancel_Remarks__c
- robj.Loaner_cancel_Remarks__c = robj.Loaner_cancel_Remarks__c==null ? robj.Loaner_cancel_reason__c : robj.Loaner_cancel_Remarks__c;//20210818 SFDC-C448KZ ljh end
+ robj.Loaner_cancel_Remarks__c = robj.Loaner_cancel_Remarks__c == null
+ ? robj.Loaner_cancel_reason__c
+ : robj.Loaner_cancel_Remarks__c; //20210818 SFDC-C448KZ ljh end
//鈥诲凡缁忓垎閰嶇殑鍫村悎 銉堛儶銇屻仹銈勩倞銇俱仚
//if(!String.isBlank(robj.Asset__c) && robj.Select_Time__c != null) {
- //鍊熷嚭澶囧搧Set涓�瑙堟槑缁� trigger 閲� clear Asset__c
- //鍊熷嚭澶囧搧Set涓�瑙堟槑缁�.鍒嗛厤鏃堕棿
- // if (robj.Select_Time__c != null) {
- // robj.Select_Time__c = null;
- // }
+ //鍊熷嚭澶囧搧Set涓�瑙堟槑缁� trigger 閲� clear Asset__c
+ //鍊熷嚭澶囧搧Set涓�瑙堟槑缁�.鍒嗛厤鏃堕棿
+ // if (robj.Select_Time__c != null) {
+ // robj.Select_Time__c = null;
+ // }
//}
raesds.add(robj);
}
}
-
}
}
@@ -1053,7 +1092,7 @@
// 鍙栨秷鎿嶄綔,鍙槸鍙栨秷宸查�夋嫨鐨勫垎閰�,鐢婚潰鍒锋柊
PageReference pg = new PageReference('/apex/AccessorySelect');
- pg.getParameters().put('pt_recid',parentId);
+ pg.getParameters().put('pt_recid', parentId);
pg.setRedirect(true);
return pg;
}
@@ -1096,7 +1135,11 @@
Map<String, List<Asset>> autoSelectMap = new Map<String, List<Asset>>();
// 鑷姩鍒嗛厤瀵硅薄
Map<String, List<Rental_Apply_Equipment_Set_Detail__c>> autoRsdMap = new Map<String, List<Rental_Apply_Equipment_Set_Detail__c>>();
- Map<Rental_Apply_Equipment_Set_Detail__c, Map<String, FixtureUtil.groupBean>> rsdMap = FixtureUtil.raesdGroupBy(selectedData, myComponentController.columus, bieWhere);
+ Map<Rental_Apply_Equipment_Set_Detail__c, Map<String, FixtureUtil.groupBean>> rsdMap = FixtureUtil.raesdGroupBy(
+ selectedData,
+ myComponentController.columus,
+ bieWhere
+ );
// 閬告姙娓堛伩銇槑缁�
if (selectedData.size() > 0) {
for (Integer i = 0; i < selectedData.size(); i++) {
@@ -1114,14 +1157,16 @@
Integer index = rsdGroupInfo.get(apikey).gnum;
if (!String.isBlank(rsdObj.Asset__c) && rsdObj.Select_Time__c != null) {
- rsdObj.put(apikey, FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.assetFixtureStatus.Yi_Fen_Pei.ordinal()));
- }
- else {
+ rsdObj.put(
+ apikey,
+ FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.assetFixtureStatus.Yi_Fen_Pei.ordinal())
+ );
+ } else {
rsdObj.put(apikey, FixtureUtil.assetFixtureStatusMap.get(index));
}
}
// liucheng 20171112
- else {
+ else {
rsdObj.put(apikey, rsdGroupInfo.get(apikey).gnum);
}
}
@@ -1167,7 +1212,10 @@
} else {
showButtonList.add(false);
// 鍙互鍒嗛厤銇牬鍚�
- if (FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.assetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) == rsdObj.Fu_Shu_Pin_Fen_Pei_Jia__c) {
+ if (
+ FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.assetFixtureStatus.Ke_Yi_Fen_Pei.ordinal()) ==
+ rsdObj.Fu_Shu_Pin_Fen_Pei_Jia__c
+ ) {
if (!autoRsdMap.containsKey(rsdObj.FSD_Fixture_Model_No__c)) {
autoRsdMap.put(rsdObj.FSD_Fixture_Model_No__c, new List<Rental_Apply_Equipment_Set_Detail__c>());
autoSelectMap.put(rsdObj.FSD_Fixture_Model_No__c, new List<Asset>());
@@ -1194,28 +1242,32 @@
// 妞滅储鏉′欢
String dateToday = String.valueOf(Date.today());
- String soql = 'SELECT Id, Fixture_Model_No_F__c, Pre_Arrival_wh_time__c, Ji_Zhong_Guan_Li_Ku_Cun__c,'
- + ' SerialNumber, Salesdepartment__c, Internal_asset_location__c,'
- + ' You_Xiao_Ku_Cun__c, Out_of_wh__c, Repairing_Count__c'
- + ' FROM Asset'
- + ' WHERE Asset_Owner__c = \'Olympus\' AND ' + FixtureUtil.getAssetSoqlBase()
- + ' and Asset_loaner_category__c != \'鑰楁潗\''
- + ' and RecordTypeId = \'01210000000kOPR\''
- + ' and Loaner_accsessary__c = true'
- + ' and Equipment_Type__c != \'妫�娴嬬敤澶囧搧\''
- + ' and Delete_Flag__c = False'
- + ' and Freeze_sign_Abandoned_Flag__c = False'
- + ' and (Consumable_Guaranteen_end__c = null or Consumable_Guaranteen_end__c >=' + dateToday + ')'
- + ' and Fixture_OneToOne_Link__c = null' // 闄勫睘鍝佷竴瀵逛竴鐨勪釜浣撶鐞嗕笉鑳芥绱㈠嚭鏉�
- + ' and Internal_asset_location__c != null'
- + ' and Product2.Fixture_Model_No_T__c IN :moset'
- + bieWhere +
- + ' and Ji_Zhong_Guan_Li_Ku_Cun__c > 0' ; // 鏈夐泦涓鐞嗗簱瀛樼殑
- soql += ' ORDER BY Product2.Fixture_Model_No_T__c, Consumable_Guaranteen_end__c ASC NULLS LAST, Ji_Zhong_Guan_Li_Ku_Cun__c DESC, Pre_Arrival_wh_time__c ASC NULLS FIRST, Id DESC';
+ String soql =
+ 'SELECT Id, Fixture_Model_No_F__c, Pre_Arrival_wh_time__c, Ji_Zhong_Guan_Li_Ku_Cun__c,' +
+ ' SerialNumber, Salesdepartment__c, Internal_asset_location__c,' +
+ ' You_Xiao_Ku_Cun__c, Out_of_wh__c, Repairing_Count__c' +
+ ' FROM Asset' +
+ ' WHERE Asset_Owner__c = \'Olympus\' AND ' +
+ FixtureUtil.getAssetSoqlBase() +
+ ' and Asset_loaner_category__c != \'鑰楁潗\'' +
+ ' and RecordTypeId = \'01210000000kOPR\'' +
+ ' and Loaner_accsessary__c = true' +
+ ' and Equipment_Type__c != \'妫�娴嬬敤澶囧搧\'' +
+ ' and Delete_Flag__c = False' +
+ ' and Freeze_sign_Abandoned_Flag__c = False' +
+ ' and (Consumable_Guaranteen_end__c = null or Consumable_Guaranteen_end__c >=' +
+ dateToday +
+ ')' +
+ ' and Fixture_OneToOne_Link__c = null' + // 闄勫睘鍝佷竴瀵逛竴鐨勪釜浣撶鐞嗕笉鑳芥绱㈠嚭鏉�
+ ' and Internal_asset_location__c != null' +
+ ' and Product2.Fixture_Model_No_T__c IN :moset' +
+ bieWhere +
+ +' and Ji_Zhong_Guan_Li_Ku_Cun__c > 0'; // 鏈夐泦涓鐞嗗簱瀛樼殑
+ soql += ' ORDER BY Product2.Fixture_Model_No_T__c, Consumable_Guaranteen_end__c ASC NULLS LAST, Ji_Zhong_Guan_Li_Ku_Cun__c DESC, Pre_Arrival_wh_time__c ASC NULLS FIRST, Id DESC';
System.debug('bieWhere' + bieWhere);
- List<Asset> assignList = Database.query(soql);
+ List<Asset> assignList = Database.query(soql);
for (Asset aSet : assignList) {
List<Asset> autoSelectList = autoSelectMap.get(aSet.Fixture_Model_No_F__c);
@@ -1244,15 +1296,17 @@
Integer autoKuCun = autoKuCunMap.get(aSet.Id);
if (autoKuCun > 0) {
rsdObj.Asset__c = aSet.Id;
- rsdObj.Asset__r = aSet; // TODO Select Asset 銈堛倞 琛ㄧずField銇ō瀹� myComponentController.strColumus
+ rsdObj.Asset__r = aSet; // TODO Select Asset 銈堛倞 琛ㄧずField銇ō瀹� myComponentController.strColumus
autoKuCun--;
autoKuCunMap.put(aSet.Id, autoKuCun);
- break; // 涓嬩竴鏉″�熷嚭鏄庣粏
+ break; // 涓嬩竴鏉″�熷嚭鏄庣粏
}
}
if (String.isBlank(rsdObj.Asset__c)) {
- rsdObj.put('Fu_Shu_Pin_Fen_Pei_Jia__c', FixtureUtil.assetFixtureStatusMap.get(
- FixtureUtil.AssetFixtureStatus.Mei_You_Ku_Cun.ordinal()));
+ rsdObj.put(
+ 'Fu_Shu_Pin_Fen_Pei_Jia__c',
+ FixtureUtil.assetFixtureStatusMap.get(FixtureUtil.AssetFixtureStatus.Mei_You_Ku_Cun.ordinal())
+ );
}
}
}
@@ -1262,7 +1316,7 @@
if (queryList.size() == 0) {
return;
}
-system.debug('鈼忊棌鈼忊棌鈼� setViewList END ' );
+ system.debug('鈼忊棌鈼忊棌鈼� setViewList END ');
}
public override void checkEvent() {
@@ -1282,4 +1336,4 @@
public String getBodyModelNoJson() {
return JSON.serialize(showButtonList);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1