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/LexInventoryController.cls | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 116 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexInventoryController.cls b/force-app/main/default/classes/LexInventoryController.cls
index 7380b26..f309ff0 100644
--- a/force-app/main/default/classes/LexInventoryController.cls
+++ b/force-app/main/default/classes/LexInventoryController.cls
@@ -157,7 +157,15 @@
String userId = UserInfo.getUserId();
//String userId = '00510000006k82X';
//String userId = '00510000005QO75';
+<<<<<<< HEAD
+ user Useracc = [
+ SELECT Accountid, Work_Location__c, UserPro_Type__c
+ FROM user
+ WHERE id = :userId
+ ];
+=======
user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];
+>>>>>>> LEXCommunityLiJun
accountid = Useracc.Accountid;
userWorkLocation = Useracc.Work_Location__c;
agencyProType = Useracc.UserPro_Type__c;
@@ -165,7 +173,15 @@
agencyProType = 'ET';
}
sqlagencyProType = '%' + agencyProType + '%';
+<<<<<<< HEAD
+ Account accountInfo = [
+ SELECT Name, Dealer_discount__c
+ FROM account
+ WHERE id = :accountid
+ ];
+=======
Account accountInfo = [SELECT Name, Dealer_discount__c FROM account WHERE id = :accountid];
+>>>>>>> LEXCommunityLiJun
accountName = accountInfo.Name;
consumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
Map<String, Product2__c> midMap = new Map<String, Product2__c>();
@@ -1280,7 +1296,15 @@
try {
insert Po;
eSetId = Po.id;
+<<<<<<< HEAD
+ List<Consumable_order__c> Consumable_order = [
+ SELECT Name
+ FROM Consumable_order__c
+ WHERE id = :Po.id
+ ];
+=======
List<Consumable_order__c> Consumable_order = [SELECT Name FROM Consumable_order__c WHERE id = :Po.id];
+>>>>>>> LEXCommunityLiJun
List<Consumable_orderdetails__c> InsList = new List<Consumable_orderdetails__c>();
List<Consumable_order_details2__c> InsListUp = new List<Consumable_order_details2__c>();
List<Consumable_order_details2__c> updListAdjust = new List<Consumable_order_details2__c>();
@@ -1383,6 +1407,7 @@
public PageReference doClick() {
Pagereference pr = page.InventoryCSV;
return pr;
+<<<<<<< HEAD
}
//鍒嗛〉Bean
public class PaginatedAccounts {
@@ -1470,4 +1495,94 @@
return returnValue;
}
}
-}
\ No newline at end of file
+}
+=======
+ }
+ //鍒嗛〉Bean
+ public class PaginatedAccounts {
+ @AuraEnabled
+ public Integer nextPageToken;
+ @AuraEnabled
+ public Integer pageNumber { get; set; }
+ @AuraEnabled
+ public Integer totalRecords { get; set; }
+ @AuraEnabled
+ public Integer recordStart { get; set; }
+ @AuraEnabled
+ public Integer recordEnd { get; set; }
+ }
+
+ // Data Bean
+ @TestVisible
+ class ConsumableorderdetailsInfo implements Comparable {
+ @AuraEnabled
+ public Boolean check { get; set; }
+ @AuraEnabled
+ public Consumable_orderdetails__c orderdetails1 { get; set; }
+ @AuraEnabled
+ public Consumable_order_details2__c orderdetails2 { get; set; }
+ @AuraEnabled
+ public Product2__c Prod { get; set; }
+ @AuraEnabled
+ public Decimal countid { get; set; }
+ @AuraEnabled
+ public String ProdId { get; set; }
+ @AuraEnabled
+ public Decimal Pandian { get; set; }
+ @AuraEnabled
+ public Decimal Diff { get; set; }
+ @AuraEnabled
+ public Decimal refind { get; set; }
+ @AuraEnabled
+ public String DiffReason { get; set; }
+ @AuraEnabled
+ public Boolean canSelect { get; set; }
+ @AuraEnabled
+ public Boolean sortBy { get; set; }
+ @AuraEnabled
+ public Decimal limitCount { get; set; }
+ @AuraEnabled
+ public Decimal overlimitCount { get; set; }
+ @AuraEnabled
+ public String boxPiece { get; set; }
+ public ConsumableorderdetailsInfo(Consumable_order_details2__c e, string str) {
+ orderdetails2 = e;
+ Prod = e.Consumable_Product__r;
+ //e.Lose_reason__c = str;
+ DiffReason = str;
+ }
+
+ // 宸插瓨鍦ㄦ秷鑰楀搧鏄庣粏鐢�
+ public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
+ check = false;
+ orderdetails2 = e;
+ Prod = e.Consumable_Product__r;
+ canSelect = true;
+ }
+ public ConsumableorderdetailsInfo(Product2__c e) {
+ check = false;
+ //orderdetails1 = new Consumable_orderdetails__c();
+ Prod = e;
+ canSelect = true;
+ ProdId = string.valueOf(e.id);
+ countid = 0;
+ Pandian = 0;
+ refind = 0;
+ Diff = 0;
+ limitCount = 0;
+ overlimitCount = 0;
+ }
+ // 鎺掑簭
+ public Integer compareTo(Object compareTo) {
+ ConsumableorderdetailsInfo compareToesd = (ConsumableorderdetailsInfo) compareTo;
+ Integer returnValue = 0;
+ if (countid > compareToesd.countid) {
+ returnValue = -1;
+ } else if (countid < compareToesd.countid) {
+ returnValue = 1;
+ }
+ return returnValue;
+ }
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1