From da189a7ef82de27d8968c258da0ba50a5d0f9190 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 1 Jul 2025 17:32:15 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E8=99=9A=E6=8B=9F=E5=8D=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java | 6 ++++++ .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) 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) {