From a372a11167f095bd70d1070d70ec36af56489898 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 17:56:58 +0800
Subject: [PATCH] 人工上架任务修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java |   53 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 12 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..176d8a1 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,28 @@
     @ApiModelProperty(value= "浠撳簱鍖哄煙")
     private Long areaId;
 
+    @ApiModelProperty("鍗曟嵁ID")
+    private Long asnId;
+
+    @ApiModelProperty("鍗曟嵁缂栫爜")
+    private String asnCode;
+
+    @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+    private Long asnItemId;
+
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
+    @ApiModelProperty("宸叉敹璐ф暟閲�")
+    private Double qty;
+
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Double workQty;
+
+
     /**
      * 鍖哄煙鍚嶇О
      */
@@ -56,11 +78,14 @@
     @ApiModelProperty(value= "鐗╂枡鏍囪瘑")
     private Long matnrId;
 
+    @ApiModelProperty(value = "鎵╁睍瀛楁鍞竴鏍囪瘑")
+    private String fieldsIndex;
+
     /**
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鐗╂枡缂栫爜
@@ -71,8 +96,8 @@
     /**
      * 鏉″舰鐮�
      */
-    @ApiModelProperty(value= "鏉″舰鐮�")
-    private String barcode;
+    @ApiModelProperty(value= "鐗╂枡璺熻釜鐮�")
+    private String trackCode;
 
     /**
      * 鏁伴噺
@@ -132,7 +157,7 @@
      * 渚涘簲鍟嗘壒娆�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
-    private String splrBtch;
+    private String splrBatch;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
@@ -179,6 +204,10 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
     /**
      * 澶囨敞
      */
@@ -187,13 +216,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.maktx = matnrName;
         this.matnrCode = matnrCode;
-        this.barcode = barcode;
+        this.trackCode = trackCode;
         this.anfme = anfme;
         this.batch = batch;
         this.unit = unit;
@@ -203,7 +232,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