From c513180ca50f0b03da8e19489b11820ff88eb275 Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Wed, 23 Apr 2025 17:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E8=B4=A6=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fi/fi/plugin/form/ClearBillFormPlugin.java | 18 +++++++++++-------
 .../operate/ClearDetailBillOperation.java      |  4 ++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/ClearBillFormPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/ClearBillFormPlugin.java
index 8f678a5..35a8a23 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/form/ClearBillFormPlugin.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/ClearBillFormPlugin.java
@@ -6,8 +6,8 @@ import kd.bos.bill.OperationStatus;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
+import kd.bos.form.StyleCss;
 import kd.bos.form.control.EntryGrid;
-import kd.bos.form.control.Toolbar;
 import kd.bos.form.control.events.ItemClickEvent;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
@@ -92,11 +92,6 @@ public class ClearBillFormPlugin extends AbstractBillPlugIn implements Plugin {
 
     private BillShowParameter createDetailBillParam(String detailBillid) {
         //组装打开清账明细单的界面参数
-//        HashMap<String, Object> map = new HashMap<>(2);
-//        //按钮区分标识
-//        map.put("Apikey",apiKey);
-//        //清账明细单单号
-//        map.put("billNumber",this.getModel().getValue("billno"));
         BillShowParameter showParameter = new BillShowParameter();
         //需要打开单据的标识
         showParameter.setFormId(DetailFormID);
@@ -106,7 +101,16 @@ public class ClearBillFormPlugin extends AbstractBillPlugIn implements Plugin {
         showParameter.setStatus(OperationStatus.VIEW);
         //单据ID
         showParameter.setPkId(detailBillid);
-        //pageid
+//        showParameter.setHasRight(true);
+//        showParameter.getCustomParams().put("isIgnoreLicense", true);
+        //上述两句应该可以跳过权限验证
+        //如下代码设置目标界面打开时的高度和宽度
+        StyleCss styleCss = new StyleCss();
+        styleCss.setWidth("700");
+        styleCss.setHeight("600");
+        showParameter.getOpenStyle().setInlineStyleCss(styleCss);
+
+        //设置页面ID
 //        showParameter.setPageId();
         //传到目标页面的自定义参数
         showParameter.setCustomParam("parentFromCustomParam","viewDetailFromClear");
diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearDetailBillOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearDetailBillOperation.java
index c5beedf..2c6cf6c 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearDetailBillOperation.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearDetailBillOperation.java
@@ -54,6 +54,10 @@ public class ClearDetailBillOperation extends AbstractOperationServicePlugIn imp
                     e.setCancelMessage(billno+"单据已提交，不允许重复提交");
                     e.setCancel(true);
                 }
+                if(prinfo.getDynamicObjectCollection("shjh_details").isEmpty()){
+                    e.setCancelMessage(billno+"待清账明细有数据，才允许提交");
+                    e.setCancel(true);
+                }
                 //清账明细单【未清金额】+【账扣金额】+【尾差金额】≥【本次核销金额合计】
                 if(!checkAmount(prinfo)){
                     e.setCancelMessage(billno+"【未清金额】+【账扣】+【尾差】≥【本次核销金额合计】，【本次核销金额合计】-【账扣】-【尾差】>=0，才允许提交");