From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化   1. 字典优化修改   2. 编码规则优化   3. 出库单编码生成为空问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 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 c37b9ed..572b4d2 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
      */
@@ -56,6 +55,9 @@
     @ApiModelProperty("瀛楁绱㈠紩")
     private String fieldsIndex;
 
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Double workQty;
+
     /**
      * ASN鍗曞彿
      */
@@ -75,16 +77,28 @@
     private String poCode;
 
     /**
+     * 璺熻釜鐮�
+     */
+    @ApiModelProperty("璺熻釜鐮�")
+    private String trackCode;
+
+    /**
      * 鐗╂枡鏍囪瘑
      */
     @ApiModelProperty(value= "鐗╂枡鏍囪瘑")
-    private String matnrId;
+    private Long matnrId;
+
+    /**
+     * 鐗╂枡缂栫爜
+     */
+    @ApiModelProperty(value = "鐗╂枡缂栫爜")
+    private String matnrCode;
 
     /**
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnk;
+    private String maktx;
 
     /**
      * 閫佽揣鏁伴噺
@@ -105,6 +119,11 @@
     private Double purQty;
 
     /**
+     * 搴撳瓨鎵规
+     */
+    @ApiModelProperty("搴撳瓨鎵规")
+    private String batch;
+    /**
      * 閲囪喘鍗曚綅
      */
     @ApiModelProperty(value= "閲囪喘鍗曚綅")
@@ -115,6 +134,12 @@
      */
     @ApiModelProperty(value= "宸叉敹鏁伴噺")
     private Double qty;
+
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    @ApiModelProperty("鐢熶骇鏃ユ湡")
+    private String prodTime;
 
     /**
      * 渚涘簲鍟嗙紪鐮�
@@ -152,6 +177,9 @@
     @ApiModelProperty(value= "鍖呰鍚嶇О")
     private String packName;
 
+    @ApiModelProperty("涓婃姤鐘舵�� 0: 鏈笂鎶�, 1: 宸蹭笂鎶�")
+    private Integer ntyStatus;
+
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
      */
@@ -162,7 +190,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -205,18 +232,20 @@
 
     public AsnOrderItem() {}
 
-    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) {
+    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;
+        this.matnrCode = matnrCode;
         this.poCode = poCode;
         this.matnrId = matnrId;
-        this.matnk = matnk;
+        this.maktx = matnk;
         this.anfme = anfme;
         this.stockUnit = stockUnit;
         this.purQty = purQty;
         this.purUnit = purUnit;
         this.qty = qty;
+        this.ntyStatus = ntyStatus;
         this.splrCode = splrCode;
         this.splrName = splrName;
         this.qrcode = qrcode;

--
Gitblit v1.9.1