From 6a4497d2fcd015f73856ce0f75e2c2832362c88f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 04 五月 2025 16:54:33 +0800
Subject: [PATCH] 5.4问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 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 d0b12a5..5527dbe 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
@@ -5,6 +5,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.manager.service.CompanysService;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -44,6 +45,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;
+
+
     /**
      * 鍖哄煙鍚嶇О
      */
@@ -63,7 +86,7 @@
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鐗╂枡缂栫爜
@@ -74,8 +97,8 @@
     /**
      * 鏉″舰鐮�
      */
-    @ApiModelProperty(value= "鏉″舰鐮�")
-    private String barcode;
+    @ApiModelProperty(value= "鐗╂枡璺熻釜鐮�")
+    private String trackCode;
 
     /**
      * 鏁伴噺
@@ -135,7 +158,7 @@
      * 渚涘簲鍟嗘壒娆�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
-    private String splrBtch;
+    private String splrBatch;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
@@ -147,7 +170,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -167,6 +189,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -180,6 +203,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     @ApiModelProperty("鎵╁睍瀛楁")
@@ -194,13 +218,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;
@@ -210,7 +234,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