From a0d2825ca806825fb76fbaf7da18ff80c0680eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E8=B1=86=E8=B1=86?= <13356128+sunandmoon60@user.noreply.gitee.com> Date: Thu, 18 Dec 2025 18:05:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=88=E8=AE=A2=E5=8D=95=E6=98=AF=E5=90=A6=E9=80=80?= =?UTF-8?q?=E8=B4=A7=EF=BC=89=202.=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E7=A8=8E=E5=90=88=E8=AE=A1=E9=80=BB=E8=BE=91=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/pm/PuroderBillShareRefundPlugin.java | 56 +++++++++++++------ .../im/PurOrderPushPurRefundConverPlugin.java | 6 +- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/lc123/cloud/app/plugin/form/pm/PuroderBillShareRefundPlugin.java b/lc123/cloud/app/plugin/form/pm/PuroderBillShareRefundPlugin.java index 06aed86..e509b30 100644 --- a/lc123/cloud/app/plugin/form/pm/PuroderBillShareRefundPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PuroderBillShareRefundPlugin.java @@ -61,8 +61,12 @@ public class PuroderBillShareRefundPlugin extends AbstractBillPlugIn { public void registerListener(EventObject e) { super.registerListener(e); this.addItemClickListeners("tbmainentry"); + this.addItemClickListeners("tqq9_advcontoolbarap2"); + this.addItemClickListeners("tbmain"); } + + @Override public void afterDeleteRow(AfterDeleteRowEventArgs e) { super.afterDeleteRow(e); @@ -167,7 +171,6 @@ public class PuroderBillShareRefundPlugin extends AbstractBillPlugIn { this.getModel().setValue("tqq9_disamount", tqq9_disamount, seq);//明细优惠金额 remainRefundAmt = remainRefundAmt.subtract(tqq9_disamount); } - } } } @@ -439,20 +442,20 @@ public class PuroderBillShareRefundPlugin extends AbstractBillPlugIn { this.getView().showErrorNotification("物料明细分录行" + seq + "含税单价超过最高采购限价，请修改"); } } - if(StringUtils.equals("tqq9_amount",name)||StringUtils.equals("tqq9_disamount",name)){ - DynamicObjectCollection billentries = dataEntity.getDynamicObjectCollection("billentry"); - for (int i = 0; i < billentries.size(); i++) { - DynamicObject billentry = billentries.get(i); - BigDecimal tqq9_amount = billentry.getBigDecimal("tqq9_amount");//折扣前价税合计 - BigDecimal tqq9_disamount = billentry.getBigDecimal("tqq9_disamount");//优惠(折扣)金额 - BigDecimal tqq9_xfamount = billentry.getBigDecimal("tqq9_xfamount");//现返使用金额 - BigDecimal tqq9_hfamount = billentry.getBigDecimal("tqq9_hfamount");//优惠(折扣)金额 - BigDecimal amountandtax = tqq9_amount.subtract(tqq9_disamount).subtract(tqq9_xfamount).subtract(tqq9_hfamount);//折扣后价税合计 - getModel().setValue("amountandtax", amountandtax,i); - } - getView().updateView(); - - } +// if(StringUtils.equals("tqq9_amount",name)||StringUtils.equals("tqq9_disamount",name)){ +// DynamicObjectCollection billentries = dataEntity.getDynamicObjectCollection("billentry"); +// for (int i = 0; i < billentries.size(); i++) { +// DynamicObject billentry = billentries.get(i); +// BigDecimal tqq9_amount = billentry.getBigDecimal("tqq9_amount");//折扣前价税合计 +// BigDecimal tqq9_disamount = billentry.getBigDecimal("tqq9_disamount");//优惠(折扣)金额 +// BigDecimal tqq9_xfamount = billentry.getBigDecimal("tqq9_xfamount");//现返使用金额 +// BigDecimal tqq9_hfamount = billentry.getBigDecimal("tqq9_hfamount");//优惠(折扣)金额 +// BigDecimal amountandtax = tqq9_amount.subtract(tqq9_disamount).subtract(tqq9_xfamount).subtract(tqq9_hfamount);//折扣后价税合计 +// getModel().setValue("amountandtax", amountandtax,i); +// } +// getView().updateView(); +// +// } if (StringUtils.equals("supplier", name)) { LCLogService lcLogService = new LCLogServiceImpl(); HashMap tokenMap = new HashMap(); @@ -562,6 +565,28 @@ public class PuroderBillShareRefundPlugin extends AbstractBillPlugIn { evt.setCancel(true); this.getView().showErrorNotification("所选物料明细没有入库记录"); } + }else if(StringUtils.equals("tqq9_confirmreturn",itemKey)){ + Boolean falg=false; + DynamicObjectCollection tqq9_entryentity = this.getModel().getDataEntity(true).getDynamicObjectCollection("tqq9_entryentity"); + for (DynamicObject dynamicObject : tqq9_entryentity) { + falg=dynamicObject.getBoolean("dynamicObject"); + } + if(falg){ + this.getView().setVisible(true,"tqq9_combofield"); + this.getView().setVisible(true,"tqq9_textfield3"); + }else{ + this.getView().showErrorNotification("请至少勾选一行退货信息"); + } + }else if(StringUtils.equals("bar_push",itemKey)){ + Object tqq9_combofield = getModel().getValue("tqq9_combofield"); + Object tqq9_textfield3 = getModel().getValue("tqq9_textfield3"); + if(tqq9_combofield==null||tqq9_textfield3==null){ + this.getView().showErrorNotification("请填写退货信息"); + }else{ + DynamicObject dataEntity = this.getModel().getDataEntity(true); + SaveServiceHelper.save(new DynamicObject[]{dataEntity}); + } + } } @@ -609,7 +634,6 @@ public class PuroderBillShareRefundPlugin extends AbstractBillPlugIn { String id = dynamicObject.getString("id"); ids.add(id); } - } if (im_purinblil != null) { HashMap> map = new HashMap<>(); diff --git a/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java b/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java index d593adf..888a7e6 100644 --- a/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java @@ -68,8 +68,10 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp for (DynamicObject dynamicObject : tqq9_entryentity) { String tqq9_entryid = dynamicObject.getString("tqq9_entryid"); BigDecimal tqq9_pckyamount = dynamicObject.getBigDecimal("tqq9_pckyamount"); - pckyMap.put(tqq9_entryid, tqq9_pckyamount); - + Boolean tqq9_checkboxfield = dynamicObject.getBoolean("tqq9_checkboxfield");//是否退货 + if(tqq9_checkboxfield){ + pckyMap.put(tqq9_entryid, tqq9_pckyamount); + } } if (im_purinblil != null) { HashMap> map = new HashMap<>();