From 68f7567880d99ef152b2fa1e1ccd69ff398c544f Mon Sep 17 00:00:00 2001
From: chenshaoxin <1981897232@qq.com>
Date: Wed, 16 Jul 2025 18:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?=
 =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/7/16=2017?=
 =?UTF-8?q?=EF=BC=9A00=20=E5=86=85=E5=AE=B9:=E6=8B=89=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/plugin/form/CasRecbillFormPlugin.java    | 16 ++++++++++++----
 .../sys/plugin/form/PaymentDealBillPlugin.java   | 15 +++++++++++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java
index ee7e11b..76891e2 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java
@@ -143,6 +143,8 @@ public class CasRecbillFormPlugin extends AbstractBillPlugIn implements BeforeF7
                     }
                     this.getModel().setValue("draftbill",null);
                     this.getModel().setValue("settletnumber",null);
+                    SaveServiceHelper.save(new DynamicObject[]{this.getView().getModel().getDataEntity(true)});
+//                    this.getView().invokeOperation("save");
                 }
             }
         }
@@ -333,6 +335,8 @@ public class CasRecbillFormPlugin extends AbstractBillPlugIn implements BeforeF7
 
     public void doDraw(ConvertOpParameter opParameter, ListSelectedRowCollection srcRows,DynamicObject cdm_drafttradebill) {
         if (srcRows != null && srcRows.size() != 0) {
+            int cas_draftinfosize=((DynamicObjectCollection)this.getModel().getDataEntity(true).get("cas_draftinfo")).size();
+            int entrysize=((DynamicObjectCollection)this.getModel().getDataEntity(true).get("entry")).size();
             String sourceEntityNumber = opParameter.getDefSourceBill();
             String ruleId = opParameter.getDefRuleId();
             DrawArgs args = new DrawArgs();
@@ -376,12 +380,16 @@ public class CasRecbillFormPlugin extends AbstractBillPlugIn implements BeforeF7
                 }
                 ((IBillModel)this.getView().getModel()).push(dynamicObject);
                 DynamicObjectCollection entry = (DynamicObjectCollection) this.getView().getModel().getValue("entry");
-                if (entry.size()>1){
-                    this.getView().getModel().deleteEntryRow("entry", 1);
+                if (entry.size()>entrysize){
+                    for (int i =entrysize ; i < entry.size(); i++) {
+                        this.getView().getModel().deleteEntryRow("entry", i);//删除生成的行
+                    }
                 }
                 DynamicObjectCollection cas_draftinfo = (DynamicObjectCollection) this.getView().getModel().getValue("cas_draftinfo");
-                if (cas_draftinfo.size()>1){
-                    this.getView().getModel().deleteEntryRow("cas_draftinfo", 0);
+                if (cas_draftinfo.size()>cas_draftinfosize){
+                    for (int i = 0; i < cas_draftinfosize; i++) {
+                        this.getView().getModel().deleteEntryRow("cas_draftinfo", i);//删除原有的行
+                    }
                 }
                 this.getView().updateView();
 
diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java
index 2763052..95fed80 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java
@@ -128,6 +128,7 @@ public class PaymentDealBillPlugin extends AbstractBillPlugIn implements Plugin,
                     }
                     this.getModel().setValue("draftbill",null);
                     this.getModel().setValue("settletnumber",null);
+                    SaveServiceHelper.save(new DynamicObject[]{this.getView().getModel().getDataEntity(true)});
                 }
             }
         }
@@ -187,6 +188,8 @@ public class PaymentDealBillPlugin extends AbstractBillPlugIn implements Plugin,
 
     public void doDraw(ConvertOpParameter opParameter, ListSelectedRowCollection srcRows,DynamicObject cdm_drafttradebill) {
         if (srcRows != null && srcRows.size() != 0) {
+            int cas_draftinfosize=((DynamicObjectCollection)this.getModel().getDataEntity(true).get("cas_draftinfo")).size();
+            int entrysize=((DynamicObjectCollection)this.getModel().getDataEntity(true).get("entry")).size();
             String sourceEntityNumber = opParameter.getDefSourceBill();
             String ruleId = opParameter.getDefRuleId();
             DrawArgs args = new DrawArgs();
@@ -230,12 +233,16 @@ public class PaymentDealBillPlugin extends AbstractBillPlugIn implements Plugin,
                 }
                 ((IBillModel)this.getView().getModel()).push(dynamicObject);
                 DynamicObjectCollection entry = (DynamicObjectCollection) this.getView().getModel().getValue("entry");
-                if (entry.size()>1){
-                    this.getView().getModel().deleteEntryRow("entry", 1);
+                if (entry.size()>entrysize){
+                    for (int i =entrysize ; i < entry.size(); i++) {
+                        this.getView().getModel().deleteEntryRow("entry", i);//删除生成的行
+                    }
                 }
                 DynamicObjectCollection cas_draftinfo = (DynamicObjectCollection) this.getView().getModel().getValue("cas_draftinfo");
-                if (cas_draftinfo.size()>1){
-                    this.getView().getModel().deleteEntryRow("cas_draftinfo", 0);
+                if (cas_draftinfo.size()>cas_draftinfosize){
+                    for (int i = 0; i < cas_draftinfosize; i++) {
+                        this.getView().getModel().deleteEntryRow("cas_draftinfo", i);//删除原有的行
+                    }
                 }
                 this.getView().updateView();