From aeb30d72af3efcaf2e92c449f3927a31c3348dc9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 12 三月 2025 16:06:16 +0800
Subject: [PATCH] #新增 1. 新增ASN订单导入功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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..e2773cd 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
@@ -6,14 +6,10 @@
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 +17,6 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
@Accessors(chain = true)
@@ -44,6 +39,18 @@
private Long asnId;
/**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ /**
+ * 瀛楁绱㈠紩
+ */
+ @ApiModelProperty("瀛楁绱㈠紩")
+ private String fieldsIndex;
+
+ /**
* ASN鍗曞彿
*/
@ApiModelProperty(value= "ASN鍗曞彿")
@@ -53,13 +60,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 +121,12 @@
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
private String splrName;
+
+ /**
+ * 渚涘簲鍟嗘壒娆�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗘壒娆�")
+ private String splrBatch;
/**
* 浜岀淮鐮�
@@ -186,11 +199,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