From 4b809d4aecd3043963b14e29803245c70d9bb003 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期五, 25 十一月 2022 11:02:51 +0800
Subject: [PATCH] 【委托】新建修理提示信息（停产及非修理对象品）
---
force-app/main/default/classes/ChoiceAssetController.cls | 4 ++--
force-app/main/default/pages/ChoiceAsset.page | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/ChoiceAssetController.cls b/force-app/main/default/classes/ChoiceAssetController.cls
index 872e355..7e2b630 100644
--- a/force-app/main/default/classes/ChoiceAssetController.cls
+++ b/force-app/main/default/classes/ChoiceAssetController.cls
@@ -85,7 +85,7 @@
,Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c
,Account.Parent.FSE_SP_Main_Leader__r.Work_Location__c
//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
- ,PartSupplyFinishDate__c
+ ,NoPartRiskDate_F__c
//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
FROM Asset where Id != null AND Repairing_Count__c >= 0 AND SerialNumber like :serialNumber LIMIT 100
@@ -407,7 +407,7 @@
soql += 'Hospital__r.Owner.Name,Hospital__r.Owner.Phone,Installation_Site__c,CurrentContract__c,Product2.Asset_Model_No__c,Hospital__r.Name,Department_Class__r.Name ,Department_Class__r.Id,';
soql += 'Account.Parent.Parent.FSE_SP_Main_Leader__r.Work_Location__c,Account.RecordTypeId';
soql += ',Posting_Date__c,Extend_Gurantee_DateTo__c,CurrentContract_End_Date__c ';// 20220927 ljh XLIU-CJN62G
- soql += ',PartSupplyFinishDate__c ';//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012
+ soql += ',NoPartRiskDate_F__c ';//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012
soql += ' from Asset where Id != null AND Repairing_Count__c = 0 ';
if (String.isNotBlank(FuselageNumber) || String.isNotBlank(AssetModel) || String.isNotBlank(HospitalName)) {
soql += ' AND (';
diff --git a/force-app/main/default/pages/ChoiceAsset.page b/force-app/main/default/pages/ChoiceAsset.page
index 1df3939..9a746d1 100644
--- a/force-app/main/default/pages/ChoiceAsset.page
+++ b/force-app/main/default/pages/ChoiceAsset.page
@@ -16,6 +16,7 @@
//XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
function checkPartSupplyFinishDateJs(){
var today = new Date();
+ var targetDate = (today.getFullYear()+1) + '/' + (today.getMonth()+1) + '/' + today.getDate();
var todayNew = today.toLocaleDateString();
var check;
var num = 100000;
@@ -29,7 +30,7 @@
var partSupplyFinishDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsTable:' + num + ':partSupplyFinishDate')).value());
if (partSupplyFinishDate != 'Invalid Date'){
var partSupplyFinishDateNew = partSupplyFinishDate.toLocaleDateString();
- if (partSupplyFinishDateNew > todayNew){
+ if (partSupplyFinishDateNew > todayNew && partSupplyFinishDateNew <= targetDate){
alert('棰勮'+ partSupplyFinishDateNew +'闆朵欢鍗冲皢鍋滀骇锛岃閫佷慨鍓嶄笌宸ュ巶鍙奟C鑱旂粶');
}
if (partSupplyFinishDateNew <= todayNew){
@@ -187,7 +188,7 @@
</td>
<!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start -->
<td>
- <apex:inputField value="{!records.ast.PartSupplyFinishDate__c}" id="partSupplyFinishDate" style="display: none" showDatePicker="false"/>
+ <apex:inputField value="{!records.ast.NoPartRiskDate_F__c}" id="partSupplyFinishDate" style="display: none" showDatePicker="false"/>
</td>
<!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end -->
--
Gitblit v1.9.1