From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 10 三月 2025 17:06:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java index 732ecdc..3de8476 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java @@ -55,6 +55,10 @@ @ApiModelProperty(value= "鍗曟嵁绫诲瀷") private String type; + + @ApiModelProperty(value = "erp涓诲崟鏍囪瘑") + private String erpId; + /** * 鍗曟嵁鏉ユ簮 */ @@ -171,10 +175,11 @@ public Purchase() {} - public Purchase(String code,String type,String source,Date preArr,Double anfme,Double qty,Double workQty,String channel,String erpCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + public Purchase(String code,String type,String source,String erpId ,Date preArr,Double anfme,Double qty,Double workQty,String channel,String erpCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.code = code; this.type = type; this.source = source; + this.erpId = erpId; this.preArr = preArr; this.anfme = anfme; this.qty = qty; -- Gitblit v1.9.1