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/LexSaleOrderController.cls | 135 ---------------------------------------------
1 files changed, 0 insertions(+), 135 deletions(-)
diff --git a/force-app/main/default/classes/LexSaleOrderController.cls b/force-app/main/default/classes/LexSaleOrderController.cls
index e1b3ebd..111588f 100644
--- a/force-app/main/default/classes/LexSaleOrderController.cls
+++ b/force-app/main/default/classes/LexSaleOrderController.cls
@@ -32,15 +32,7 @@
res.entity = data;
String UserName = UserInfo.getUserId();
-<<<<<<< HEAD
- user useracc = [
- SELECT Accountid, Work_Location__c
- FROM user
- WHERE id = :UserName
- ];
-=======
user useracc = [SELECT Accountid, Work_Location__c FROM user WHERE id = :UserName];
->>>>>>> LEXCommunityLiJun
accountid = useracc.Accountid;
userWorkLocation = useracc.Work_Location__c;
Account accountInfo = [SELECT Name FROM account WHERE id = :accountid];
@@ -263,15 +255,7 @@
}
Map<String, String> proHosMap = new Map<String, String>();
Map<String, String> proIdMap = new Map<String, String>();
-<<<<<<< HEAD
- List<hospitalprice__c> hpList = [
- SELECT id, hospital__c, product__c
- FROM hospitalprice__c
- WHERE account__c = :accountid
- ];
-=======
List<hospitalprice__c> hpList = [SELECT id, hospital__c, product__c FROM hospitalprice__c WHERE account__c = :accountid];
->>>>>>> LEXCommunityLiJun
if (hpList != null && hpList.size() > 0) {
for (hospitalprice__c hp : hpList) {
if (hp.product__c != null && String.valueof(hp.product__c).length() >= 15) {
@@ -293,11 +277,7 @@
errorIdMap.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
}
if (coc.OutPattern__c == true) {
-<<<<<<< HEAD
System.debug('testPattern:' + newdet2[j].Product_Pattern__c + '---' + orderdetails[i].Product_Pattern__c);
-=======
- System.debug('testPattern:'+newdet2[j].Product_Pattern__c+'---'+orderdetails[i].Product_Pattern__c);
->>>>>>> LEXCommunityLiJun
if (newdet2[j].Product_Pattern__c == orderdetails[i].Product_Pattern__c) {
//add by rentx 2021-03-22 start
if (newdet2[j].exchangeOutPattern__c == true) {
@@ -1226,7 +1206,6 @@
res.code = 200;
System.debug('res = ' + res);
return res;
-<<<<<<< HEAD
}
public static integer Getconsumableorderdetails2Nobox() {
@@ -1339,117 +1318,3 @@
}
}
}
-=======
- }
-
- public static integer Getconsumableorderdetails2Nobox() {
- if (String.isBlank(barcode)) {
- return 0;
- }
- List<String> barCodeListP = ParseBarCode(barcode);
- consumableorderdetails2Nobox = new List<Consumable_order_details2__c>();
- BarcodeCntMap.clear();
- consumableorderdetails2Nobox = [
- SELECT
- Id,
- Name,
- recordtypeid,
- Used_account__c,
- Product_Pattern__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Isoverdue__c,
- Box_Piece__c,
- ProductPacking_list_manual__c,
- Guarantee_period_for_products__c,
- hospitalSpecialOffer__c
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = FALSE
- AND Bar_Code__c != NULL
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :barCodeListP
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Box_Piece__c = '涓�'
- ORDER BY RemoveBox_No__c DESC
- ];
-
- AggregateResult[] results = [
- SELECT Bar_Code__c, count(Id) recordCount
- FROM Consumable_order_details2__c
- WHERE
- Dealer_Arrive__c = TRUE
- AND Dealer_Shipment__c = FALSE
- AND Dealer_Saled__c = FALSE
- AND Lose_Flag__c = FALSE
- AND Bar_Code__c != NULL
- AND Dealer_Info_text__c = :accountName
- AND Bar_Code__c IN :barCodeListP
- AND Arrive_Owner_Work_Location__c = :userWorkLocation
- AND Box_Piece__c = '涓�'
- GROUP BY Bar_Code__c
- ];
-
- for (AggregateResult ar : results) {
- String key = '' + ar.get('Bar_Code__c');
- BarcodeCntMap.put(key, Integer.valueOf(ar.get('recordCount')));
- }
- return consumableorderdetails2Nobox.size();
- }
-
- @TestVisible
- class ConsumableorderdetailsInfo implements Comparable {
- @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 String oldConsumableCount { get; set; }
- @AuraEnabled
- public String ErrorReason { get; set; }
- @AuraEnabled
- public Decimal outboundCount { get; set; }
-
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e, string str) {
- orderdetails1 = new Consumable_orderdetails__c();
- orderdetails2 = e;
- Prod = e.Consumable_Product__r;
- oldConsumableCount = e.name;
- ErrorReason = str;
- }
-
- public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
- orderdetails1 = new Consumable_orderdetails__c();
- orderdetails2 = e;
- Prod = e.Consumable_Product__r;
- if (e.Box_Piece__c == '鐩�') {
- outboundCount = 1;
- }
- oldConsumableCount = e.name;
- }
-
- public ConsumableorderdetailsInfo(Consumable_orderdetails__c e) {
- orderdetails1 = e;
- Prod = e.Consumable_Product__r;
- outboundCount = e.Shipment_Count__c;
- }
- // 鎺掑簭
- public Integer compareTo(Object compareTo) {
- return null;
- }
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1