gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
tanfengling@x-ri.com 2025-11-04 16:17:11 +08:00
parent 3d8b26f74e 5c36e86246
commit 96a16bfa28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java
View File

@ -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);

2
lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java
View File

@ -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<SourceBillReport> billReports = pushResult.getBillReports();