From 6c1d09d5e692f0b43f5dfb2288a4aef728046b06 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 16:51:25 +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/WarehouseAreasItem.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index 01005f3..a152659 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -1,6 +1,7 @@
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;
@@ -10,10 +11,7 @@
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;
@@ -23,9 +21,11 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Map;
@Data
@Accessors(chain = true)
+@ApiModel(value = "WarehouseAreasItem", description = "搴撳尯搴撳瓨淇℃伅")
@TableName("man_warehouse_areas_item")
public class WarehouseAreasItem implements Serializable {
@@ -44,6 +44,15 @@
@ApiModelProperty(value= "浠撳簱鍖哄煙")
private Long areaId;
+ @ApiModelProperty("鍗曟嵁ID")
+ private Long asnId;
+
+ @ApiModelProperty("鍗曟嵁缂栫爜")
+ private String asnCode;
+
+ @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+ private Long asnItemId;
+
/**
* 鍖哄煙鍚嶇О
*/
@@ -55,6 +64,9 @@
*/
@ApiModelProperty(value= "鐗╂枡鏍囪瘑")
private Long matnrId;
+
+ @ApiModelProperty(value = "鎵╁睍瀛楁鍞竴鏍囪瘑")
+ private String fieldsIndex;
/**
* 鐗╂枡鍚嶇О
@@ -71,8 +83,8 @@
/**
* 鏉″舰鐮�
*/
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
+ @ApiModelProperty(value= "鐗╂枡璺熻釜鐮�")
+ private String trackCode;
/**
* 鏁伴噺
@@ -132,7 +144,7 @@
* 渚涘簲鍟嗘壒娆�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
- private String splrBtch;
+ private String splrBatch;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -179,6 +191,10 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
/**
* 澶囨敞
*/
@@ -187,13 +203,13 @@
public WarehouseAreasItem() {}
- public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String barcode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,String splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,String splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.areaId = areaId;
this.areaName = areaName;
this.matnrId = matnrId;
this.matnrName = matnrName;
this.matnrCode = matnrCode;
- this.barcode = barcode;
+ this.trackCode = trackCode;
this.anfme = anfme;
this.batch = batch;
this.unit = unit;
@@ -203,7 +219,7 @@
this.splrId = splrId;
this.weight = weight;
this.prodTime = prodTime;
- this.splrBtch = splrBtch;
+ this.splrBatch = splrBtch;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
--
Gitblit v1.9.1