From 5c36e862467adc64d0e2b97b9adebe8d2dbfbe31 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: Tue, 4 Nov 2025 15:45:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E6=8E=A8=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=E7=A8=8E=E7=8E=87%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/operate/im/PurOrderPushPurRefundConverPlugin.java | 4 +++- .../app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java b/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java index 4a7393d..860476a 100644 --- a/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java @@ -50,7 +50,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp "billentry.amount,billentry.curamount,billentry.taxamount,billentry.curtaxamount," + "billentry.discountamount,billentry.amountandtax,billentry.curamountandtax,billentry.returnqty," + "billentry.returnbaseqty,billentry.tqq9_yyhyflje,billentry.tqq9_yyhwflje,billentry.lotnumber," + - "billentry.tqq9_goods,billentry.tqq9_wmsdetailid,billentry.producedate,billentry.expirydate,creator,createtime,modifier,modifytime,billentry.owner", new QFilter[]{new QFilter("billentry.mainbillnumber", QCP.equals, mainbillnumber).and("billstatus", QCP.equals, "C")}); + "billentry.tqq9_goods,billentry.tqq9_wmsdetailid,billentry.producedate,billentry.expirydate,creator,createtime,modifier,modifytime,billentry.owner,billentry.taxrate", new QFilter[]{new QFilter("billentry.mainbillnumber", QCP.equals, mainbillnumber).and("billstatus", QCP.equals, "C")}); } @@ -71,6 +71,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp DynamicObject baseunit = masterid.getDynamicObject("baseunit");//计量单位 DynamicObject entryreqorg = object.getDynamicObject("entryreqorg");//需求组织 DynamicObject taxrateid = object.getDynamicObject("taxrateid");//税率 + BigDecimal taxrate = object.getBigDecimal("taxrate");//税率% String discounttype = object.getString("discounttype");//折扣方式 String mainbillentity = object.getString("mainbillentity");//核心单据实体 String mainbillid = object.getString("mainbillid");//核心单据ID @@ -129,6 +130,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp dynamicObject1.set("entryinvcorg", entryreqorg); dynamicObject1.set("entrysettleorg", entryreqorg); dynamicObject1.set("taxrateid", taxrateid); + dynamicObject1.set("taxrate", taxrate); dynamicObject1.set("discounttype", discounttype); dynamicObject1.set("entrypayorg", entryreqorg); dynamicObject1.set("mainbillentity", mainbillentity); diff --git a/lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java b/lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java index 7f91396..7b5a908 100644 --- a/lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java @@ -76,7 +76,7 @@ public class ReturnStockSyncNotifierPlugin extends AbstractOperationServicePlugI } String rule = BotpParamUtils.getBotpRuleId(PURORDER, RECEIPTNOTICE, "采购订单_收货通知单_转换规则_扩展"); - PushArgs pushArgs = BotpParamUtils.getPushArgs(PURORDER, RECEIPTNOTICE, PURORDER_ENTRY, param, entitypkMap, RULE); + PushArgs pushArgs = BotpParamUtils.getPushArgs(PURORDER, RECEIPTNOTICE, PURORDER_ENTRY, param, entitypkMap, rule); ConvertOperationResult pushResult = ConvertServiceHelper.pushAndSave(pushArgs); List billReports = pushResult.getBillReports();