From 50b39c4b52bf5fd61ec46ada365c51e05a16d2ae Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 04 五月 2023 09:11:54 +0800
Subject: [PATCH] Backup0504
---
force-app/main/default/classes/LexConsumableController.cls | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableController.cls b/force-app/main/default/classes/LexConsumableController.cls
index c605ae9..7758fd7 100644
--- a/force-app/main/default/classes/LexConsumableController.cls
+++ b/force-app/main/default/classes/LexConsumableController.cls
@@ -516,12 +516,20 @@
}
}
//闄勪欢
- attachmentinfo = [SELECT Id, Name, OwnerId, Owner.Name FROM Attachment WHERE parentid = :ESetId];
- if (attachmentinfo.size() > 0) {
- for (Integer i = 0; i < attachmentinfo.size(); i++) {
- attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
+ // attachmentinfo = [SELECT Id, Name, OwnerId, Owner.Name FROM Attachment WHERE parentid = :ESetId];
+ // if (attachmentinfo.size() > 0) {
+ // for (Integer i = 0; i < attachmentinfo.size(); i++) {
+ // attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
+ // }
+ // }
+
+ List<ContentVersion> cvInfo = [SELECT Id, Title, OwnerId,Owner.Name, CreatedDate FROM ContentVersion WHERE FirstPublishLocationId = :ESetId];
+ if (cvInfo.size() > 0) {
+ for (Integer i = 0; i < cvInfo.size(); i++) {
+ attachmentRecoeds.add(new ConsumableorderdetailsInfo(cvInfo[i]));
}
}
+ //
consumableorderdetailsRecords.sort();
getPageInfo();
}
@@ -1749,12 +1757,13 @@
Results results = new Results();
try {
base64Data = EncodingUtil.urlDecode(base64Data, 'UTF-8');
- Blob contentBlob = EncodingUtil.base64Decode(base64Data);
- Attachment att = new Attachment();
- att.ParentId = pId;
- att.Name = fileName;
- att.Body = contentBlob;
- insert att;
+ ContentVersion cv = new ContentVersion();
+ cv.Title = fileName;
+ cv.PathOnClient = '/' + fileName;
+ cv.FirstPublishLocationId = pId;
+ cv.VersionData = EncodingUtil.base64Decode(base64Data);
+ cv.IsMajorVersion = true;
+ insert cv;
results.result = 'Success';
} catch (Exception e) {
results.result = 'Fail';
@@ -1866,7 +1875,7 @@
String hospitalIdStr
) {
ESetId = '';
- return save(contractNameStr,cocStr,agencyProTypeStr,accountidStr,consumableorderdetailsRecordsviewStr,contactDealerStr,methodType,ESetId,hospitalIdStr);
+ return save(contractNameStr,cocStr,agencyProTypeStr,accountidStr,consumableorderdetailsRecordsviewStr,contactDealerStr,methodTypeStr,ESetId,hospitalIdStr);
}
//淇濆瓨鎸夐挳
@@ -2257,7 +2266,8 @@
if(con.Prod != null){
con.recordId = con.Prod.Id;
if(!con.oldCheck){
- con.prodName = con.Prod.Name;
+ con.prodName = con.Prod.Name__c;
+ // System.debug('ProdName:'+con.Prod.Id+'---'+con.Prod.Name__c);
}
con.prodSFDAStatus = con.Prod.SFDA_Status__c;
con.prodCategory3 = con.Prod.Category3__c;
@@ -2266,9 +2276,9 @@
con.prodIntraTradeList = con.Prod.Intra_Trade_List_RMB__c;
}
if(con.esd != null){
- if(con.oldCheck){
- con.prodName = con.esd.Consumable_Product__r.Name__c;
- }
+ // if(con.oldCheck){
+ // con.prodName = con.esd.Consumable_Product__r.Name__c;
+ // }
con.consumableCount = con.esd.Consumable_count__c;
}
}
@@ -2298,7 +2308,7 @@
@AuraEnabled
public Boolean canSelect { get; set; }
@AuraEnabled
- public Attachment Concc { get; set; }
+ public ContentVersion Concc { get; set; }
@AuraEnabled
public Boolean sortBy { get; set; }
@AuraEnabled
@@ -2352,7 +2362,7 @@
allnumber_piece = 0;
}
//闄勪欢
- public ConsumableorderdetailsInfo(Attachment e) {
+ public ConsumableorderdetailsInfo(ContentVersion e) {
Concc = e;
}
// 鎺掑簭Consumable_order__c
--
Gitblit v1.9.1