From 80a3f59e2d3df07805bc67e329300b8de90a5b3a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:13:08 +0800
Subject: [PATCH] Merge branch 'LEXCommunityLiJun' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexConsumableGoodsInfo.cls | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableGoodsInfo.cls b/force-app/main/default/classes/LexConsumableGoodsInfo.cls
index ded35fe..331cfbb 100644
--- a/force-app/main/default/classes/LexConsumableGoodsInfo.cls
+++ b/force-app/main/default/classes/LexConsumableGoodsInfo.cls
@@ -323,9 +323,9 @@
orderId.add(conorder.Id);
}
System.debug('ANY o' + orderId);
+ List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
//20200916 ljh update start
//conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
- List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
if (type != null && type.equals('all')) {
conList = [
SELECT id, Bar_Code__c
@@ -798,4 +798,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1