From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexConsumableController.cls | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableController.cls b/force-app/main/default/classes/LexConsumableController.cls
index 853872e..6d5fee4 100644
--- a/force-app/main/default/classes/LexConsumableController.cls
+++ b/force-app/main/default/classes/LexConsumableController.cls
@@ -207,11 +207,15 @@
ESetId = esetId;
methodType = type;
if (String.isBlank(methodType) && String.isNotBlank(ESetId)) {
+<<<<<<< HEAD
List<Consumable_order__c> oclist = [
SELECT orderPattern__c
FROM Consumable_order__c
WHERE id = :ESetid
];
+=======
+ List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];
+>>>>>>> LEXCommunityLiJun
methodType = oclist.get(0).orderPattern__c;
}
statusEdit = keywordStr;
@@ -236,11 +240,15 @@
userId = UserInfo.getUserId();
List<user> Useracc = new List<user>();
//lt 20230517 瀹夊窘涓ょエ鍒� add ,OSHFLG__c
+<<<<<<< HEAD
Useracc = [
SELECT accountid, Work_Location__c, UserPro_Type__c, OSHFLG__c
FROM user
WHERE id = :userId
];
+=======
+ Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c, OSHFLG__c FROM user WHERE id = :userId];
+>>>>>>> LEXCommunityLiJun
accountid = Useracc[0].accountid;
userWorkLocation = Useracc[0].Work_Location__c;
agencyProType = Useracc[0].UserPro_Type__c;
@@ -559,11 +567,15 @@
// attachmentRecoeds.add(new ConsumableorderdetailsInfo(attachmentinfo[i]));
// }
// }
+<<<<<<< HEAD
List<ContentDocumentLink> links = [
SELECT Id, ContentDocumentId
FROM ContentDocumentLink
WHERE LinkedEntityId = :ESetId
];
+=======
+ List<ContentDocumentLink> links = [SELECT Id, ContentDocumentId FROM ContentDocumentLink WHERE LinkedEntityId = :ESetId];
+>>>>>>> LEXCommunityLiJun
if (links != null && links.size() > 0) {
List<String> documentIds = new List<String>();
for (ContentDocumentLink link : links) {
@@ -1491,11 +1503,15 @@
ESetId = eSetidStr;
try {
statusEdit = 'Redirect';
+<<<<<<< HEAD
List<Consumable_order__c> oclist = [
SELECT orderPattern__c
FROM Consumable_order__c
WHERE id = :ESetid
];
+=======
+ List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];
+>>>>>>> LEXCommunityLiJun
String url = '/lexconsumable?ESetid=' + ESetid + '&KeyWords=' + statusEdit + '&type=' + oclist.get(0).orderPattern__c;
results.result = 'Success';
results.url = url;
@@ -1515,11 +1531,15 @@
returnOrder = true;
try {
statusEdit = 'Redirect';
+<<<<<<< HEAD
List<Consumable_order__c> oclist = [
SELECT orderPattern__c
FROM Consumable_order__c
WHERE id = :ESetid
];
+=======
+ List<Consumable_order__c> oclist = [SELECT orderPattern__c FROM Consumable_order__c WHERE id = :ESetid];
+>>>>>>> LEXCommunityLiJun
String url = '/lexconsumable?ESetid=' + ESetid + '&KeyWords=' + statusEdit + '&type=' + oclist.get(0).orderPattern__c;
results.result = 'Success';
results.url = url;
@@ -1543,11 +1563,15 @@
cv.VersionData = EncodingUtil.base64Decode(base64Data);
cv.IsMajorVersion = true;
insert cv;
+<<<<<<< HEAD
Consumable_order__c c = [
SELECT Id
FROM Consumable_order__c
WHERE Id = :pId
];
+=======
+ Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id = :pId];
+>>>>>>> LEXCommunityLiJun
c.Consumable_pdf_insert_day__c = Date.today();
update c;
results.result = 'Success';
@@ -1912,11 +1936,15 @@
p.orderPattern__c = methodType;
}
insert p;
+<<<<<<< HEAD
List<Consumable_order__c> Consumable_order = [
SELECT Name, orderPattern__c
FROM Consumable_order__c
WHERE id = :p.id
];
+=======
+ List<Consumable_order__c> Consumable_order = [SELECT Name, orderPattern__c FROM Consumable_order__c WHERE id = :p.id];
+>>>>>>> LEXCommunityLiJun
for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsview) {
Roll = Roll + 1;
if (ass.check == true) {
@@ -2009,11 +2037,15 @@
p.Offers_Price__c = bargainPrice;
}
update p;
+<<<<<<< HEAD
List<Consumable_order__c> Consumable_order = [
SELECT Name, orderPattern__c
FROM Consumable_order__c
WHERE id = :p.id
];
+=======
+ List<Consumable_order__c> Consumable_order = [SELECT Name, orderPattern__c FROM Consumable_order__c WHERE id = :p.id];
+>>>>>>> LEXCommunityLiJun
List<Consumable_Orderdetails__c> qs = new List<Consumable_Orderdetails__c>();
qs = [
SELECT Id
@@ -2099,6 +2131,7 @@
public static Results deleteAtt(String contentVersionId, String cocId) {
Results results = new Results();
try {
+<<<<<<< HEAD
List<ContentVersion> cvInfo = [
SELECT Id
FROM ContentVersion
@@ -2122,6 +2155,15 @@
FROM Consumable_order__c
WHERE Id = :cocId
];
+=======
+ List<ContentVersion> cvInfo = [SELECT Id FROM ContentVersion WHERE FirstPublishLocationId = :cocId];
+ ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
+ String contentDocumentId = conVersion.ContentDocumentId;
+ ContentDocument conDocument = [SELECT Id FROM ContentDocument WHERE Id = :contentDocumentId];
+ delete conDocument;
+ if (cvInfo.size() <= 1) {
+ Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id = :cocId];
+>>>>>>> LEXCommunityLiJun
c.Consumable_pdf_insert_day__c = null;
update c;
}
@@ -2360,4 +2402,8 @@
@AuraEnabled
public String value;
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1