From 59251b6445daef3729a205fc7054fcbdc55b060a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 11:16:05 +0800
Subject: [PATCH] #修复 1. 收货单新增物料时分组查询不生效 2. 综合订单分页数调整 3. 物料列表报错修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
index 9c770da..dfcdd1e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
@@ -56,12 +56,6 @@
private Long areaId;
/**
- * 搴撲綅ID(*)
- */
- @ApiModelProperty(value= "搴撲綅ID(*)")
- private Long locId;
-
- /**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
@@ -114,11 +108,10 @@
public LocArea() {}
- public LocArea(String name,String code,Long areaId,Long locId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public LocArea(String name,String code,Long areaId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
this.areaId = areaId;
- this.locId = locId;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -153,14 +146,14 @@
return null;
}
- public String getLocId$(){
- LocService service = SpringUtils.getBean(LocService.class);
- Loc loc = service.getById(this.locId);
- if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getCode());
- }
- return null;
- }
+// public String getLocId$(){
+// LocService service = SpringUtils.getBean(LocService.class);
+// Loc loc = service.getById(this.locId);
+// if (!Cools.isEmpty(loc)){
+// return String.valueOf(loc.getCode());
+// }
+// return null;
+// }
public String getStatus$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1