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/OrdergoodsController.cls | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/OrdergoodsController.cls b/force-app/main/default/classes/OrdergoodsController.cls
index b305278..d9a77fd 100644
--- a/force-app/main/default/classes/OrdergoodsController.cls
+++ b/force-app/main/default/classes/OrdergoodsController.cls
@@ -10,8 +10,10 @@
public Boolean errormessageFlg = false;
private List <Sample_order_list_detail__c> orderListDelList;
public String QueryTemp { get; set;}
+ public String provinceName{get; set;}
+ public String cityName{get; set;}
// add fxk
- // public OrdergoodsController() {
+ // public OrdergoodsController() {cityops
// accId = ApexPages.currentPage().getParameters().get('accId');
// orderListId = ApexPages.currentPage().getParameters().get('Id');
// }
@@ -19,12 +21,40 @@
accId = ApexPages.currentPage().getParameters().get('accId');
orderListId = ApexPages.currentPage().getParameters().get('Id');
}
+
+ //鐪�
+ public List<SelectOption> getprovinceop(){
+ List<SelectOption> provincesops = new List<SelectOption>();
+ List<Address_Level__c> provinces=[select name,id from Address_Level__c];
+ provincesops.add(new SelectOption('','----'));
+ for(Address_Level__c province:provinces){
+ provincesops.add(new SelectOption(province.Name,province.Name));
+ }
+ return provincesops;
+ }
+
+ //甯�
+ public List<SelectOption> getCityop(){
+ List<Address_Level__c> provinces=[select name,id from Address_Level__c where name=: provinceName];
+ List<SelectOption> cityops = new List<SelectOption>();
+ cityops.add(new SelectOption('','----'));
+ if(provinces.size()>0){
+ id TheId=provinces[0].id;
+ List<Address_Level2__c> citys=[select name,id from Address_Level2__c where Address_Level__c=:TheId];
+ for(Address_Level2__c city:citys){
+ cityops.add(new SelectOption(city.Name,city.Name));
+ }
+ }
+ return cityops;
+ }
+
// add fxk 鍒濆鍖栨樉绀�
public void init() {
errormessageFlg = false;
//displayFlg = true;
sampleOrder = new Sample_order_list__c();
productInfoList = new List < ProductInfo > ();
+ AccName = new Account();
// 椤甸潰鑾峰彇瀹㈡埛鍚嶇О
if (String.isNotBlank(accId)) {
AccName = [select Id, Name, Address__c, Phone from Account where id = : accId];
@@ -32,11 +62,13 @@
//缂栬緫椤甸潰
if (String.isNotBlank(orderListId)) {
List<Sample_order_list__c> orderLists = [select Id, DeliveryAddress__c, Status__c, ReceivePart__c, DeliveryPhone__c,
- DeliveryContact__c, AgentCode__c, Send_Date__c, Account__c, Account__r.Name
+ DeliveryContact__c, AgentCode__c, Send_Date__c, Account__c, Account__r.Name, province__c, city__c
from Sample_order_list__c where Id = : orderListId];
if (orderLists.size() > 0) {
// 椤甸潰鏄剧ず璁㈣揣鍗曚俊鎭�
sampleOrder = orderLists.get(0);
+ provinceName = sampleOrder.province__c;
+ cityName = sampleOrder.city__c;
AccName = [select Id, Name, Address__c, Phone from Account where id = : sampleOrder.Account__c];
orderListDelList = [select Id, Name, Pro_Name__c, Term_Date__c, Pro_model__c, Product__c, Standards__c, ItemQuantity__c, Sample_Classification__c,
Total__c, TermDate__c, Product__r.Asset_Model_No__c, Product__r.Name, Product__r.SFDA_Expiration_Date__c, Product__r.Sample_Classification__c,
@@ -124,6 +156,19 @@
errormessageFlg = true;
return null;
}
+ sampleOrder.province__c=provinceName;
+ if(!String.isNotBlank(provinceName)){
+ sampleOrder.province__c.addError('鐪佷笉鑳戒负绌�!');
+ errormessageFlg = true;
+ return null;
+ }
+ sampleOrder.city__c=cityName;
+ if(!String.isNotBlank(cityName)){
+ sampleOrder.city__c.addError('甯備笉鑳戒负绌�!');
+ errormessageFlg = true;
+ return null;
+ }
+
Map<Id, Sample_order_list_detail__c> orderListDelMap = new Map<Id, Sample_order_list_detail__c>();
if (String.isNotBlank(orderListId) && orderListDelList.size() > 0) {
for(Sample_order_list_detail__c orderListDel : orderListDelList){
--
Gitblit v1.9.1