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/AsnOrderItem.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 126d6ce..bff59da 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
@@ -53,13 +53,13 @@
      * PO鍗曟槑缁嗘爣璇�
      */
     @ApiModelProperty(value= "PO鍗曟槑缁嗘爣璇�")
-    private String poDetlId;
+    private Long poDetlId;
 
     /**
      * PO鍗曟槑缁嗙紪鐮�
      */
-    @ApiModelProperty(value= "PO鍗曟槑缁嗙紪鐮�")
-    private String poDetlCode;
+    @ApiModelProperty(value= "PO鍗曠紪鐮�")
+    private String poCode;
 
     /**
      * 鐗╂枡鏍囪瘑
@@ -114,6 +114,12 @@
      */
     @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
     private String splrName;
+
+    /**
+     * 渚涘簲鍟嗘壒娆�
+     */
+    @ApiModelProperty(value = "渚涘簲鍟嗘壒娆�")
+    private String splrBatch;
 
     /**
      * 浜岀淮鐮�
@@ -186,11 +192,11 @@
 
     public AsnOrderItem() {}
 
-    public AsnOrderItem(Long asnId,String asnCode,String poDetlId,String poDetlCode,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 deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public AsnOrderItem(Long asnId,String asnCode,Long poDetlId,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 deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.asnId = asnId;
         this.asnCode = asnCode;
         this.poDetlId = poDetlId;
-        this.poDetlCode = poDetlCode;
+        this.poCode = poCode;
         this.matnrId = matnrId;
         this.matnk = matnk;
         this.anfme = anfme;

--
Gitblit v1.9.1