From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/ShipmentController.cls | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/force-app/main/default/classes/ShipmentController.cls b/force-app/main/default/classes/ShipmentController.cls
index b967c75..d44d10d 100644
--- a/force-app/main/default/classes/ShipmentController.cls
+++ b/force-app/main/default/classes/ShipmentController.cls
@@ -2,88 +2,88 @@
/*****************妞滅储鐢�******************/
//public Consumable_order__c coc { get; set; }
/*****************鐢婚潰琛ㄧずBean******************/
- /*public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecords { get; set; }
- public String baseUrl {get;private set;}
- //鎺掑簭鐢�
- public String sortKey { get; set; }
- public String preSortKey { get; private set; }
- public Boolean sortOrderAsc { get; private set; }
- public String[] sortOrder { get; private set; }
- private String[] columus = new String[]{ 'Name'};
- // 宸查�夋嫨澶囧搧set鏄庣粏
- private List<Consumable_order_details__c> ConsumableorderdetailsSelected = new List<Consumable_order_details__c>();
+ // public List<ConsumableorderdetailsInfo> ConsumableorderdetailsRecords { get; set; }
+ // public String baseUrl {get;private set;}
+ // //鎺掑簭鐢�
+ // public String sortKey { get; set; }
+ // public String preSortKey { get; private set; }
+ // public Boolean sortOrderAsc { get; private set; }
+ // public String[] sortOrder { get; private set; }
+ // private String[] columus = new String[]{ 'Name'};
+ // // 宸查�夋嫨澶囧搧set鏄庣粏
+ // private List<Consumable_order_details__c> ConsumableorderdetailsSelected = new List<Consumable_order_details__c>();
- // 浜у搧 ID
- private String ESetId = '';
- */
+ // // 浜у搧 ID
+ // private String ESetId = '';
+
public ShipmentController() {
- //Apexpages.currentPage().getHeaders().put('X-UA-Compatible', 'IE=8');
- //baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
- //ESetId = ApexPages.currentPage().getParameters().get('esetId');
- //ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ // Apexpages.currentPage().getHeaders().put('X-UA-Compatible', 'IE=8');
+ // baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
+ // ESetId = ApexPages.currentPage().getParameters().get('esetId');
+ // ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
}
- /*
+
// 鐢婚潰鍒濆鍖�
- public void init() {
- String userId = UserInfo.getUserId();
- List<user> Useracc = New List<user>();
- Useracc = [select accountid from user where id =:userId];
- String accountid = Useracc[0].accountid;
+ // public void init() {
+ // String userId = UserInfo.getUserId();
+ // List<user> Useracc = New List<user>();
+ // Useracc = [select accountid from user where id =:userId];
+ // String accountid = Useracc[0].accountid;
- coc = new Consumable_order__c();
- list<Dealer_elationship__c> Dealerelationship = new list<Dealer_elationship__c>();
- Dealerelationship = [select Dealer_subordinate__c,Dealer_subordinate__r.Name
- from Dealer_elationship__c
- where Dealer_principal__c =:accountid ];
+ // coc = new Consumable_order__c();
+ // list<Dealer_elationship__c> Dealerelationship = new list<Dealer_elationship__c>();
+ // Dealerelationship = [select Dealer_subordinate__c,Dealer_subordinate__r.Name
+ // from Dealer_elationship__c
+ // where Dealer_principal__c =:accountid ];
- ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- List<Consumable_order_details__c> CountSet = new List<Consumable_order_details__c>();
- if(ESetId== NULL || ESetId==''){
+ // ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
+ // List<Consumable_order_details__c> CountSet = new List<Consumable_order_details__c>();
+ // if(ESetId== NULL || ESetId==''){
- }else{
+ // }else{
- List<Consumable_order__c> qs = New List<Consumable_order__c>();
- qs = [select id,name,Order_reason__c,
- Arrive_Order__c,
- recordtypeid,
- Order_status__c,
- Deliver_date__c,
- Order_ForHospital__c,
- Order_ForDealer__r.Name
- from Consumable_order__c
- where id =:ESetId];
- if (qs.size()>0){
- coc = qs[0];
- }
- // 閬告姙娓堛伩銇槑缁嗐倰鍙栧緱
- ConsumableorderdetailsSelected = [select Id,
- Name,
- Consumable_order__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Sterilization_limit__c,
- Consumable_Count__c,
- Deliver_date__c,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Sum_of_money__c
- from Consumable_order_details__c
- where Consumable_Shipment_order__c = :ESetId
- order by Name ];
- //杈撳嚭allnumber
+ // List<Consumable_order__c> qs = New List<Consumable_order__c>();
+ // qs = [select id,name,Order_reason__c,
+ // Arrive_Order__c,
+ // recordtypeid,
+ // Order_status__c,
+ // Deliver_date__c,
+ // Order_ForHospital__c,
+ // Order_ForDealer__r.Name
+ // from Consumable_order__c
+ // where id =:ESetId];
+ // if (qs.size()>0){
+ // coc = qs[0];
+ // }
+ // // 閬告姙娓堛伩銇槑缁嗐倰鍙栧緱
+ // ConsumableorderdetailsSelected = [select Id,
+ // Name,
+ // Consumable_order__c,
+ // Consumable_Product__c,
+ // Consumable_Product__r.Name,
+ // Sterilization_limit__c,
+ // Consumable_Count__c,
+ // Deliver_date__c,
+ // Intra_Trade_List_RMB__c,
+ // Asset_Model_No__c,
+ // Sum_of_money__c
+ // from Consumable_order_details__c
+ // where Consumable_Shipment_order__c = :ESetId
+ // order by Name ];
+ // //杈撳嚭allnumber
- for (Integer i = 0; i < ConsumableorderdetailsSelected.size(); i++) {
- ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(ConsumableorderdetailsSelected[i]));
- }
- }
- // 鏄剧ず鏁版嵁鏉℃暟淇℃伅
- //makeMessage();
- this.sortKey = '1';
- this.preSortKey = '1';
- this.sortOrderAsc = false;
- this.sortOrder = new String[1];
- this.sortOrder = new String[]{'', '鈫�'};
- }
+ // for (Integer i = 0; i < ConsumableorderdetailsSelected.size(); i++) {
+ // ConsumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(ConsumableorderdetailsSelected[i]));
+ // }
+ // }
+ // // 鏄剧ず鏁版嵁鏉℃暟淇℃伅
+ // //makeMessage();
+ // this.sortKey = '1';
+ // this.preSortKey = '1';
+ // this.sortOrderAsc = false;
+ // this.sortOrder = new String[1];
+ // this.sortOrder = new String[]{'', '鈫�'};
+ // }
//闄愬埗鎬ф帓搴�
/* public void SortLimited(){
List<ConsumableorderdetailsInfo> reSet = new List<ConsumableorderdetailsInfo>();
--
Gitblit v1.9.1