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/LexInventoryListController.cls | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexInventoryListController.cls b/force-app/main/default/classes/LexInventoryListController.cls
index a924740..87742b1 100644
--- a/force-app/main/default/classes/LexInventoryListController.cls
+++ b/force-app/main/default/classes/LexInventoryListController.cls
@@ -1,7 +1,11 @@
public without sharing class LexInventoryListController {
/*****************妞滅储鐢�******************/
public static Consumable_order__c coc { get; set; }
+<<<<<<< HEAD
+ public static String baseUrl { get; private set; }
+=======
public static String baseUrl {get;private set;}
+>>>>>>> LEXCommunityLiJun
/*****************鐢婚潰琛ㄧずBean******************/
public static List<ConsumableorderdetailsInfo> consumableorderdetailsRecords { get; set; }
public static List<ConsumableorderdetailsInfo> consumableorderdetailsRecordsError { get; set; }
@@ -22,7 +26,11 @@
// 鐢婚潰鍒濆鍖�
@AuraEnabled
public static ResponseBodyLWC init(String eSetId) {
+<<<<<<< HEAD
+ system.debug('eSetId====>' + eSetId);
+=======
system.debug('eSetId====>'+eSetId);
+>>>>>>> LEXCommunityLiJun
ESetId = eSetId;
ResponseBodyLWC res = new ResponseBodyLWC();
Map<String, object> data = new Map<String, object>();
@@ -31,14 +39,46 @@
coc = new Consumable_order__c();
consumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+<<<<<<< HEAD
+ List<Consumable_order__c> qs = new List<Consumable_order__c>();
+ qs = [
+ SELECT Name, Inventory_date__c, Order_date__c
+ FROM Consumable_order__c
+ WHERE Id = :ESetId
+ ];
+ System.debug('qs===>' + qs);
+ if (qs.size() > 0) {
+=======
List<Consumable_order__c> qs = New List<Consumable_order__c>();
qs = [select Name,Inventory_date__c,Order_date__c From Consumable_order__c Where Id =:ESetId];
System.debug('qs===>'+qs);
if (qs.size()>0){
+>>>>>>> LEXCommunityLiJun
coc = qs[0];
}
// 閬告姙娓堛伩銇槑缁嗐倰鍙栧緱
consumableorderdetailsSelected = [
+<<<<<<< HEAD
+ SELECT
+ Id,
+ Name,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Sterilization_limit__c,
+ Deliver_date__c,
+ Consumable_Product__r.Name__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Bar_Code__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Lose_Flag__c,
+ recordtypeid,
+ Lose_reason__c
+ FROM Consumable_order_details2__c
+ WHERE Consumable_Inventory_order__c = :ESetId
+ ORDER BY Name
+ ];
+ System.debug('consumableorderdetailsSelected==>' + consumableorderdetailsSelected);
+=======
select Id, Name, Consumable_Product__c,
Consumable_Product__r.Name, Sterilization_limit__c,
Deliver_date__c,Consumable_Product__r.Name__c,
@@ -49,11 +89,46 @@
where Consumable_Inventory_order__c = :ESetId
order by Name ];
System.debug('consumableorderdetailsSelected==>'+consumableorderdetailsSelected);
+>>>>>>> LEXCommunityLiJun
for (Integer i = 0; i < consumableorderdetailsSelected.size(); i++) {
consumableorderdetailsRecordsError.add(new ConsumableorderdetailsInfo(consumableorderdetailsSelected[i]));
}
consumableorderdetails1 = [
+<<<<<<< HEAD
+ SELECT
+ Id,
+ Name,
+ Diff__c,
+ inventory_sum__c,
+ Count_Sum__c,
+ Consumable_order__c,
+ Consumable_Product__c,
+ Consumable_Product__r.Name,
+ Consumable_Count__c,
+ Consumable_Product__r.Intra_Trade_List_RMB__c,
+ Consumable_Product__r.Asset_Model_No__c,
+ Consumable_Product__r.Name__c,
+ Sum_of_money__c,
+ recordtypeid,
+ Lose_reason__c,
+ Product_Refind__c
+ FROM Consumable_orderdetails__c
+ WHERE Consumable_order__c = :ESetId
+ ORDER BY Name
+ ];
+ for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
+ consumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(consumableorderdetails1[i]));
+ }
+ data.put('qs', qs);
+ System.debug('consumableorderdetailsRecords====>' + consumableorderdetailsRecords);
+ data.put('consumableorderdetailsRecords', JSON.serialize(consumableorderdetailsRecords));
+ data.put('ConsumableorderdetailsRecordsError', JSON.serialize(ConsumableorderdetailsRecordsError));
+ // if(ConsumableorderdetailsRecordsError.size()!=null){
+ // data.put('ConsumableorderdetailsRecordsError',JSON.serialize(ConsumableorderdetailsRecordsError));
+ // }
+ System.debug('ConsumableorderdetailsRecordsError====>' + ConsumableorderdetailsRecordsError);
+=======
select Id, Name,Diff__c,inventory_sum__c,
Count_Sum__c,Consumable_order__c,
Consumable_Product__c,Consumable_Product__r.Name,Consumable_Count__c,
@@ -74,6 +149,7 @@
// data.put('ConsumableorderdetailsRecordsError',JSON.serialize(ConsumableorderdetailsRecordsError));
// }
System.debug('ConsumableorderdetailsRecordsError====>'+ConsumableorderdetailsRecordsError);
+>>>>>>> LEXCommunityLiJun
res.status = 'Success';
res.code = 200;
System.debug('res = ' + res);
@@ -101,4 +177,8 @@
return null;
}
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1