violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
整机、配件合同：
1、合同、贷记单添加字段类型：普通出口、贸易出口，默认贸易出口。合同生成贷记单时，字段携带到贷记单。---1
2、手工新增贷记单时，默认普通出口，可选择贸易出口；---1
This commit is contained in:
ljw 2024-12-31 17:04:53 +08:00
parent a83e68101a
commit 2bf8b67517
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java
View File

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

2
src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java
View File

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

3
src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java
View File

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