From 0d3a5be1512815a38f37ae81e7d9fc0948fd3f16 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:54:57 +0800
Subject: [PATCH] 1
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 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..af2a6ec 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
@@ -1,19 +1,13 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -21,7 +15,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
+import java.util.Map;
@Data
@Accessors(chain = true)
@@ -44,6 +38,25 @@
private Long asnId;
/**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ /**
+ * 鎵╁睍瀛楁
+ */
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
+ /**
+ * 瀛楁绱㈠紩
+ */
+ @ApiModelProperty("瀛楁绱㈠紩")
+ private String fieldsIndex;
+
+ /**
* ASN鍗曞彿
*/
@ApiModelProperty(value= "ASN鍗曞彿")
@@ -53,13 +66,19 @@
* PO鍗曟槑缁嗘爣璇�
*/
@ApiModelProperty(value= "PO鍗曟槑缁嗘爣璇�")
- private String poDetlId;
+ private Long poDetlId;
/**
* PO鍗曟槑缁嗙紪鐮�
*/
- @ApiModelProperty(value= "PO鍗曟槑缁嗙紪鐮�")
- private String poDetlCode;
+ @ApiModelProperty(value= "PO鍗曠紪鐮�")
+ private String poCode;
+
+ /**
+ * 璺熻釜鐮�
+ */
+ @ApiModelProperty("璺熻釜鐮�")
+ private String trackCode;
/**
* 鐗╂枡鏍囪瘑
@@ -68,10 +87,16 @@
private String matnrId;
/**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String matnrCode;
+
+ /**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matnk;
+ private String maktx;
/**
* 閫佽揣鏁伴噺
@@ -116,6 +141,12 @@
private String splrName;
/**
+ * 渚涘簲鍟嗘壒娆�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗘壒娆�")
+ private String splrBatch;
+
+ /**
* 浜岀淮鐮�
*/
@ApiModelProperty(value= "浜岀淮鐮�")
@@ -132,6 +163,9 @@
*/
@ApiModelProperty(value= "鍖呰鍚嶇О")
private String packName;
+
+ @ApiModelProperty("涓婃姤鐘舵�� 0: 鏈笂鎶�, 1: 宸蹭笂鎶�")
+ private Integer ntyStatus;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -186,18 +220,20 @@
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 matnrCode, 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 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.poDetlCode = poDetlCode;
+ 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