From e6a0a7f9ffb463c5ce78d6770b09eac739f88b15 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 24 五月 2023 16:57:53 +0800
Subject: [PATCH] 优化确认框以及修改页面
---
force-app/main/default/classes/lexPCLLostReportLwcController.cls | 325 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 231 insertions(+), 94 deletions(-)
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 7f4160e..1c42b9f 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -1,46 +1,144 @@
public with sharing class lexPCLLostReportLwcController {
- @AuraEnabled
+
public static Product2 pro2 { get; set; }
- @AuraEnabled
+
public static string oppId { get; set; }
- @AuraEnabled
+
public static string lostReportId { get; set; }
// 褰撳墠椤甸潰鐘舵�� Create,View and Edit, MarketEdit
- @AuraEnabled
+
public static string pageStatus { get; set; }
// 澶卞崟锛岄儴鍒嗗け鍗�
- @AuraEnabled
+
public static string lostType {get; set;}
public static Set<ID> deleteBrandIDSet = new Set<ID>();
- @AuraEnabled
+
public static string submitFlag {get; set;}
- @AuraEnabled
+
public static LostReport LostReport {get; set;}
- @AuraEnabled
+
public static integer brandNo {get; set;}
- @AuraEnabled
+
public static integer RemoveBrandNo {get; set;}
- @AuraEnabled
+
public static integer setBrandNo {get; set;}
- @AuraEnabled
+
public static integer brandCount {get; set;}
// add tcm 20211122 start
- @AuraEnabled
+
public static integer topNum {get; set;}
- @AuraEnabled
+
public static integer secondNum {get; set;}
// add tcm 20211122 end
- // 鍒濆鍖�
+
@AuraEnabled
- public static void initForApex(string oppId1,string lostReportId1,string pageStatus1,string lostType1,string submitFlag1){
- oppId = oppId1;
- lostReportId = lostReportId;
- pageStatus = pageStatus1;
- lostType = lostType1;
- submitFlag = submitFlag1;
+ public static LostReport getLostReport(){
+ try {
+ return LostReport;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
}
+
+ @AuraEnabled( cacheable = true )
+ public static List< Account > getAccounts() {
+
+ return [ SELECT Id, Name, Industry FROM Account LIMIT 10 ];
+
+ }
+
+ @AuraEnabled( cacheable = true )
+ public static void saveAccounts(List<Account> accList){
+ Insert accList;
+ /*if(accList.size()>0 && accList != null){
+ insert accList;
+ }*/
+ }
+
@AuraEnabled
- public static Map<string,object> init(){
+ public static String getPickList(String objectName, String fieldName) {
+ List<Map<String, String>> lstPickvals = new List<Map<String, String>>();
+ List<Schema.DescribeSobjectResult> results = Schema.describeSObjects(new List<String>{objectName});
+
+ for(Schema.DescribeSobjectResult res : results) {
+ for (Schema.PicklistEntry entry : res.fields.getMap().get(fieldName).getDescribe().getPicklistValues()) {
+ if (entry.isActive()) {
+ lstPickvals.add(new Map<String, String>{'label' => entry.getValue(), 'value' => entry.getValue()});
+ }
+ }
+ }
+ Map<string,List<Map<String, String>>> pickList = new Map<string,List<Map<String, String>>>();
+ List<Map<String, String>> zhuji = new List<Map<String, String>>();
+ List<Map<String, String>> jingzi = new List<Map<String, String>>();
+ List<Map<String, String>> xiaojingzhong = new List<Map<String, String>>();
+ List<Map<String, String>> nengliang = new List<Map<String, String>>();
+ List<Map<String, String>> qita = new List<Map<String, String>>();
+ Map<String, String> empty = new Map<String, String>{'label' => '--鏃�--', 'value' => ''};
+ zhuji.add(empty);
+ jingzi.add(empty);
+ xiaojingzhong.add(empty);
+ nengliang.add(empty);
+ qita.add(empty);
+ for (Integer i = 0; i < lstPickvals.size(); i++) {
+ if ((i >= 0 && i <= 6) || i == 36) {
+ zhuji.add(lstPickvals[i]);
+ }
+ if ((i >= 7 && i <= 23) || i == 36) {
+ jingzi.add(lstPickvals[i]);
+ }
+ if ((i >= 24 && i <= 29) || i == 35) {
+ xiaojingzhong.add(lstPickvals[i]);
+ }
+ if ((i >= 30 && i <= 34) || i == 36) {
+ nengliang.add(lstPickvals[i]);
+ }
+ if (i == 36) {
+ qita.add(lstPickvals[i]);
+ }
+ }
+ pickList.put('涓绘満', zhuji);
+ pickList.put('闀滃瓙', jingzi);
+ pickList.put('灏忛暅绉�', xiaojingzhong);
+ pickList.put('鑳介噺', nengliang);
+ pickList.put('鍏朵粬', qita);
+ return JSON.serialize(pickList);
+ }
+ @AuraEnabled
+ public static String getPickListByFilter(String objectName,String fieldName,String controlFieldName,String controlFieldValue){
+ try {
+ Schema.DescribeFieldResult fieldDescribe = Schema.getGlobalDescribe().get(objectName).getDescribe().fields.getMap().get(fieldName).getDescribe();
+ // 濡傛灉璇ュ瓧娈典负閫夐」鍒楄〃绫诲瀷锛屽垯鑾峰彇閫夐」鍒楄〃
+ List<Schema.PicklistEntry> picklistValues = fieldDescribe.getPicklistValues();
+ // 鏍规嵁鎺у埗瀛楁鐨勫�肩瓫閫夊嚭瀵瑰簲鐨勯�夐」
+ List<Map<String, Object>> lstPickvals = new List<Map<String, Object>>();
+ for (Schema.PicklistEntry entry : picklistValues) {
+ if (entry.isActive() && entry.getValue().startsWith(controlFieldValue)) {
+ lstPickvals.add(new Map<String, Object>{'label' => entry.getValue(), 'value' => entry.getValue()});
+ }
+ }
+ String jsonStr = JSON.serialize(lstPickvals);
+ return jsonStr;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
+
+ @AuraEnabled
+ public static Map<string,object> init (string oppId1,string lostReportId1,string pageStatus1,string lostType1,string submitFlag1){
+ try {
+ oppId = oppId1;
+ lostReportId = lostReportId1;
+ pageStatus = pageStatus1;
+ lostType = lostType1;
+ submitFlag = submitFlag1;
+ return init1();
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ // 鍒濆鍖�
+ public static Map<string,object> init1(){
Map<string,object> maps = new Map<string,object>();
if(string.isblank(pageStatus)) {
// 杩欓噷闇�瑕佹姤閿欐病鏈変紶鍙傛暟
@@ -95,6 +193,7 @@
Lost_Reason_Sub__c,Lost_By_Company__c,
LostTotalAmount__c,LostType__c,
Report_Status__c,Sales_assistant__c,
+ InclusionUltrasound__c, //20230506 lt DB202304618804 鍖呭惈瓒呭０
Opportunity__c, Opportunity__r.Sales_assistant_ID__c,
Opportunity__r.Sales_manager_departmentID__c,
Manager_sales__c,recordtypeid,recordtype.DeveloperName
@@ -183,8 +282,13 @@
return maps;
}
- return null;
+ // List<Map<String,String>> col = new List<Map<String,String>>();
+ // Map<String,String> ele = new Map<String,String>();
+ // LostReport.LostBrands[0].columns.add();
+ maps.put('LostReport', LostReport);
+ return maps;
}
+ //鍐欏埌js
// 缂栬緫 鍙湁绯荤粺绠＄悊鍛樻垨鑰呰崏妗堜腑鍙互缂栬緫
@AuraEnabled
public static String edit2(){
@@ -192,7 +296,7 @@
'鑽夋'.equals(LostReport.LostReport.Report_Status__c)
) {
pageStatus = 'Edit';
- init();
+ init1();
}
else{
return '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�';
@@ -248,20 +352,20 @@
}
}
// 淇濆瓨
- @AuraEnabled
- public static String save(){
-
- if(!DataCheck()) {
- return null;
- }
- if(!dataEntry()) {
- return null;
- }
-
- brandCount = LostReport.LostBrands.size();
- pageStatus = 'View';
- return '淇濆瓨鎴愬姛锛�';
- }
+ // @AuraEnabled
+ // public static String save(LostReport report){
+ // try {
+ // if(!dataEntry(report)) {
+ // return null;
+ // }
+
+ // // brandCount = LostReport.LostBrands.size();
+ // pageStatus = 'View';
+ // return '淇濆瓨鎴愬姛锛�';
+ // } catch (Exception e) {
+ // return e.getMessage();
+ // }
+ // }
//璇诲彇骞舵瀯寤虹珵浜夊鎵嬪搧鐗�
// public void BrandmapSet(){
// CompetitionMap = new map<string, id>();
@@ -274,7 +378,8 @@
// }
// 鏁版嵁妫�鏌�
@AuraEnabled
- public static boolean DataCheck(){
+ public static boolean DataCheck(LostReport report){
+ LostReport = report;
boolean dataCheck = true;
if(string.isBlank(LostReport.LostReport.LostType__c))
{
@@ -349,6 +454,7 @@
}
// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
}
+
return dataCheck;
}
@@ -375,10 +481,9 @@
String jsonStr = JSON.serialize(lstPickvals);
return jsonStr;
}
- @AuraEnabled
- public static list<LostBrand> brandcopy(){
+ public static list<LostBrand> brandcopy(LostReport report){
list<LostBrand> tempbrands = new list<LostBrand>();
- for(LostBrand tempbrand: LostReport.LostBrands) {
+ for(LostBrand tempbrand: report.LostBrands) {
LostBrand LostBrand =
new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
LostBrand.lostBrand = tempbrand.lostBrand.clone();
@@ -389,46 +494,47 @@
}
// 鏁版嵁褰曞叆
@AuraEnabled
- public static boolean dataEntry(){
+ public static Map<String,String> dataEntry(String report1){
+ LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
+ Map<String,String> messageMap = new Map <String,String>();
system.debug('save---start:');
Savepoint sp = Database.setSavepoint();
- Lost_cancel_report__c templostReport = LostReport.lostReport.clone();
- templostReport.id = LostReport.lostReport.id;
- list<LostBrand> tempBrands = brandcopy();
try{
// 寰呭畬鎴愶紝杩欓噷闇�瑕佹妸绗竴涓搧鐗岀殑淇℃伅璧嬪�煎埌杩欎釜澶卞崟鎶ュ憡涓婂幓锛岃繕鏈夐渶瑕佹妸鍚勪釜鍝佺墝閲戦姹囨�诲姞璧锋潵锛�
//system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
// 璁剧疆璁板綍绫诲瀷
- LostReport.lostReport.recordTypeID = LostReport.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
- LostReport.lostReport.LostTotalAmount__c = 0;
- LostReport.lostReport.of_lost_system_processor__c = 0;
- LostReport.lostReport.Lost_reason_main__c = null;
- LostReport.lostReport.Lost_Reason_Sub__c = null;
- LostReport.lostReport.Lost_By_Company__c = null;
- for(LostBrand tempLostBrand : LostReport.LostBrands) {
+ report.lostReport.recordTypeID = report.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
+ report.lostReport.LostTotalAmount__c = 0;
+ report.lostReport.of_lost_system_processor__c = 0;
+ report.lostReport.Lost_reason_main__c = null;
+ report.lostReport.Lost_Reason_Sub__c = null;
+ report.lostReport.Lost_By_Company__c = null;
+ for(LostBrand tempLostBrand : report.LostBrands) {
if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
- LostReport.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
- LostReport.lostReport.Lost_reason_main__c =
- LostReport.lostReport.Lost_reason_main__c == null
+ report.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
+ report.lostReport.Lost_reason_main__c =
+ report.lostReport.Lost_reason_main__c == null
? tempLostBrand.lostBrand.Lost_reason_main__c
- : LostReport.lostReport.Lost_reason_main__c;
- LostReport.lostReport.Lost_Reason_Sub__c =
- LostReport.lostReport.Lost_Reason_Sub__c == null
+ : report.lostReport.Lost_reason_main__c;
+ report.lostReport.Lost_Reason_Sub__c =
+ report.lostReport.Lost_Reason_Sub__c == null
? tempLostBrand.lostBrand.Lost_Reason_Sub__c
- : LostReport.lostReport.Lost_Reason_Sub__c;
- LostReport.lostReport.Lost_By_Company__c =
- LostReport.lostReport.Lost_By_Company__c == null
+ : report.lostReport.Lost_Reason_Sub__c;
+ report.lostReport.Lost_By_Company__c =
+ report.lostReport.Lost_By_Company__c == null
? tempLostBrand.lostBrand.Lost_By_Company__c
- : LostReport.lostReport.Lost_By_Company__c;
+ : report.lostReport.Lost_By_Company__c;
for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
- LostReport.lostReport.of_lost_system_processor__c += tempLostProduct.LostProductss.Quantity__c;
+ report.lostReport.of_lost_system_processor__c += tempLostProduct.LostProductss.Quantity__c;
}
}
}
}
- upsert LostReport.lostReport;
+ upsert report.lostReport;
+ String reportId = report.lostReport.Id;
+ messageMap.put('reportId', reportId);
// 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍝佺墝
map<integer,PCLLostBrand__c> upsertLostBrandMap = new map<integer,PCLLostBrand__c>();
// 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
@@ -437,12 +543,12 @@
map<string,PCLLostProduct__c> upsertLostProductMap = new map<string,PCLLostProduct__c>();
// 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
list<PCLLostProduct__c> deleteLostProductList = new list<PCLLostProduct__c>();
- for(LostBrand tempLostBrand : LostReport.LostBrands ) {
+ for(LostBrand tempLostBrand : report.LostBrands ) {
// 濡傛灉鏈夊け鍗曞搧鐗岋紝閭ｄ箞灏辫鎻掑叆鏇存柊锛�
system.debug('tempLostBrand.lostBrand.Lost_By_Company__c:'+tempLostBrand.lostBrand.Lost_By_Company__c);
if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
upsertLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
- tempLostBrand.lostBrand.Lost_cancel_report__c = LostReport.lostReport.id;
+ tempLostBrand.lostBrand.Lost_cancel_report__c = report.lostReport.id;
tempLostBrand.lostBrand.Name = tempLostBrand.lostBrand.Lost_By_Company__c;
integer tempNo = 0;
for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
@@ -492,11 +598,11 @@
}
- for(integer brandNumber =0; brandNumber< LostReport.LostBrands.size(); brandNumber++) {
+ for(integer brandNumber =0; brandNumber< report.LostBrands.size(); brandNumber++) {
- LostBrand tempLostBrand = LostReport.LostBrands.get(brandNumber);
+ LostBrand tempLostBrand = report.LostBrands.get(brandNumber);
if(tempLostBrand.lostBrand.Id == null) {
- LostReport.LostBrands.remove(brandNumber);
+ report.LostBrands.remove(brandNumber);
brandNumber--;
continue;
}
@@ -509,38 +615,38 @@
}
}
}
- lostReportId = LostReport.lostReport.id;
+ // lostReportId = report.lostReport.id;
system.debug('save---end:');
}catch (Exception ex) {
Database.rollback(sp);
- LostReport.lostReport = templostReport;
- LostReport.LostBrands = tempBrands;
// 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
- return false;
+ messageMap.put('error', ex.getMessage());
+ return messageMap;
}
- return true;
+ return messageMap;
}
// 鎻愪氦
@AuraEnabled
- public static Map<string,Object> submit(){
+ public static Map<string,Object> submit(String report1,String reportId){
+ LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
Map<string,string> messages = new Map<string,string>();
- if(!'鑽夋'.equals(LostReport.LostReport.Report_Status__c) ) {
+ if(!'鑽夋'.equals(report.lostReport.Report_Status__c) ) {
messages.put('error', '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘鎻愪氦鐢宠锛�');
return messages;
}
Map<string,Object> objs = new Map<string,Object>();
Savepoint sp = Database.setSavepoint();
try{
- LostReport.lostReport.Report_Status__c = '鎻愪氦';
- update LostReport.lostReport;
+ report.lostReport.Id = reportId;
+ report.lostReport.Report_Status__c = '鎻愪氦';
+ update report.lostReport;
Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
- psr.setObjectId(lostReportId);
+ psr.setObjectId(reportId);
Approval.ProcessResult submitResult = Approval.process(psr);
objs.put('uri', '/apex/PCLLostReportPage');
- objs.put('Id', lostReportId);
+ objs.put('Id', reportId);
objs.put('pageStatus', 'View');
objs.put('submitFlag', '1');
return objs;
@@ -550,13 +656,19 @@
return messages;
}
}
- // 娣诲姞鍝佺墝
+ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@AuraEnabled
- public static String addBrand(){
- LostReport.LostBrands.add(new LostBrand(LostReport.LostBrands.size()));
- brandCount = LostReport.LostBrands.size();
- return null;
+ public static LostBrand getNewLostBrand(Integer lineNo){
+ LostBrand lostBrand = null;
+ try {
+ //report.LostBrands.add(new LostBrand(report.LostBrands.size()));
+ lostBrand = new LostBrand(lineNo);
+ } catch (Exception e) {
+ System.debug(e.getMessage());
+ }
+ return lostBrand;
}
+
// 鍒犻櫎鍝佺墝 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄垹闄ら偅涓搧鐗�
@AuraEnabled
public static String Remove(){
@@ -593,6 +705,15 @@
tempLostBrand.ProductSize = tempLostBrand.LostProducts.size();
return null;
}
+ @AuraEnabled
+ public static PCLLostProducts getLostProduct(){
+ try {
+ PCLLostProduct__c plp = new PCLLostProduct__c();
+ return new PCLLostProducts(0,plp);
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� end
// 椤甸潰鐨勬暟鎹粨鏋�
public class LostReport {
@@ -616,13 +737,13 @@
public class LostBrand {
@AuraEnabled
- public PCLLostBrand__c lostBrand { get; set; }
+ public PCLLostBrand__c lostBrand;
@AuraEnabled
- public Integer lineNo { get; set; }
+ public Integer lineNo;
@AuraEnabled
- public list<PCLLostProducts> LostProducts { get; set; }
+ public list<PCLLostProducts> LostProducts;
@AuraEnabled
- public Integer ProductSize {get; set;}
+ public Integer ProductSize;
public LostBrand( integer lineNo ){
lostBrand = new PCLLostBrand__c();
this.lineNo = lineNo;
@@ -646,12 +767,13 @@
// add tcm 20211119 start
public class PCLLostProducts {
@AuraEnabled
- public Integer lineNo2 { get; set; }
+ public Integer lineNo2;
@AuraEnabled
- public PCLLostProduct__c LostProductss { get; set; }
+ public PCLLostProduct__c LostProductss;
@AuraEnabled
- public Boolean bool { get; set; }
-
+ public Boolean bool;
+ @AuraEnabled
+ public List<Map<String, String>> productOptions = new List<Map<String, String>>();
public PCLLostProducts() {
this.lineNo2 = 0;
this.LostProductss=new PCLLostProduct__c();
@@ -694,4 +816,19 @@
}
}
// add tcm 20211118 end
+
+ @AuraEnabled
+ public static List<Product2> searchProduct(){
+ try {
+ List<Product2> products = [
+ select
+ Id,name
+ from Product2
+ where Brand_Name__c = 'STORZ' limit 10
+ ];
+ return products;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1