From 39d006d651cdf3d813253dad1bde49198cfce8f5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:48:51 +0800
Subject: [PATCH] #修改 Excel插件不兼容问题修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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..c37b9ed 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,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 +127,12 @@
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
private String splrName;
+
+ /**
+ * 渚涘簲鍟嗘壒娆�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗘壒娆�")
+ private String splrBatch;
/**
* 浜岀淮鐮�
@@ -186,11 +205,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