From beb003f8e8cd5ae31a0ac55d0624ed2b2ad862bb Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 14 八月 2025 11:21:49 +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/AsnOrderItemLog.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
index e092c80..c2bc085 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
@@ -83,7 +83,7 @@
      * 鐗╂枡鏍囪瘑
      */
     @ApiModelProperty(value= "鐗╂枡鏍囪瘑")
-    private String matnrId;
+    private Long matnrId;
 
     /**
      * 鐗╂枡鍔╄鐮�
@@ -230,7 +230,7 @@
 
     public AsnOrderItemLog() {}
 
-    public AsnOrderItemLog(Long asnId,String asnCode,String platItemId,Long poDetlId,String poCode,String fieldsIndex,String matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrBatch,String splrName,String qrcode,String trackCode,String barcode,String packName,Short ntyStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public AsnOrderItemLog(Long asnId,String asnCode,String platItemId,Long poDetlId,String poCode,String fieldsIndex,Long matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrBatch,String splrName,String qrcode,String trackCode,String barcode,String packName,Short ntyStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.asnId = asnId;
         this.asnCode = asnCode;
         this.platItemId = platItemId;

--
Gitblit v1.9.1