From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexOverdueStockController.cls | 107 -----------------------------------------------------
1 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/force-app/main/default/classes/LexOverdueStockController.cls b/force-app/main/default/classes/LexOverdueStockController.cls
index 99b968d..f795ba1 100644
--- a/force-app/main/default/classes/LexOverdueStockController.cls
+++ b/force-app/main/default/classes/LexOverdueStockController.cls
@@ -40,30 +40,14 @@
codPageRecords = new List<orderBean>();
overduePageRecords = new List<orderBean>();
// 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
-<<<<<<< HEAD
- user Useracc = [
- SELECT Accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :UserInfo.getUserId()
- ];
-=======
user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
->>>>>>> LEXCommunityLiJun
userWorkLocation = Useracc.Work_Location__c;
agencyProType = Useracc.UserPro_Type__c;
if (String.isBlank(Useracc.UserPro_Type__c)) {
agencyProType = 'ET';
}
sqlagencyProType = '%' + agencyProType + '%';
-<<<<<<< HEAD
- accountInfo = [
- SELECT id, Name, Dealer_discount__c
- FROM account
- WHERE id = :Useracc.accountid
- ];
-=======
accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
->>>>>>> LEXCommunityLiJun
// 杩囨湡搴撳瓨姹囨�讳俊鎭�
List<AggregateResult> orderDetZaiku = [
SELECT count(Id) countsum, Consumable_Product__c prodid, Consumable_Product__r.Name_Text__c prodname, Box_Piece__c boxPiece
@@ -119,21 +103,8 @@
userWorkLocation = userWorkLocationLWC;
// add by Wang Xueqin 2023/04/12
// 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
-<<<<<<< HEAD
- user Useracc = [
- SELECT Accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :UserInfo.getUserId()
- ];
- accountInfo = [
- SELECT id, Name, Dealer_discount__c
- FROM account
- WHERE id = :Useracc.accountid
- ];
-=======
user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
->>>>>>> LEXCommunityLiJun
iSinventory = true;
Set<String> barCodeoverdue = new Set<String>();
@@ -283,21 +254,8 @@
// List<Consumable_order_details2__c> overdueList = (List<Consumable_order_details2__c>)JSON.deserialize(saveoverdueList,List<Consumable_order_details2__c>.class);
// add by Wang Xueqin 2023/04/12
// 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
-<<<<<<< HEAD
- user Useracc = [
- SELECT Accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :UserInfo.getUserId()
- ];
- accountInfo = [
- SELECT id, Name, Dealer_discount__c
- FROM account
- WHERE id = :Useracc.accountid
- ];
-=======
user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
->>>>>>> LEXCommunityLiJun
// 璺宠繃鏄庣粏2涓嶅繀瑕佹洿鏂�
StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
@@ -330,15 +288,7 @@
po.RecordTypeid = System.Label.RT_ConOrder_Overdue;
try {
insert po;
-<<<<<<< HEAD
- Consumable_order__c order = [
- SELECT Name
- FROM Consumable_order__c
- WHERE id = :po.id
- ];
-=======
Consumable_order__c order = [SELECT Name FROM Consumable_order__c WHERE id = :po.id];
->>>>>>> LEXCommunityLiJun
List<Consumable_orderdetails__c> InsList = new List<Consumable_orderdetails__c>();
for (orderBean header : codPageRecords) {
if (header.check == true) {
@@ -401,7 +351,6 @@
Buff.add(A + barcodeCountMap.get(A));
}
return Buff;
-<<<<<<< HEAD
}
// Data Bean
@@ -456,59 +405,3 @@
}
}
}
-=======
- }
-
- // Data Bean
- @TestVisible
- class orderBean implements Comparable {
- @AuraEnabled
- public Consumable_order_details2__c orderdetails2 { get; set; }
- @AuraEnabled
- public Product2__c Prod { get; set; }
- @AuraEnabled
- public Boolean check { get; set; }
-
- // 杩囨湡搴撳瓨
- @AuraEnabled
- public Integer overlimitCount { get; set; }
- // 閿�瀛樻暟閲�
- @AuraEnabled
- public Integer pandian { get; set; }
- // 閿�瀛樺師鍥�
- @AuraEnabled
- public String diffReason { get; set; }
- // 鍗曚綅
- @AuraEnabled
- public String boxPiece { get; set; }
- @AuraEnabled
- public String prodname { get; set; }
- @AuraEnabled
- public String prodid { get; set; }
- orderBean(Consumable_order_details2__c e, string str) {
- orderdetails2 = e;
- Prod = e.Consumable_Product__r;
- DiffReason = str;
- }
- public orderBean(AggregateResult e) {
- check = false;
- overlimitCount = Integer.valueOf(e.get('countsum'));
- prodname = String.valueOf(e.get('prodname'));
- prodid = String.valueOf(e.get('prodid'));
- boxPiece = String.valueOf(e.get('BoxPiece'));
- pandian = 0;
- }
- // 鎺掑簭
- public Integer compareTo(Object compareTo) {
- orderBean compareToesd = (orderBean) compareTo;
- Integer returnValue = 0;
- if (overlimitCount > compareToesd.overlimitCount) {
- returnValue = -1;
- } else if (overlimitCount < compareToesd.overlimitCount) {
- returnValue = 1;
- }
- return returnValue;
- }
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1