aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 虚拟单相关字段加修改监控' (#83) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/83
This commit is contained in:
heyu 2025-07-01 17:33:52 +08:00
commit b5f484e1bc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -313,10 +313,16 @@ public class EmisWaybill extends BaseEntity
/* 是否超长 */ /* 是否超长 */
private String blOverLong; private String blOverLong;
/* 是否虚拟单.0:否,1:是 */ /* 是否虚拟单.0:否,1:是 */
@TableField
@DataAuditField(fieldComment = "是否虚拟单")
private String blVirtual; private String blVirtual;
/* 主单号 */ /* 主单号 */
@TableField
@DataAuditField(fieldComment = "主单号")
private String masterBillCode; private String masterBillCode;
/* 虚拟单备注 */ /* 虚拟单备注 */
@TableField
@DataAuditField(fieldComment = "虚拟单备注")
private String virtualRemark; private String virtualRemark;
/* 是否付款 */ /* 是否付款 */

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1130,11 +1130,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 一口价模式 // 一口价模式
emisWaybillSave.setCalcFeeType("3"); emisWaybillSave.setCalcFeeType("3");
} }
if (StringUtils.isNotEmpty(emisWaybillSave.getMasterBillCode())) {
emisWaybillSave.setMasterBillCode(emisWaybillSave.getMasterBillCode());
}
} }
private List<SysUser> getPayeeList(String userName) { private List<SysUser> getPayeeList(String userName) {