diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 8d316a266..a53a9e45f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -313,10 +313,16 @@ public class EmisWaybill extends BaseEntity /* 是否超长 */ private String blOverLong; /* 是否虚拟单.0:否,1:是 */ + @TableField + @DataAuditField(fieldComment = "是否虚拟单") private String blVirtual; /* 主单号 */ + @TableField + @DataAuditField(fieldComment = "主单号") private String masterBillCode; /* 虚拟单备注 */ + @TableField + @DataAuditField(fieldComment = "虚拟单备注") private String virtualRemark; /* 是否付款 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index d76ec9d93..600d6f79b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1130,11 +1130,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 一口价模式 emisWaybillSave.setCalcFeeType("3"); } - - if (StringUtils.isNotEmpty(emisWaybillSave.getMasterBillCode())) { - emisWaybillSave.setMasterBillCode(emisWaybillSave.getMasterBillCode()); - } - } private List getPayeeList(String userName) {