From 515dfde32e86f8d7de7f905eb233abf13d45de9f Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Wed, 18 Jun 2025 15:19:02 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/EcInFinalsettleJusCustPlugin.java    | 32 +++++++++----------
 .../plugin/form/EquipmentCardListPlugin.java  |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcInFinalsettleJusCustPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcInFinalsettleJusCustPlugin.java
index d284a3f..fa95a14 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcInFinalsettleJusCustPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcInFinalsettleJusCustPlugin.java
@@ -61,21 +61,21 @@ public class EcInFinalsettleJusCustPlugin  extends AbstractBillPlugIn implements
     @Override
     public void propertyChanged(PropertyChangedArgs e) {
         super.propertyChanged(e);
-        String name = e.getProperty().getName();
-        if (name.equals("contract")){
-            Object objcontract = this.getModel().getValue("contract");
-            if (objcontract!=null){
-                DynamicObject contract = (DynamicObject) objcontract;
-                DynamicObject contractInfo = BusinessDataServiceHelper.loadSingle("ec_in_contract", "id,billno,billname,zcgj_renewal,zcgj_isrenewal,zcgj_enddate", new QFilter[]{new QFilter("id", QCP.equals, contract.getLong("id"))});
-                Date zcgjEnddate = contractInfo.getDate("zcgj_enddate");
-                Date nowdate = new Date();
-                int timeDays = PluginUtils.getTimeDays(zcgjEnddate, nowdate);
-                int endDays = Integer.parseInt(System.getProperty("contract.enddays"));
-//                int endDays = 100;
-                if (timeDays-endDays<=0){
-                    this.getView().showTipNotification("当前选择合同距离到期不足"+endDays+"天！");
-                }
-            }
-        }
+//        String name = e.getProperty().getName();
+//        if (name.equals("contract")){
+//            Object objcontract = this.getModel().getValue("contract");
+//            if (objcontract!=null){
+//                DynamicObject contract = (DynamicObject) objcontract;
+//                DynamicObject contractInfo = BusinessDataServiceHelper.loadSingle("ec_in_contract", "id,billno,billname,zcgj_renewal,zcgj_isrenewal,zcgj_enddate", new QFilter[]{new QFilter("id", QCP.equals, contract.getLong("id"))});
+//                Date zcgjEnddate = contractInfo.getDate("zcgj_enddate");
+//                Date nowdate = new Date();
+//                int timeDays = PluginUtils.getTimeDays(zcgjEnddate, nowdate);
+//                int endDays = Integer.parseInt(System.getProperty("contract.enddays"));
+////                int endDays = 100;
+//                if (timeDays-endDays<=0){
+//                    this.getView().showTipNotification("当前选择合同距离到期不足"+endDays+"天！");
+//                }
+//            }
+//        }
     }
 }
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
index 96a517c..e02e3ad 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
@@ -80,9 +80,9 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 String manufacturer = realcard.getString("zcgj_manufacturer");//生产厂家
                 Date prodate = realcard.getDate("zcgj_prodate");//出场日期
                 DynamicObject storeplace = realcard.getDynamicObject("storeplace");//存放地点
-                DynamicObject storeplaceinfo = BusinessDataServiceHelper.loadSingle("fa_storeplace", new QFilter[]{new QFilter("id", QCP.equals, storeplace.getLong("id"))});
                 String fulladdress = null;
-                if(storeplaceinfo!=null){
+                if(storeplace!=null){
+                    DynamicObject storeplaceinfo = BusinessDataServiceHelper.loadSingle("fa_storeplace", new QFilter[]{new QFilter("id", QCP.equals, storeplace.getLong("id"))});
                     fulladdress = storeplaceinfo.getString("fulladdress");
                 }
                 DynamicObject creator = realcard.getDynamicObject("creator");//创建人