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/LexSaleOrderController.cls | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 154 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/LexSaleOrderController.cls b/force-app/main/default/classes/LexSaleOrderController.cls
index d967cc7..e1b3ebd 100644
--- a/force-app/main/default/classes/LexSaleOrderController.cls
+++ b/force-app/main/default/classes/LexSaleOrderController.cls
@@ -32,7 +32,15 @@
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];
@@ -201,6 +209,7 @@
//BarCodelist鍋氭垚
barCodeListP = ParseBarCode(barcode);
+ System.debug('barCodeListP:' + barCodeListP);
//閽堝鎵�鏈夊晢鍝佸埌璐х‘璁�
reSet1 = [
SELECT
@@ -235,6 +244,7 @@
AND Arrive_Owner_Work_Location__c = :userWorkLocation
ORDER BY RemoveBox_No__c DESC
];
+ System.debug('reSet1:' + reSet1);
List<Consumable_order_details2__c> newdet2 = new List<Consumable_order_details2__c>();
Set<Id> proIds = new Set<Id>();
@@ -242,6 +252,7 @@
Integer idx = 0;
for (Consumable_order_details2__c cod2 : reSet1) {
if (cod2.Bar_Code__c == barcode) {
+ System.debug('cod2.Bar_Code__c:' + cod2.Bar_Code__c);
newdet2.add(cod2);
reSet1.remove(idx);
proIds.add(cod2.Consumable_product__c);
@@ -252,7 +263,15 @@
}
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) {
@@ -274,6 +293,11 @@
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) {
@@ -678,13 +702,13 @@
if (n.find()) {
if (newdet2[j].TracingCode__c.length() == 5) {
String tr = newdet2[j].TracingCode__c;
- String Ctr = tr.substring(tr.length() - 3,tr.length());
- String Btr = tr.substring(tr.length() - 4,tr.length()-3);
- String Atr = tr.substring(tr.length() - 5,tr.length()-4);
+ String Ctr = tr.substring(tr.length() - 3, tr.length());
+ String Btr = tr.substring(tr.length() - 4, tr.length() - 3);
+ String Atr = tr.substring(tr.length() - 5, tr.length() - 4);
if (Pattern.compile('[0-9]').matcher(Atr).find() || Pattern.compile('[0-9]').matcher(Ctr).find()) {
String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j],str));
- errorIdMap.put(newdet2[j].Bar_Code__c,newdet2[j].Bar_Code__c);
+ consumableorderdetailsRecordserror.add(new ConsumableorderdetailsInfo(newdet2[j], str));
+ errorIdMap.put(newdet2[j].Bar_Code__c, newdet2[j].Bar_Code__c);
continue;
}
}
@@ -1076,11 +1100,16 @@
for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecords) {
String key = '' + ass.orderdetails2.Bar_Code__c;
Integer deliverycnt = BarcodeCntMap.get(key);
- if (ass.orderdetails2.Box_Piece__c == '涓�' &&(ass.outboundCount == null || String.valueof(ass.outboundCount) == '' || ass.outboundCount <= 0)) {
+ if (
+ ass.orderdetails2.Box_Piece__c == '涓�' &&
+ (ass.outboundCount == null ||
+ String.valueof(ass.outboundCount) == '' ||
+ ass.outboundCount <= 0)
+ ) {
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '璇疯緭鍏ヤ骇鍝� '+ ass.Prod.Name +' 鐨勫嚭璐ф暟閲�'));
// return null;
- System.debug('ass.orderdetails2.Box_Piece__c = ' + ass.orderdetails2.Box_Piece__c);
- System.debug('ass.outboundCount = ' + ass.outboundCount);
+ System.debug('ass.orderdetails2.Box_Piece__c = ' + ass.orderdetails2.Box_Piece__c);
+ System.debug('ass.outboundCount = ' + ass.outboundCount);
return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ヤ骇鍝� ' + ass.Prod.Name + ' 鐨勫嚭璐ф暟閲�', '');
}
if (ass.outboundCount > deliverycnt) {
@@ -1197,6 +1226,7 @@
res.code = 200;
System.debug('res = ' + res);
return res;
+<<<<<<< HEAD
}
public static integer Getconsumableorderdetails2Nobox() {
@@ -1265,6 +1295,7 @@
return consumableorderdetails2Nobox.size();
}
+ @TestVisible
class ConsumableorderdetailsInfo implements Comparable {
@AuraEnabled
public Consumable_orderdetails__c orderdetails1 { get; set; }
@@ -1307,4 +1338,118 @@
return null;
}
}
-}
\ No newline at end of file
+}
+=======
+ }
+
+ 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