From 481819975d08f3455fb148410e272f560dd7adb2 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 09:14:47 +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 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 af2a6ec..b2f899c 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
@@ -23,7 +23,6 @@
 public class AsnOrderItem implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * ID
      */
@@ -55,6 +54,9 @@
      */
     @ApiModelProperty("瀛楁绱㈠紩")
     private String fieldsIndex;
+
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Double workQty;
 
     /**
      * ASN鍗曞彿
@@ -117,6 +119,11 @@
     private Double purQty;
 
     /**
+     * 搴撳瓨鎵规
+     */
+    @ApiModelProperty("搴撳瓨鎵规")
+    private String batch;
+    /**
      * 閲囪喘鍗曚綅
      */
     @ApiModelProperty(value= "閲囪喘鍗曚綅")
@@ -129,6 +136,12 @@
     private Double qty;
 
     /**
+     * 鐢熶骇鏃ユ湡
+     */
+    @ApiModelProperty("鐢熶骇鏃ユ湡")
+    private String prodTime;
+
+    /**
      * 渚涘簲鍟嗙紪鐮�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")

--
Gitblit v1.9.1