From cc2984eeb289b54cfa193dde558417c46f309e8f Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 19:32:38 +0800
Subject: [PATCH] #修改 1. 采购单界面优化及修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 8e5386f..6efb8c0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -1,19 +1,20 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.ShipperService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
+import io.swagger.annotations.Api;
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;
@@ -23,6 +24,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_warehouse_areas")
@@ -41,7 +43,7 @@
* 浠撳簱ID
*/
@ApiModelProperty("浠撳簱ID")
- private Long wareId;
+ private Long warehouseId;
/**
* 缂栧彿
@@ -120,6 +122,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -133,9 +136,18 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鏄惁浠撳簱")
+ private Integer flagWare;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
/**
* 澶囨敞
*/
@@ -163,25 +175,6 @@
this.memo = memo;
}
-// WarehouseAreas warehouseAreas = new WarehouseAreas(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 缂栫爜
-// null, // 璐т富鏍囪瘑(*)
-// null, // 渚涘簲鍟嗘爣璇�
-// null, // 鍏佽璐熷簱瀛�(*)
-// null, // 鏄惁鏍囩绠＄悊(*)[闈炵┖]
-// null, // 鏀寔娣锋斁(*)[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getShipperId$(){
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys shipper = service.getById(this.shipperId);
@@ -191,7 +184,17 @@
return null;
}
- public String getSupplier$() {
+ public String getWarehouseId$() {
+ if (this.warehouseId == null) { return null; }
+ WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
+ Warehouse warehouse = warehouseService.getById(this.warehouseId);
+ if (!Objects.isNull(warehouse)) {
+ return warehouse.getName();
+ }
+ return null;
+ }
+
+ public String getSupplierId$() {
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys supplier = service.getById(this.supplierId);
if (!Cools.isEmpty(supplier)){
--
Gitblit v1.9.1