From 1b5a58ec0da1ae8eb40a66e41dcd23bb7c2b2e94 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 07 四月 2025 17:39:33 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java index b2f899c..0e1a978 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java @@ -86,7 +86,7 @@ * 鐗╂枡鏍囪瘑 */ @ApiModelProperty(value= "鐗╂枡鏍囪瘑") - private String matnrId; + private Long matnrId; /** * 鐗╂枡缂栫爜 @@ -233,7 +233,7 @@ public AsnOrderItem() {} - public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.asnId = asnId; this.asnCode = asnCode; this.poDetlId = poDetlId; -- Gitblit v1.9.1