diff --git a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java index 42e85d7f..20f54987 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java @@ -68,6 +68,7 @@ public class CreateCreditNoteBillOp extends AbstractOperationServicePlugIn imple debCredNote.set("yem_credittype",accFundDetail.get("yem_debcredtype"));//贷记类型 DynamicObject debCredNoteCurr = accFundDetail.getDynamicObject("yem_debcrednotecurr"); debCredNote.set("yem_currency",debCredNoteCurr);//结算币别 + debCredNote.set("yem_combo",accFundDetail.getString("yem_combo"));//出口 if(YEM.isNotEmpty(useDebCredNoteNo)){ useDebCredNoteNo = BusinessDataServiceHelper.loadSingle(useDebCredNoteNo.getPkValue(),useDebCredNoteNo.getDynamicObjectType().getName()); useRate = useDebCredNoteNo.getBigDecimal("yem_exrate"); diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java index 7154171a..2a6c39db 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java @@ -88,6 +88,8 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn { debcrednote.set("yem_source", dataEntitie.getString("billno")); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); + debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 + String products = ""; DynamicObject yem_bd_products = dataEntitie.getDynamicObject("yem_bd_products"); if (yem_bd_products != null) { diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java index 1baf792c..70f0fb4d 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java @@ -571,6 +571,7 @@ public class DebCredUtils { debcrednote.set("yem_sourcebillno", dataEntitie.getString("billno")); debcrednote.set("yem_bd_products", dataEntitie.getDynamicObject("yem_bd_products")); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); + debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); debcrednote.set("yem_groupcusfields", dataEntitie.getDynamicObject("yem_customer").getDynamicObject("yem_groupcustomers")); DynamicObject yem_currency = dataEntitie.getDynamicObject("yem_givecurrency"); @@ -675,6 +676,8 @@ public class DebCredUtils { debcrednote.set("yem_partscredit", "C"); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); + debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 + // BigDecimal yem_userate = dataEntitie.getBigDecimal("yem_exrate"); // if (yem_userate.compareTo(BigDecimal.ZERO) == 0) { if (yem_currency != null && yem_currencybase != null && yem_exratetable != null) {