From 27f59f44345d044967e2048f09dbd704f90ce3db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 四月 2025 17:51:20 +0800
Subject: [PATCH] #新增  1. 新增波次功能  2. 库区新增优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
index d3148b5..7a66332 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
@@ -59,10 +59,16 @@
     private String matnrCode;
 
     /**
+     * 鐗╂枡ID
+     */
+    @ApiModelProperty("鐗╂枡ID")
+    private Long matnrId;
+
+    /**
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鍔ㄦ�佸瓧娈电储寮�
@@ -118,6 +124,18 @@
     @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
     private String splrBatch;
 
+    @ApiModelProperty("鎵规")
+    private String batch;
+
+    @ApiModelProperty("璺熻釜鐮�")
+    private String trackCode;
+
+    @ApiModelProperty("鐢熶骇鏃ユ湡")
+    private Date prodTime;
+
+    @ApiModelProperty("鍖呰")
+    private String packName;
+
     /**
      * 鐘舵�� 1: 姝e父  0: 鍐荤粨  
      */
@@ -171,11 +189,12 @@
 
     public DeliveryItem() {}
 
-    public DeliveryItem(Long deliveryId,String platItemId,String matnrCode,String matnrName,String fieldsIndex,String unit,Double anfme,Double qty,Double nromQty,Double printQty,String splrName,String splrCode,String splrBatch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public DeliveryItem(Long deliveryId,String platItemId, Long matnrId,String matnrCode,String matnrName,String fieldsIndex,String unit,Double anfme,Double qty,Double nromQty,Double printQty,String splrName,String splrCode,String splrBatch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.deliveryId = deliveryId;
         this.platItemId = platItemId;
+        this.matnrId = matnrId;
         this.matnrCode = matnrCode;
-        this.matnrName = matnrName;
+        this.maktx = matnrName;
         this.fieldsIndex = fieldsIndex;
         this.unit = unit;
         this.anfme = anfme;

--
Gitblit v1.9.1